diff options
| author | Jiyong <jiyong.min@samsung.com> | 2023-12-26 17:33:03 +0900 |
|---|---|---|
| committer | Jiyong <jiyong.min@samsung.com> | 2023-12-27 08:25:11 +0900 |
| commit | a6d06c38e46e552195648836052eb909925fe5ff (patch) | |
| tree | 5b34f3947c8331dc618a5166974e4d9757f8e782 /lib/jxl/passes_state.h | |
| parent | f3e519be675ef7922a6c1c3a682232302b55496d (diff) | |
| parent | 3b773d382e34fcfc7c8995d8bd681a6ef0529b02 (diff) | |
| download | libjxl-accepted/tizen_unified_riscv.tar.gz libjxl-accepted/tizen_unified_riscv.tar.bz2 libjxl-accepted/tizen_unified_riscv.zip | |
Merge branch 'upstream' into tizenaccepted/tizen/unified/riscv/20240103.054630accepted/tizen/unified/20231228.165749accepted/tizen_unified_riscv
Change-Id: I13b4d2c94ada4853484630800e2a8a5ae90d34c1
Diffstat (limited to 'lib/jxl/passes_state.h')
| -rw-r--r-- | lib/jxl/passes_state.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/jxl/passes_state.h b/lib/jxl/passes_state.h index 069d7ac..d066155 100644 --- a/lib/jxl/passes_state.h +++ b/lib/jxl/passes_state.h @@ -9,7 +9,6 @@ #include "lib/jxl/ac_context.h" #include "lib/jxl/ac_strategy.h" #include "lib/jxl/chroma_from_luma.h" -#include "lib/jxl/common.h" #include "lib/jxl/dec_patch_dictionary.h" #include "lib/jxl/frame_header.h" #include "lib/jxl/image.h" @@ -74,12 +73,7 @@ struct PassesSharedState { Image3F dc_frames[4]; struct { - ImageBundle storage; - // Can either point to `storage`, if this is a frame that is not stored in - // the CodecInOut, or can point to an existing ImageBundle. - // TODO(veluca): pointing to ImageBundles in CodecInOut is not possible for - // now, as they are stored in a vector and thus may be moved. Fix this. - ImageBundle* JXL_RESTRICT frame = &storage; + ImageBundle frame; // ImageBundle doesn't yet have a simple way to state it is in XYB. bool ib_is_in_xyb = false; } reference_frames[4] = {}; |