diff --git a/internal/cgen/auxiliary/image.cc b/internal/cgen/auxiliary/image.cc index 8ac36ab4..312ec819 100644 --- a/internal/cgen/auxiliary/image.cc +++ b/internal/cgen/auxiliary/image.cc @@ -371,6 +371,9 @@ redirect: if (flags & DecodeImageArgFlags::REPORT_METADATA_CHRM) { image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__CHRM, true); } + if (flags & DecodeImageArgFlags::REPORT_METADATA_EXIF) { + image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__EXIF, true); + } if (flags & DecodeImageArgFlags::REPORT_METADATA_GAMA) { image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__GAMA, true); } diff --git a/internal/cgen/auxiliary/image.hh b/internal/cgen/auxiliary/image.hh index aedb1fc7..96919a5b 100644 --- a/internal/cgen/auxiliary/image.hh +++ b/internal/cgen/auxiliary/image.hh @@ -209,8 +209,8 @@ struct DecodeImageArgFlags { // DefaultValue returns 0. static DecodeImageArgFlags DefaultValue(); - // TODO: support all of the REPORT_METADATA_ETC flags, not just CHRM, GAMA, - // ICCP, KVP, SRGB and XMP. + // TODO: support all of the REPORT_METADATA_ETC flags, not just CHRM, EXIF, + // GAMA, ICCP, KVP, SRGB and XMP. // Background Color. static constexpr uint64_t REPORT_METADATA_BGCL = 0x0001; diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f27fe18c..6e5a08a6 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -9329,6 +9329,7 @@ struct wuffs_png__decoder__struct { uint64_t f_pass_workbuf_length; uint8_t f_call_sequence; bool f_report_metadata_chrm; + bool f_report_metadata_exif; bool f_report_metadata_gama; bool f_report_metadata_iccp; bool f_report_metadata_kvp; @@ -9341,6 +9342,7 @@ struct wuffs_png__decoder__struct { bool f_seen_actl; bool f_seen_chrm; bool f_seen_fctl; + bool f_seen_exif; bool f_seen_gama; bool f_seen_iccp; bool f_seen_idat; @@ -10369,8 +10371,8 @@ struct DecodeImageArgFlags { // DefaultValue returns 0. static DecodeImageArgFlags DefaultValue(); - // TODO: support all of the REPORT_METADATA_ETC flags, not just CHRM, GAMA, - // ICCP, KVP, SRGB and XMP. + // TODO: support all of the REPORT_METADATA_ETC flags, not just CHRM, EXIF, + // GAMA, ICCP, KVP, SRGB and XMP. // Background Color. static constexpr uint64_t REPORT_METADATA_BGCL = 0x0001; @@ -35601,6 +35603,11 @@ wuffs_png__decoder__decode_chrm( wuffs_png__decoder* self, wuffs_base__io_buffer* a_src); +static wuffs_base__status +wuffs_png__decoder__decode_exif( + wuffs_png__decoder* self, + wuffs_base__io_buffer* a_src); + static wuffs_base__status wuffs_png__decoder__decode_fctl( wuffs_png__decoder* self, @@ -37981,6 +37988,25 @@ wuffs_png__decoder__decode_other_chunk( } self->private_impl.f_seen_chrm = true; } + } else if (self->private_impl.f_chunk_type == 1716082789) { + if (self->private_impl.f_report_metadata_exif) { + if (self->private_impl.f_seen_exif) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + status = wuffs_png__decoder__decode_exif(self, a_src); + if (a_src) { + iop_a_src = a_src->data.ptr + a_src->meta.ri; + } + if (status.repr) { + goto suspend; + } + self->private_impl.f_seen_exif = true; + } } else if (self->private_impl.f_chunk_type == 1280598886) { if (self->private_impl.f_seen_fctl) { status = wuffs_base__make_status(wuffs_png__error__bad_chunk); @@ -37989,7 +38015,7 @@ wuffs_png__decoder__decode_other_chunk( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); status = wuffs_png__decoder__decode_fctl(self, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; @@ -38007,7 +38033,7 @@ wuffs_png__decoder__decode_other_chunk( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); status = wuffs_png__decoder__decode_gama(self, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; @@ -38026,7 +38052,7 @@ wuffs_png__decoder__decode_other_chunk( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); status = wuffs_png__decoder__decode_iccp(self, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; @@ -38045,7 +38071,7 @@ wuffs_png__decoder__decode_other_chunk( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); status = wuffs_png__decoder__decode_srgb(self, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; @@ -38063,7 +38089,7 @@ wuffs_png__decoder__decode_other_chunk( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); status = wuffs_png__decoder__decode_trns(self, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; @@ -38083,7 +38109,7 @@ wuffs_png__decoder__decode_other_chunk( } if (self->private_impl.f_metadata_fourcc == 0) { self->private_data.s_decode_other_chunk[0].scratch = self->private_impl.f_chunk_length; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); if (self->private_data.s_decode_other_chunk[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_other_chunk[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src)); iop_a_src = io2_a_src; @@ -38522,6 +38548,47 @@ wuffs_png__decoder__decode_chrm( return status; } +// -------- func png.decoder.decode_exif + +static wuffs_base__status +wuffs_png__decoder__decode_exif( + wuffs_png__decoder* self, + wuffs_base__io_buffer* a_src) { + wuffs_base__status status = wuffs_base__make_status(NULL); + + const uint8_t* iop_a_src = NULL; + const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + if (a_src) { + io0_a_src = a_src->data.ptr; + io1_a_src = io0_a_src + a_src->meta.ri; + iop_a_src = io1_a_src; + io2_a_src = io0_a_src + a_src->meta.wi; + } + + if (self->private_impl.f_chunk_length < 4) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_impl.f_metadata_flavor = 3; + self->private_impl.f_metadata_fourcc = 1163413830; + self->private_impl.f_metadata_x = 0; + self->private_impl.f_metadata_y = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))); + self->private_impl.f_metadata_z = wuffs_base__u64__sat_add(self->private_impl.f_metadata_y, ((uint64_t)(self->private_impl.f_chunk_length))); + self->private_impl.f_chunk_length = 0; + + goto ok; + ok: + goto exit; + exit: + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + + return status; +} + // -------- func png.decoder.decode_fctl static wuffs_base__status @@ -40476,6 +40543,8 @@ wuffs_png__decoder__set_report_metadata( if (a_fourcc == 1128813133) { self->private_impl.f_report_metadata_chrm = a_report; + } else if (a_fourcc == 1163413830) { + self->private_impl.f_report_metadata_exif = a_report; } else if (a_fourcc == 1195461953) { self->private_impl.f_report_metadata_gama = a_report; } else if (a_fourcc == 1229144912) { @@ -40570,6 +40639,27 @@ wuffs_png__decoder__tell_me_more( goto exit; } while (true) { + if (self->private_impl.f_metadata_flavor == 3) { + while (true) { + if (wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))) != self->private_impl.f_metadata_y) { + status = wuffs_base__make_status(wuffs_base__error__bad_i_o_position); + goto exit; + } else if (a_minfo != NULL) { + wuffs_base__more_information__set(a_minfo, + self->private_impl.f_metadata_flavor, + self->private_impl.f_metadata_fourcc, + self->private_impl.f_metadata_x, + self->private_impl.f_metadata_y, + self->private_impl.f_metadata_z); + } + if (self->private_impl.f_metadata_y >= self->private_impl.f_metadata_z) { + goto label__goto_done__break; + } + self->private_impl.f_metadata_y = self->private_impl.f_metadata_z; + status = wuffs_base__make_status(wuffs_base__suspension__even_more_information); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); + } + } if (self->private_impl.f_metadata_is_zlib_compressed) { if (self->private_impl.f_zlib_is_dirty) { wuffs_base__ignore_status(wuffs_zlib__decoder__initialize(&self->private_data.f_zlib, @@ -40640,7 +40730,7 @@ wuffs_png__decoder__tell_me_more( goto ok; } status = v_zlib_status; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); } else if (self->private_impl.f_chunk_type == 1951945833) { { const uint8_t *o_1_io2_a_src = io2_a_src; @@ -40686,7 +40776,7 @@ wuffs_png__decoder__tell_me_more( goto ok; } status = v_zlib_status; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); } else if (self->private_impl.f_chunk_type == 1951945850) { if (self->private_impl.f_ztxt_ri == self->private_impl.f_ztxt_wi) { { @@ -40753,7 +40843,7 @@ wuffs_png__decoder__tell_me_more( } else if (v_c2 <= 127) { if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4); v_c2 = 0; goto label__loop__continue; } @@ -40762,7 +40852,7 @@ wuffs_png__decoder__tell_me_more( } else { if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 1) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5); v_c2 = 0; goto label__loop__continue; } @@ -40784,7 +40874,7 @@ wuffs_png__decoder__tell_me_more( goto ok; } else if (v_zlib_status.repr != wuffs_base__suspension__short_write) { status = v_zlib_status; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); } } else { status = wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_chunk_type); @@ -40796,11 +40886,11 @@ wuffs_png__decoder__tell_me_more( goto label__loop__break; } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); goto label__loop__continue; } else if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); goto label__loop__continue; } self->private_impl.f_chunk_length -= 1; @@ -40818,7 +40908,7 @@ wuffs_png__decoder__tell_me_more( goto label__loop__break; } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9); goto label__loop__continue; } v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src); @@ -40834,7 +40924,7 @@ wuffs_png__decoder__tell_me_more( } else if (v_c2 <= 127) { if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10); v_c2 = 0; goto label__loop__continue; } @@ -40844,7 +40934,7 @@ wuffs_png__decoder__tell_me_more( } else { if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 1) { status = wuffs_base__make_status(wuffs_base__suspension__short_write); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(11); v_c2 = 0; goto label__loop__continue; } @@ -40868,7 +40958,7 @@ wuffs_png__decoder__tell_me_more( } self->private_impl.f_chunk_length -= 2; { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; @@ -40885,7 +40975,7 @@ wuffs_png__decoder__tell_me_more( goto exit; } { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; @@ -40907,7 +40997,7 @@ wuffs_png__decoder__tell_me_more( } self->private_impl.f_chunk_length -= 1; { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; @@ -40928,7 +41018,7 @@ wuffs_png__decoder__tell_me_more( } self->private_impl.f_chunk_length -= 1; { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; @@ -40948,7 +41038,7 @@ wuffs_png__decoder__tell_me_more( goto exit; } self->private_data.s_tell_me_more[0].scratch = 4; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); if (self->private_data.s_tell_me_more[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_tell_me_more[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src)); iop_a_src = io2_a_src; @@ -43132,6 +43222,9 @@ redirect: if (flags & DecodeImageArgFlags::REPORT_METADATA_CHRM) { image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__CHRM, true); } + if (flags & DecodeImageArgFlags::REPORT_METADATA_EXIF) { + image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__EXIF, true); + } if (flags & DecodeImageArgFlags::REPORT_METADATA_GAMA) { image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__GAMA, true); } diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 5458f1ba..225ea903 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -75,6 +75,7 @@ pub struct decoder? implements base.image_decoder( call_sequence : base.u8, report_metadata_chrm : base.bool, + report_metadata_exif : base.bool, report_metadata_gama : base.bool, report_metadata_iccp : base.bool, report_metadata_kvp : base.bool, @@ -90,6 +91,7 @@ pub struct decoder? implements base.image_decoder( seen_actl : base.bool, seen_chrm : base.bool, seen_fctl : base.bool, + seen_exif : base.bool, seen_gama : base.bool, seen_iccp : base.bool, seen_idat : base.bool, @@ -576,6 +578,15 @@ pri func decoder.decode_other_chunk?(src: base.io_reader) { this.seen_chrm = true } + } else if this.chunk_type == 'eXIf'le { + if this.report_metadata_exif { + if this.seen_exif { + return "#bad chunk" + } + this.decode_exif?(src: args.src) + this.seen_exif = true + } + } else if this.chunk_type == 'fcTL'le { if this.seen_fctl { return "#bad chunk" @@ -689,6 +700,18 @@ pri func decoder.decode_chrm?(src: base.io_reader) { this.metadata_z |= (0xFF_FFFF & u) << 40 } +pri func decoder.decode_exif?(src: base.io_reader) { + if this.chunk_length < 4 { + return "#bad chunk" + } + this.metadata_flavor = base.MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH + this.metadata_fourcc = 'EXIF'be + this.metadata_x = 0 + this.metadata_y = args.src.position() + this.metadata_z = this.metadata_y ~sat+ (this.chunk_length as base.u64) + this.chunk_length = 0 +} + pri func decoder.decode_fctl?(src: base.io_reader) { var x0 : base.u32 var y0 : base.u32 @@ -1338,6 +1361,8 @@ pub func decoder.restart_frame!(index: base.u64, io_position: base.u64) base.sta pub func decoder.set_report_metadata!(fourcc: base.u32, report: base.bool) { if args.fourcc == 'CHRM'be { this.report_metadata_chrm = args.report + } else if args.fourcc == 'EXIF'be { + this.report_metadata_exif = args.report } else if args.fourcc == 'GAMA'be { this.report_metadata_gama = args.report } else if args.fourcc == 'ICCP'be { @@ -1366,6 +1391,26 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform } while.goto_done true {{ + if this.metadata_flavor == base.MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH { + while true { + if args.src.position() <> this.metadata_y { + return base."#bad I/O position" + } else if args.minfo <> nullptr { + args.minfo.set!( + flavor: this.metadata_flavor, + w: this.metadata_fourcc, + x: this.metadata_x, + y: this.metadata_y, + z: this.metadata_z) + } + if this.metadata_y >= this.metadata_z { + break.goto_done + } + this.metadata_y = this.metadata_z + yield? base."$even more information" + } endwhile + } + if this.metadata_is_zlib_compressed { if this.zlib_is_dirty { this.zlib.reset!() diff --git a/test/c/std/png.c b/test/c/std/png.c index a2262e57..c77cb90b 100644 --- a/test/c/std/png.c +++ b/test/c/std/png.c @@ -634,6 +634,71 @@ test_wuffs_png_decode_metadata_chrm_gama_srgb() { return NULL; } +const char* // +test_wuffs_png_decode_metadata_exif() { + CHECK_FOCUS(__func__); + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = g_src_slice_u8, + }); + CHECK_STRING(read_file(&src, "test/data/artificial-png/exif.png")); + + wuffs_png__decoder dec; + CHECK_STATUS("initialize", + wuffs_png__decoder__initialize( + &dec, sizeof dec, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + wuffs_png__decoder__set_report_metadata(&dec, WUFFS_BASE__FOURCC__EXIF, true); + + wuffs_base__image_config ic = ((wuffs_base__image_config){}); + wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer(); + wuffs_base__more_information minfo = wuffs_base__empty_more_information(); + + wuffs_base__status status = + wuffs_png__decoder__decode_image_config(&dec, &ic, &src); + if (status.repr != wuffs_base__note__metadata_reported) { + RETURN_FAIL("decode_image_config #0: have \"%s\", want \"%s\"", status.repr, + wuffs_base__note__metadata_reported); + } + + status = wuffs_png__decoder__tell_me_more(&dec, &empty, &minfo, &src); + if (status.repr != wuffs_base__suspension__even_more_information) { + RETURN_FAIL("tell_me_more #0: have \"%s\", want \"%s\"", status.repr, + wuffs_base__suspension__even_more_information); + } + + // "hd test/data/artificial-png/exif.png" says 0x29..0x33 holds "LoremIpsum". + wuffs_base__range_ie_u64 have = + wuffs_base__more_information__metadata_raw_passthrough__range(&minfo); + wuffs_base__range_ie_u64 want = wuffs_base__make_range_ie_u64(0x29, 0x33); + if (!wuffs_base__range_ie_u64__equals(&have, want)) { + RETURN_FAIL("range #0: have 0x%" PRIx64 "..0x%" PRIX64 ", want 0x%" PRIx64 + "..0x%" PRIX64, + have.min_incl, have.max_excl, want.min_incl, want.max_excl); + } else if ((src.meta.ri == 0x29) && (src.meta.wi >= 0x33)) { + src.meta.ri = 0x33; + } + + status = wuffs_png__decoder__tell_me_more(&dec, &empty, &minfo, &src); + if (status.repr != NULL) { + RETURN_FAIL("tell_me_more #1: have \"%s\", want \"(null)\"", status.repr); + } + have = wuffs_base__more_information__metadata_raw_passthrough__range(&minfo); + if (!wuffs_base__range_ie_u64__is_empty(&have)) { + RETURN_FAIL("tell_me_more #1: non-empty range"); + } + + status = wuffs_png__decoder__decode_image_config(&dec, &ic, &src); + if (status.repr != NULL) { + RETURN_FAIL("decode_image_config #1: have \"%s\", want \"(null)\"", + status.repr); + } else if (wuffs_base__pixel_config__width(&ic.pixcfg) != 1) { + RETURN_FAIL("decode_image_config #1: have %" PRIu32 ", want 1", + wuffs_base__pixel_config__width(&ic.pixcfg)); + } + + return NULL; +} + const char* // test_wuffs_png_decode_metadata_iccp() { CHECK_FOCUS(__func__); @@ -1201,6 +1266,7 @@ proc g_tests[] = { test_wuffs_png_decode_frame_config, test_wuffs_png_decode_interface, test_wuffs_png_decode_metadata_chrm_gama_srgb, + test_wuffs_png_decode_metadata_exif, test_wuffs_png_decode_metadata_iccp, test_wuffs_png_decode_metadata_kvp, test_wuffs_png_decode_restart_frame, diff --git a/test/data/artificial-png/exif.png b/test/data/artificial-png/exif.png new file mode 100644 index 00000000..df8346c5 Binary files /dev/null and b/test/data/artificial-png/exif.png differ diff --git a/test/data/artificial-png/exif.png.make-artificial.txt b/test/data/artificial-png/exif.png.make-artificial.txt new file mode 100644 index 00000000..469e9f04 --- /dev/null +++ b/test/data/artificial-png/exif.png.make-artificial.txt @@ -0,0 +1,32 @@ +# Feed this file to script/make-artificial.go + +make png + +magic + +IHDR { + raw { + # Width, height. + 0x00 0x00 0x00 0x01 + 0x00 0x00 0x00 0x01 + # Depth, color, compression, filter, interlace. + 0x08 0x00 0x00 0x00 0x00 + } +} + +eXIf { + raw { + # "LoremIpsum" isn't valid EXIF data. It's just a placeholder. + 0x4C 0x6F 0x72 0x65 0x6D 0x49 0x70 0x73 0x75 0x6D + } +} + +IDAT { + zlib { + # 1x1 gray pixels (with filter bytes). + 0x00 0x80 + } +} + +IEND { +} diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 7707d55b..46267137 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -22,6 +22,7 @@ ac9d76d8 test/data/artificial-gif/pixel-data-not-enough.gif beaec397 test/data/artificial-gif/transparent-index.gif f33b9bc1 test/data/artificial-gif/zero-width-frame.gif 0564b364 test/data/artificial-png/apng-skip-idat.png +e08a7cc8 test/data/artificial-png/exif.png e08a7cc8 test/data/artificial-png/key-value-pairs.png 076cb375 test/data/bricks-color.bmp 076cb375 test/data/bricks-color.png