From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h | 10 +++++++++- third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc | 3 +-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'third_party/jpeg-xl/lib/jxl/modular/encoding') diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h index df54a9425e..0a71bec24f 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h @@ -6,9 +6,17 @@ #ifndef LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_ #define LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_ -#include +#include +#include +#include +#include +#include #include +#include "lib/jxl/base/bits.h" +#include "lib/jxl/base/compiler_specific.h" +#include "lib/jxl/base/status.h" +#include "lib/jxl/field_encodings.h" #include "lib/jxl/fields.h" #include "lib/jxl/image_ops.h" #include "lib/jxl/modular/modular_image.h" diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc index f863823629..04f8812750 100644 --- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc +++ b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc @@ -5,8 +5,7 @@ #include "lib/jxl/modular/encoding/enc_debug_tree.h" -#include -#include +#include // PRId64 #include #include "lib/jxl/base/os_macros.h" -- cgit v1.2.3