From 2b7b6e12ea1e796792a66a9f1e2a8bbad69e0902 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 18 Oct 2021 00:40:11 +1100 Subject: [PATCH] Add wuffs_aux::DecodeImageArgQuirks --- example/imageviewer/imageviewer.cc | 2 +- internal/cgen/auxiliary/image.cc | 24 ++++++++++++++--- internal/cgen/auxiliary/image.hh | 12 +++++++++ release/c/wuffs-unsupported-snapshot.c | 36 +++++++++++++++++++++++--- 4 files changed, 67 insertions(+), 7 deletions(-) diff --git a/example/imageviewer/imageviewer.cc b/example/imageviewer/imageviewer.cc index 3bb963df..4b9d18cd 100644 --- a/example/imageviewer/imageviewer.cc +++ b/example/imageviewer/imageviewer.cc @@ -130,7 +130,7 @@ load_image(const char* filename) { wuffs_aux::DecodeImageCallbacks callbacks; wuffs_aux::sync_io::FileInput input(file); wuffs_aux::DecodeImageResult res = wuffs_aux::DecodeImage( - callbacks, input, + callbacks, input, wuffs_aux::DecodeImageArgQuirks::DefaultValue(), // Use PIXEL_BLEND__SRC_OVER, not the default PIXEL_BLEND__SRC, because // we also pass a background color. wuffs_aux::DecodeImageArgPixelBlend(WUFFS_BASE__PIXEL_BLEND__SRC_OVER), diff --git a/internal/cgen/auxiliary/image.cc b/internal/cgen/auxiliary/image.cc index 40426883..a2f1403b 100644 --- a/internal/cgen/auxiliary/image.cc +++ b/internal/cgen/auxiliary/image.cc @@ -170,6 +170,17 @@ const char DecodeImage_UnsupportedPixelConfiguration[] = // const char DecodeImage_UnsupportedPixelFormat[] = // "wuffs_aux::DecodeImage: unsupported pixel format"; +DecodeImageArgQuirks::DecodeImageArgQuirks(wuffs_base__slice_u32 repr0) + : repr(repr0) {} + +DecodeImageArgQuirks::DecodeImageArgQuirks(uint32_t* ptr0, size_t len0) + : repr(wuffs_base__make_slice_u32(ptr0, len0)) {} + +DecodeImageArgQuirks // +DecodeImageArgQuirks::DefaultValue() { + return DecodeImageArgQuirks(wuffs_base__empty_slice_u32()); +} + DecodeImageArgPixelBlend::DecodeImageArgPixelBlend( wuffs_base__pixel_blend repr0) : repr(repr0) {} @@ -235,6 +246,7 @@ DecodeImage0(wuffs_base__image_decoder::unique_ptr& image_decoder, DecodeImageCallbacks& callbacks, sync_io::Input& input, wuffs_base__io_buffer& io_buf, + wuffs_base__slice_u32 quirks, wuffs_base__pixel_blend pixel_blend, wuffs_base__color_u32_argb_premul background_color, uint32_t max_incl_dimension) { @@ -302,6 +314,11 @@ redirect: return DecodeImageResult(DecodeImage_UnsupportedImageFormat); } + // Apply quirks. + for (size_t i = 0; i < quirks.len; i++) { + image_decoder->set_quirk_enabled(quirks.ptr[i], true); + } + // Decode the image config. while (true) { wuffs_base__status id_dic_status = @@ -436,6 +453,7 @@ redirect: DecodeImageResult // DecodeImage(DecodeImageCallbacks& callbacks, sync_io::Input& input, + DecodeImageArgQuirks quirks, DecodeImageArgPixelBlend pixel_blend, DecodeImageArgBackgroundColor background_color, DecodeImageArgMaxInclDimension max_incl_dimension) { @@ -450,9 +468,9 @@ DecodeImage(DecodeImageCallbacks& callbacks, } wuffs_base__image_decoder::unique_ptr image_decoder(nullptr, &free); - DecodeImageResult result = - DecodeImage0(image_decoder, callbacks, input, *io_buf, pixel_blend.repr, - background_color.repr, max_incl_dimension.repr); + DecodeImageResult result = DecodeImage0( + image_decoder, callbacks, input, *io_buf, quirks.repr, pixel_blend.repr, + background_color.repr, max_incl_dimension.repr); callbacks.Done(result, input, *io_buf, std::move(image_decoder)); return result; } diff --git a/internal/cgen/auxiliary/image.hh b/internal/cgen/auxiliary/image.hh index 39742923..a827ad5b 100644 --- a/internal/cgen/auxiliary/image.hh +++ b/internal/cgen/auxiliary/image.hh @@ -172,6 +172,17 @@ extern const char DecodeImage_UnsupportedPixelFormat[]; // - It provides some type safety against accidentally transposing or omitting // adjacent fundamentally-numeric-typed optional arguments. +// DecodeImageArgQuirks wraps an optional argument to DecodeImage. +struct DecodeImageArgQuirks { + explicit DecodeImageArgQuirks(wuffs_base__slice_u32 repr0); + explicit DecodeImageArgQuirks(uint32_t* ptr, size_t len); + + // DefaultValue returns an empty slice. + static DecodeImageArgQuirks DefaultValue(); + + wuffs_base__slice_u32 repr; +}; + // DecodeImageArgPixelBlend wraps an optional argument to DecodeImage. struct DecodeImageArgPixelBlend { explicit DecodeImageArgPixelBlend(wuffs_base__pixel_blend repr0); @@ -249,6 +260,7 @@ struct DecodeImageArgMaxInclDimension { DecodeImageResult // DecodeImage(DecodeImageCallbacks& callbacks, sync_io::Input& input, + DecodeImageArgQuirks quirks = DecodeImageArgQuirks::DefaultValue(), DecodeImageArgPixelBlend pixel_blend = DecodeImageArgPixelBlend::DefaultValue(), DecodeImageArgBackgroundColor background_color = diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1a97c449..54f5c9b7 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -10168,6 +10168,17 @@ extern const char DecodeImage_UnsupportedPixelFormat[]; // - It provides some type safety against accidentally transposing or omitting // adjacent fundamentally-numeric-typed optional arguments. +// DecodeImageArgQuirks wraps an optional argument to DecodeImage. +struct DecodeImageArgQuirks { + explicit DecodeImageArgQuirks(wuffs_base__slice_u32 repr0); + explicit DecodeImageArgQuirks(uint32_t* ptr, size_t len); + + // DefaultValue returns an empty slice. + static DecodeImageArgQuirks DefaultValue(); + + wuffs_base__slice_u32 repr; +}; + // DecodeImageArgPixelBlend wraps an optional argument to DecodeImage. struct DecodeImageArgPixelBlend { explicit DecodeImageArgPixelBlend(wuffs_base__pixel_blend repr0); @@ -10245,6 +10256,7 @@ struct DecodeImageArgMaxInclDimension { DecodeImageResult // DecodeImage(DecodeImageCallbacks& callbacks, sync_io::Input& input, + DecodeImageArgQuirks quirks = DecodeImageArgQuirks::DefaultValue(), DecodeImageArgPixelBlend pixel_blend = DecodeImageArgPixelBlend::DefaultValue(), DecodeImageArgBackgroundColor background_color = @@ -40659,6 +40671,17 @@ const char DecodeImage_UnsupportedPixelConfiguration[] = // const char DecodeImage_UnsupportedPixelFormat[] = // "wuffs_aux::DecodeImage: unsupported pixel format"; +DecodeImageArgQuirks::DecodeImageArgQuirks(wuffs_base__slice_u32 repr0) + : repr(repr0) {} + +DecodeImageArgQuirks::DecodeImageArgQuirks(uint32_t* ptr0, size_t len0) + : repr(wuffs_base__make_slice_u32(ptr0, len0)) {} + +DecodeImageArgQuirks // +DecodeImageArgQuirks::DefaultValue() { + return DecodeImageArgQuirks(wuffs_base__empty_slice_u32()); +} + DecodeImageArgPixelBlend::DecodeImageArgPixelBlend( wuffs_base__pixel_blend repr0) : repr(repr0) {} @@ -40724,6 +40747,7 @@ DecodeImage0(wuffs_base__image_decoder::unique_ptr& image_decoder, DecodeImageCallbacks& callbacks, sync_io::Input& input, wuffs_base__io_buffer& io_buf, + wuffs_base__slice_u32 quirks, wuffs_base__pixel_blend pixel_blend, wuffs_base__color_u32_argb_premul background_color, uint32_t max_incl_dimension) { @@ -40791,6 +40815,11 @@ redirect: return DecodeImageResult(DecodeImage_UnsupportedImageFormat); } + // Apply quirks. + for (size_t i = 0; i < quirks.len; i++) { + image_decoder->set_quirk_enabled(quirks.ptr[i], true); + } + // Decode the image config. while (true) { wuffs_base__status id_dic_status = @@ -40925,6 +40954,7 @@ redirect: DecodeImageResult // DecodeImage(DecodeImageCallbacks& callbacks, sync_io::Input& input, + DecodeImageArgQuirks quirks, DecodeImageArgPixelBlend pixel_blend, DecodeImageArgBackgroundColor background_color, DecodeImageArgMaxInclDimension max_incl_dimension) { @@ -40939,9 +40969,9 @@ DecodeImage(DecodeImageCallbacks& callbacks, } wuffs_base__image_decoder::unique_ptr image_decoder(nullptr, &free); - DecodeImageResult result = - DecodeImage0(image_decoder, callbacks, input, *io_buf, pixel_blend.repr, - background_color.repr, max_incl_dimension.repr); + DecodeImageResult result = DecodeImage0( + image_decoder, callbacks, input, *io_buf, quirks.repr, pixel_blend.repr, + background_color.repr, max_incl_dimension.repr); callbacks.Done(result, input, *io_buf, std::move(image_decoder)); return result; }