From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 third_party/jpeg-xl/lib/jpegli/decode_internal.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'third_party/jpeg-xl/lib/jpegli/decode_internal.h')

diff --git a/third_party/jpeg-xl/lib/jpegli/decode_internal.h b/third_party/jpeg-xl/lib/jpegli/decode_internal.h
index ed7baa39e9..37dfcc4526 100644
--- a/third_party/jpeg-xl/lib/jpegli/decode_internal.h
+++ b/third_party/jpeg-xl/lib/jpegli/decode_internal.h
@@ -45,12 +45,13 @@ struct jpeg_decomp_master {
   size_t input_buffer_pos_;
   // Number of bits after codestream_pos_ that were already processed.
   size_t codestream_bits_ahead_;
-  bool streaming_mode_;
 
   // Coefficient buffers
   jvirt_barray_ptr* coef_arrays;
   JBLOCKARRAY coeff_rows[jpegli::kMaxComponents];
 
+  bool streaming_mode_;
+
   //
   // Marker data processing state.
   //
@@ -58,6 +59,11 @@ struct jpeg_decomp_master {
   bool found_dri_;
   bool found_sof_;
   bool found_eoi_;
+
+  // Whether this jpeg has multiple scans (progressive or non-interleaved
+  // sequential).
+  bool is_multiscan_;
+
   size_t icc_index_;
   size_t icc_total_;
   std::vector<uint8_t> icc_profile_;
@@ -66,9 +72,6 @@ struct jpeg_decomp_master {
   uint8_t markers_to_save_[32];
   jpeg_marker_parser_method app_marker_parsers[16];
   jpeg_marker_parser_method com_marker_parser;
-  // Whether this jpeg has multiple scans (progressive or non-interleaved
-  // sequential).
-  bool is_multiscan_;
 
   // Fields defined by SOF marker.
   size_t iMCU_cols_;
@@ -96,9 +99,11 @@ struct jpeg_decomp_master {
   //
   int output_passes_done_;
   JpegliDataType output_data_type_ = JPEGLI_TYPE_UINT8;
-  bool swap_endianness_ = false;
   size_t xoffset_;
+  bool swap_endianness_ = false;
   bool need_context_rows_;
+  bool regenerate_inverse_colormap_;
+  bool apply_smoothing;
 
   int min_scaled_dct_size;
   int scaled_dct_size[jpegli::kMaxComponents];
@@ -127,7 +132,6 @@ struct jpeg_decomp_master {
   uint8_t* pixels_;
   JSAMPARRAY scanlines_;
   std::vector<std::vector<uint8_t>> candidate_lists_;
-  bool regenerate_inverse_colormap_;
   float* dither_[jpegli::kMaxComponents];
   float* error_row_[2 * jpegli::kMaxComponents];
   size_t dither_size_;
@@ -145,7 +149,6 @@ struct jpeg_decomp_master {
   // i.e. the bottom half when rendering incomplete scans.
   int (*coef_bits_latch)[SAVED_COEFS];
   int (*prev_coef_bits_latch)[SAVED_COEFS];
-  bool apply_smoothing;
 };
 
 #endif  // LIB_JPEGLI_DECODE_INTERNAL_H_
-- 
cgit v1.2.3