diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /third_party/jpeg-xl/lib/jxl/enc_modular.cc | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/jpeg-xl/lib/jxl/enc_modular.cc')
| -rw-r--r-- | third_party/jpeg-xl/lib/jxl/enc_modular.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/third_party/jpeg-xl/lib/jxl/enc_modular.cc b/third_party/jpeg-xl/lib/jxl/enc_modular.cc index 35fac3c827..25464737b8 100644 --- a/third_party/jpeg-xl/lib/jxl/enc_modular.cc +++ b/third_party/jpeg-xl/lib/jxl/enc_modular.cc @@ -5,11 +5,9 @@ #include "lib/jxl/enc_modular.h" -#include <stddef.h> -#include <stdint.h> - #include <array> #include <atomic> +#include <cstddef> #include <cstdint> #include <limits> #include <utility> @@ -17,6 +15,7 @@ #include "lib/jxl/base/compiler_specific.h" #include "lib/jxl/base/printf_macros.h" +#include "lib/jxl/base/rect.h" #include "lib/jxl/base/status.h" #include "lib/jxl/compressed_dc.h" #include "lib/jxl/dec_ans.h" @@ -998,7 +997,9 @@ Status ModularFrameEncoder::ComputeEncodingData( pool, 0, stream_params_.size(), ThreadPool::NoInit, [&](const uint32_t i, size_t /* thread */) { size_t stream = stream_params_[i].id.ID(frame_dim_); - stream_options_[stream] = stream_options_[0]; + if (stream != 0) { + stream_options_[stream] = stream_options_[0]; + } JXL_CHECK(PrepareStreamParams( stream_params_[i].rect, cparams_, stream_params_[i].minShift, stream_params_[i].maxShift, stream_params_[i].id, do_color, |