diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 4acf5d74..915fef30 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -37790,74 +37790,82 @@ wuffs_png__decoder__decode_other_chunk( goto suspend; } self->private_impl.f_seen_plte = true; - } else if ((self->private_impl.f_chunk_type == 1297238115) && self->private_impl.f_report_metadata_chrm) { - if (self->private_impl.f_seen_chrm) { - status = wuffs_base__make_status(wuffs_png__error__bad_chunk); - goto exit; + } else if (self->private_impl.f_chunk_type == 1297238115) { + if (self->private_impl.f_report_metadata_chrm) { + if (self->private_impl.f_seen_chrm) { + 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(2); + status = wuffs_png__decoder__decode_chrm(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_chrm = true; } - if (a_src) { - a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } else if (self->private_impl.f_chunk_type == 1095582055) { + if (self->private_impl.f_report_metadata_gama) { + if (self->private_impl.f_seen_gama) { + 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(3); + status = wuffs_png__decoder__decode_gama(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_gama = true; } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - status = wuffs_png__decoder__decode_chrm(self, a_src); - if (a_src) { - iop_a_src = a_src->data.ptr + a_src->meta.ri; + } else if (self->private_impl.f_chunk_type == 1346585449) { + if (self->private_impl.f_report_metadata_iccp) { + if (self->private_impl.f_seen_iccp) { + 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_iccp(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_iccp = true; } - if (status.repr) { - goto suspend; + } else if (self->private_impl.f_chunk_type == 1111970419) { + if (self->private_impl.f_report_metadata_srgb) { + if (self->private_impl.f_seen_srgb) { + 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(5); + status = wuffs_png__decoder__decode_srgb(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_srgb = true; } - self->private_impl.f_seen_chrm = true; - } else if ((self->private_impl.f_chunk_type == 1095582055) && self->private_impl.f_report_metadata_gama) { - if (self->private_impl.f_seen_gama) { - 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(3); - status = wuffs_png__decoder__decode_gama(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_gama = true; - } else if ((self->private_impl.f_chunk_type == 1346585449) && self->private_impl.f_report_metadata_iccp) { - if (self->private_impl.f_seen_iccp) { - 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_iccp(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_iccp = true; - } else if ((self->private_impl.f_chunk_type == 1111970419) && self->private_impl.f_report_metadata_srgb) { - if (self->private_impl.f_seen_srgb) { - 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(5); - status = wuffs_png__decoder__decode_srgb(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_srgb = true; } else if (self->private_impl.f_chunk_type == 1397641844) { if (self->private_impl.f_seen_trns || (self->private_impl.f_color_type > 3) || ((self->private_impl.f_color_type == 3) && ! self->private_impl.f_seen_plte)) { status = wuffs_base__make_status(wuffs_png__error__bad_chunk); diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index d421d95d..d6df2357 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -452,33 +452,41 @@ pri func decoder.decode_other_chunk?(src: base.io_reader) { this.decode_plte?(src: args.src) this.seen_plte = true - } else if (this.chunk_type == 'cHRM'le) and this.report_metadata_chrm { - if this.seen_chrm { - return "#bad chunk" + } else if this.chunk_type == 'cHRM'le { + if this.report_metadata_chrm { + if this.seen_chrm { + return "#bad chunk" + } + this.decode_chrm?(src: args.src) + this.seen_chrm = true } - this.decode_chrm?(src: args.src) - this.seen_chrm = true - } else if (this.chunk_type == 'gAMA'le) and this.report_metadata_gama { - if this.seen_gama { - return "#bad chunk" + } else if this.chunk_type == 'gAMA'le { + if this.report_metadata_gama { + if this.seen_gama { + return "#bad chunk" + } + this.decode_gama?(src: args.src) + this.seen_gama = true } - this.decode_gama?(src: args.src) - this.seen_gama = true - } else if (this.chunk_type == 'iCCP'le) and this.report_metadata_iccp { - if this.seen_iccp { - return "#bad chunk" + } else if this.chunk_type == 'iCCP'le { + if this.report_metadata_iccp { + if this.seen_iccp { + return "#bad chunk" + } + this.decode_iccp?(src: args.src) + this.seen_iccp = true } - this.decode_iccp?(src: args.src) - this.seen_iccp = true - } else if (this.chunk_type == 'sRGB'le) and this.report_metadata_srgb { - if this.seen_srgb { - return "#bad chunk" + } else if this.chunk_type == 'sRGB'le { + if this.report_metadata_srgb { + if this.seen_srgb { + return "#bad chunk" + } + this.decode_srgb?(src: args.src) + this.seen_srgb = true } - this.decode_srgb?(src: args.src) - this.seen_srgb = true } else if this.chunk_type == 'tRNS'le { if this.seen_trns or (this.color_type > 3) or