diff --git a/internal/cgen/auxiliary/base.cc b/internal/cgen/auxiliary/base.cc index 0d5a1b14..e342983f 100644 --- a/internal/cgen/auxiliary/base.cc +++ b/internal/cgen/auxiliary/base.cc @@ -164,8 +164,8 @@ HandleMetadata( case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED: break; - case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW: { - wuffs_base__range_ie_u64 r = minfo.metadata_raw__range(); + case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH: { + wuffs_base__range_ie_u64 r = minfo.metadata_raw_passthrough__range(); if (r.is_empty()) { break; } else if (r.length() > (max_incl_metadata_length - raw.size())) { diff --git a/internal/cgen/auxiliary/image.hh b/internal/cgen/auxiliary/image.hh index 9a915d1e..cbb2a2f0 100644 --- a/internal/cgen/auxiliary/image.hh +++ b/internal/cgen/auxiliary/image.hh @@ -92,9 +92,9 @@ class DecodeImageCallbacks { SelectDecoder(uint32_t fourcc, wuffs_base__slice_u8 prefix); // HandleMetadata acknowledges image metadata. minfo.flavor will be one of: - // - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW + // - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH // - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED - // If it is ETC__METADATA_RAW then raw contains the metadata bytes. Those + // If it is ETC__METADATA_RAW_ETC then raw contains the metadata bytes. Those // bytes should not be retained beyond the the HandleMetadata call. // // minfo.metadata__fourcc() will typically match one of the diff --git a/internal/cgen/base/range-public.h b/internal/cgen/base/range-public.h index 5c0966f7..06b61ee5 100644 --- a/internal/cgen/base/range-public.h +++ b/internal/cgen/base/range-public.h @@ -829,9 +829,9 @@ typedef struct wuffs_base__more_information__struct { inline wuffs_base__range_ie_u64 io_redirect__range() const; inline uint64_t io_seek__position() const; inline uint32_t metadata__fourcc() const; - // Deprecated: use metadata_raw__range. + // Deprecated: use metadata_raw_passthrough__range. inline wuffs_base__range_ie_u64 metadata__range() const; - inline wuffs_base__range_ie_u64 metadata_raw__range() const; + inline wuffs_base__range_ie_u64 metadata_raw_passthrough__range() const; inline int32_t metadata_parsed__chrm(uint32_t component) const; inline uint32_t metadata_parsed__gama() const; inline uint32_t metadata_parsed__srgb() const; @@ -841,10 +841,12 @@ typedef struct wuffs_base__more_information__struct { #define WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT 1 #define WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_SEEK 2 -// Deprecated: use WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW. +// Deprecated: use +// WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH. #define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA 3 -#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW 3 -#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED 4 +#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH 3 +#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_TRANSFORM 4 +#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED 5 static inline wuffs_base__more_information // wuffs_base__empty_more_information() { @@ -901,7 +903,8 @@ wuffs_base__more_information__metadata__fourcc( return m->w; } -// Deprecated: use wuffs_base__more_information__metadata_raw__range. +// Deprecated: use +// wuffs_base__more_information__metadata_raw_passthrough__range. static inline wuffs_base__range_ie_u64 // wuffs_base__more_information__metadata__range( const wuffs_base__more_information* m) { @@ -912,7 +915,7 @@ wuffs_base__more_information__metadata__range( } static inline wuffs_base__range_ie_u64 // -wuffs_base__more_information__metadata_raw__range( +wuffs_base__more_information__metadata_raw_passthrough__range( const wuffs_base__more_information* m) { wuffs_base__range_ie_u64 ret; ret.min_incl = m->y; @@ -1046,8 +1049,8 @@ wuffs_base__more_information::metadata__range() const { } inline wuffs_base__range_ie_u64 // -wuffs_base__more_information::metadata_raw__range() const { - return wuffs_base__more_information__metadata_raw__range(this); +wuffs_base__more_information::metadata_raw_passthrough__range() const { + return wuffs_base__more_information__metadata_raw_passthrough__range(this); } inline int32_t // diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 72bfe45f..7e5eeee3 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -96,8 +96,9 @@ var Consts = [...]struct { {t.IDU32, "1", "MORE_INFORMATION__FLAVOR__IO_REDIRECT"}, {t.IDU32, "2", "MORE_INFORMATION__FLAVOR__IO_SEEK"}, - {t.IDU32, "3", "MORE_INFORMATION__FLAVOR__METADATA_RAW"}, - {t.IDU32, "4", "MORE_INFORMATION__FLAVOR__METADATA_PARSED"}, + {t.IDU32, "3", "MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH"}, + {t.IDU32, "4", "MORE_INFORMATION__FLAVOR__METADATA_RAW_TRANSFORM"}, + {t.IDU32, "5", "MORE_INFORMATION__FLAVOR__METADATA_PARSED"}, // ---- diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 01c82f10..d8ec8cff 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2494,9 +2494,9 @@ typedef struct wuffs_base__more_information__struct { inline wuffs_base__range_ie_u64 io_redirect__range() const; inline uint64_t io_seek__position() const; inline uint32_t metadata__fourcc() const; - // Deprecated: use metadata_raw__range. + // Deprecated: use metadata_raw_passthrough__range. inline wuffs_base__range_ie_u64 metadata__range() const; - inline wuffs_base__range_ie_u64 metadata_raw__range() const; + inline wuffs_base__range_ie_u64 metadata_raw_passthrough__range() const; inline int32_t metadata_parsed__chrm(uint32_t component) const; inline uint32_t metadata_parsed__gama() const; inline uint32_t metadata_parsed__srgb() const; @@ -2506,10 +2506,12 @@ typedef struct wuffs_base__more_information__struct { #define WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT 1 #define WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_SEEK 2 -// Deprecated: use WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW. +// Deprecated: use +// WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH. #define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA 3 -#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW 3 -#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED 4 +#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH 3 +#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_TRANSFORM 4 +#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED 5 static inline wuffs_base__more_information // wuffs_base__empty_more_information() { @@ -2566,7 +2568,8 @@ wuffs_base__more_information__metadata__fourcc( return m->w; } -// Deprecated: use wuffs_base__more_information__metadata_raw__range. +// Deprecated: use +// wuffs_base__more_information__metadata_raw_passthrough__range. static inline wuffs_base__range_ie_u64 // wuffs_base__more_information__metadata__range( const wuffs_base__more_information* m) { @@ -2577,7 +2580,7 @@ wuffs_base__more_information__metadata__range( } static inline wuffs_base__range_ie_u64 // -wuffs_base__more_information__metadata_raw__range( +wuffs_base__more_information__metadata_raw_passthrough__range( const wuffs_base__more_information* m) { wuffs_base__range_ie_u64 ret; ret.min_incl = m->y; @@ -2711,8 +2714,8 @@ wuffs_base__more_information::metadata__range() const { } inline wuffs_base__range_ie_u64 // -wuffs_base__more_information::metadata_raw__range() const { - return wuffs_base__more_information__metadata_raw__range(this); +wuffs_base__more_information::metadata_raw_passthrough__range() const { + return wuffs_base__more_information__metadata_raw_passthrough__range(this); } inline int32_t // @@ -10104,9 +10107,9 @@ class DecodeImageCallbacks { SelectDecoder(uint32_t fourcc, wuffs_base__slice_u8 prefix); // HandleMetadata acknowledges image metadata. minfo.flavor will be one of: - // - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW + // - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH // - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED - // If it is ETC__METADATA_RAW then raw contains the metadata bytes. Those + // If it is ETC__METADATA_RAW_ETC then raw contains the metadata bytes. Those // bytes should not be retained beyond the the HandleMetadata call. // // minfo.metadata__fourcc() will typically match one of the @@ -37840,7 +37843,7 @@ wuffs_png__decoder__decode_chrm( status = wuffs_base__make_status(wuffs_png__error__bad_chunk); goto exit; } - self->private_impl.f_metadata_flavor = 4; + self->private_impl.f_metadata_flavor = 5; self->private_impl.f_metadata_fourcc = 1128813133; self->private_impl.f_metadata_x = 0; self->private_impl.f_metadata_y = 0; @@ -38134,7 +38137,7 @@ wuffs_png__decoder__decode_gama( status = wuffs_base__make_status(wuffs_png__error__bad_chunk); goto exit; } - self->private_impl.f_metadata_flavor = 4; + self->private_impl.f_metadata_flavor = 5; self->private_impl.f_metadata_fourcc = 1195461953; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); @@ -38316,7 +38319,7 @@ wuffs_png__decoder__decode_srgb( status = wuffs_base__make_status(wuffs_png__error__bad_chunk); goto exit; } - self->private_impl.f_metadata_flavor = 4; + self->private_impl.f_metadata_flavor = 5; self->private_impl.f_metadata_fourcc = 1397901122; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); @@ -40302,8 +40305,8 @@ HandleMetadata( case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED: break; - case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW: { - wuffs_base__range_ie_u64 r = minfo.metadata_raw__range(); + case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH: { + wuffs_base__range_ie_u64 r = minfo.metadata_raw_passthrough__range(); if (r.is_empty()) { break; } else if (r.length() > (max_incl_metadata_length - raw.size())) { diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 60f2b944..fdeba3be 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -250,7 +250,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform if args.minfo <> nullptr { args.minfo.set!( - flavor: base.MORE_INFORMATION__FLAVOR__METADATA_RAW, + flavor: base.MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH, w: this.metadata_fourcc, x: 0, y: args.src.position(), @@ -262,7 +262,7 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform if args.minfo <> nullptr { args.minfo.set!( - flavor: base.MORE_INFORMATION__FLAVOR__METADATA_RAW, + flavor: base.MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH, w: this.metadata_fourcc, x: 0, y: this.metadata_io_position,