From 2ed84b6c004be113bc3410c3e1ac18f376c58a2e Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 15 Jul 2025 15:57:36 +1000 Subject: [PATCH] std/nie: support premultiplied alpha formats --- release/c/wuffs-unsupported-snapshot.c | 12 ++++-------- std/nie/decode_nie.wuffs | 11 ++++++----- test/data/49.bn4.nie | Bin 0 -> 1040 bytes test/data/49.bn8.nie | Bin 0 -> 2064 bytes test/data/49.bp4.nie | Bin 0 -> 1040 bytes test/data/49.bp8.nie | Bin 0 -> 2064 bytes test/data/README.md | 3 ++- test/nia-checksums-of-data.txt | 4 ++++ 8 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 test/data/49.bn4.nie create mode 100644 test/data/49.bn8.nie create mode 100644 test/data/49.bp4.nie create mode 100644 test/data/49.bp8.nie diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 5c2cdf85..3f4d94b8 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -12813,7 +12813,6 @@ struct wuffs_netpbm__decoder__struct { extern const char wuffs_nie__error__bad_frame[]; extern const char wuffs_nie__error__bad_header[]; extern const char wuffs_nie__error__truncated_input[]; -extern const char wuffs_nie__error__unsupported_nie_file[]; extern const char wuffs_nie__error__unsupported_restart_frame_index[]; // ---------------- Public Consts @@ -66756,7 +66755,6 @@ wuffs_netpbm__decoder__workbuf_len( const char wuffs_nie__error__bad_frame[] = "#nie: bad frame"; const char wuffs_nie__error__bad_header[] = "#nie: bad header"; const char wuffs_nie__error__truncated_input[] = "#nie: truncated input"; -const char wuffs_nie__error__unsupported_nie_file[] = "#nie: unsupported NIE file"; const char wuffs_nie__error__unsupported_restart_frame_index[] = "#nie: unsupported restart frame index"; const char wuffs_nie__note__internal_note_short_read[] = "@nie: internal note: short read"; @@ -67125,11 +67123,9 @@ wuffs_nie__decoder__do_decode_image_config( } else if (v_a == 946758399u) { self->private_impl.f_pixfmt = 2164308923u; } else if (v_a == 879780607u) { - status = wuffs_base__make_status(wuffs_nie__error__unsupported_nie_file); - goto exit; + self->private_impl.f_pixfmt = 2181073032u; } else if (v_a == 946889471u) { - status = wuffs_base__make_status(wuffs_nie__error__unsupported_nie_file); - goto exit; + self->private_impl.f_pixfmt = 2181086139u; } else { status = wuffs_base__make_status(wuffs_nie__error__bad_header); goto exit; @@ -67672,7 +67668,7 @@ wuffs_nie__decoder__skip_frame( switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - if (self->private_impl.f_pixfmt == 2164308923u) { + if ((self->private_impl.f_pixfmt == 2164308923u) || (self->private_impl.f_pixfmt == 2181086139u)) { v_src_bytes_per_pixel = 8u; } else { v_src_bytes_per_pixel = 4u; @@ -67967,7 +67963,7 @@ wuffs_nie__decoder__swizzle( v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel))); if (v_i >= ((uint64_t)(v_dst.len))) { v_src_bytes_per_pixel = 4u; - if (self->private_impl.f_pixfmt == 2164308923u) { + if ((self->private_impl.f_pixfmt == 2164308923u) || (self->private_impl.f_pixfmt == 2181086139u)) { v_src_bytes_per_pixel = 8u; } v_n = (((uint64_t)(io2_a_src - iop_a_src)) / ((uint64_t)(v_src_bytes_per_pixel))); diff --git a/std/nie/decode_nie.wuffs b/std/nie/decode_nie.wuffs index a818a8a4..fd4e858c 100644 --- a/std/nie/decode_nie.wuffs +++ b/std/nie/decode_nie.wuffs @@ -11,7 +11,6 @@ pub status "#bad frame" pub status "#bad header" pub status "#truncated input" -pub status "#unsupported NIE file" pub status "#unsupported restart frame index" pri status "@internal note: short read" @@ -88,9 +87,9 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. } else if a == '\xFFbn8'le { this.pixfmt = base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE } else if a == '\xFFbp4'le { - return "#unsupported NIE file" + this.pixfmt = base.PIXEL_FORMAT__BGRA_PREMUL } else if a == '\xFFbp8'le { - return "#unsupported NIE file" + this.pixfmt = base.PIXEL_FORMAT__BGRA_PREMUL_4X16LE } else { return "#bad header" } @@ -229,7 +228,8 @@ pri func decoder.decode_animation_info?(src: base.io_reader) { pri func decoder.skip_frame?(src: base.io_reader) { var src_bytes_per_pixel : base.u64[..= 8] - if this.pixfmt == base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE { + if (this.pixfmt == base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE) or + (this.pixfmt == base.PIXEL_FORMAT__BGRA_PREMUL_4X16LE) { src_bytes_per_pixel = 8 } else { src_bytes_per_pixel = 4 @@ -356,7 +356,8 @@ pri func decoder.swizzle!(dst: ptr base.pixel_buffer, src: base.io_reader) base. if i >= dst.length() { src_bytes_per_pixel = 4 assert src_bytes_per_pixel > 0 - if this.pixfmt == base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE { + if (this.pixfmt == base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE) or + (this.pixfmt == base.PIXEL_FORMAT__BGRA_PREMUL_4X16LE) { src_bytes_per_pixel = 8 assert src_bytes_per_pixel > 0 } diff --git a/test/data/49.bn4.nie b/test/data/49.bn4.nie new file mode 100644 index 0000000000000000000000000000000000000000..b31fde9f96a45034e8bd5156d23a3c1380165c75 GIT binary patch literal 1040 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 RSQ!|6_5c5mLADTu4FGrh%Y^^{ literal 0 HcmV?d00001 diff --git a/test/data/49.bp4.nie b/test/data/49.bp4.nie new file mode 100644 index 0000000000000000000000000000000000000000..7bd3967c6b224265a70be8df145e79fce1338096 GIT binary patch literal 1040 zcmc~hyx#SHQh|v80|NsHGq{{T&)|0D3K+YbJICO7gdQIU}(s|rKrf@dG{`Z_md|K-j5$Mc-+3t05Ze=zySuU zjT;$E7cF8im^_(5ySbS`t+<%kB)pv6&906~**=g#(8Pp+TSbMz=lOGnfX|;90zQ5O zo8xx%Dud(EqYO4%w=$S5UCLlMbt;2yOS@Es?isn6!VjcoNL)}o&GMPuSUZe?M^%-< z_r(i_z;E9e0>6A=@Ok=_!R^{L2FGK^7;Ls}V=!N~jKOf)G|71Hedqz zLzSmX9#rTNSq0Yb_22=6@5`59b3E_eV{pBAk-_26AqK1U>lsWJE@UvAGR3w-^qrWW z?|cTuloST(kPwv`a2E)md8JIXY7?je}nT)z8 zhfintFJKeZ&7hE&$RHgQN?^A-ojS$fbn+xP>`ms)W8jpPWng4x zX3%PEWYFvAN|?a;%`DA$JD+i2v1yU|%G4{2e+-Jm`xv<7)k;bjm^nEa^m=cZHOM@TiV6nh>}&>ZWn~8KmKFweC|@o%mO&~Yz$!(3O2$gA3*fk86BT7Jnm(Pu zVA3S8Uz9R3z-)0hHwIxVE0A6m^{gU@ze7SKjcn7}x3ImEF;)r&yOV{VpFy{ygMm*= zi-AK@l0nqLfkDL1jsavYmx2O=l%HQhtoGivI-$GOjiTp!=W#yNv{g<4+s!T}1`cD8 z`@~#b8AP3&Ao^`=7(hV4$cRDG$A?)iI8xETCPzWvIFU)n*o=WkU7dkLN{WGnmzRNo ziHQN^W~Izb1~AUZ0L2djBP%O|Y(xY&t&4kjFo@XOgVQUorY6|ktb&3Jj4Ui5YryJc zBO@8WI3j{U(A1QHO<0&g!pn<6%-NYi*xH%_>KxXmj>Vnf5D6T;EGO@FRw862Eg$09;o}4Q3$78u003Oh29p2) literal 0 HcmV?d00001 diff --git a/test/data/49.bp8.nie b/test/data/49.bp8.nie new file mode 100644 index 0000000000000000000000000000000000000000..5955a34389f02f9f4c86f3ba159256cb78d713f7 GIT binary patch literal 2064 zcmc~hyx#SHQh|j40|NsHGcf#f`F;NPc?O0>ZZEIAyu!dx?N)N7S)W-S1A~B;UcFvD1H&(s zkNF?-85pj~w#_fWMHrmSZlb}kb&VJ*Kft&iVO_do(^{% z?lLgk@SgZ&;u8jjsotj^pL)!|aL~i?w&QIEhS@Hc&Rsgk!0_7sz<~n?7#Mz9z1sL{ zBLl+|)76VsFJfTWYhW_jWHJLotM=sP$;}K59%?s=ZxrujHaEE$zM?#WeUjTRyS;TP zOjngz?1KXt7*qsvOma*Z7%p;GsZ^;jFl_OWd@lK%fnjri)Mu&B3=CQUwI6FgGBBL+ zPI;2@gn?m~o7q*fs|*Znj+2j0KFYvgZ?kLbuB{9VZ_O?(y|k2pVXon|sn@11VtB4A z(K4@{Mark*xNiKJC2|{PE*Jj#;Dc1{jAV%g7s^#jPs^}u{;bWu!1%j1YZwEA4bL*w zWvUDeX1;S?%z44Ua5k{)TiG`T2ARN!FA-lD7#w_dJ>B(`f#I(k%Qcp33=EqcrH)A* zV_-4i2je&v9TxproG6sfChGNsirX81bj?eHuxz9yirfH4*$Lm21QJP-9xZuzn!}gS4UF6u&99w*NaM zMZ?}*7gO+a@cloZfx%PpR?4ju28N%~??T>%+)ER69{y!4vR3f#I(c^C{+23=9vP zR-9aMl7Yd+@xqY{M;I8gOf=?c%wu4f%_%4=D9ga0!Pw8-&&Mo6hJrlS%uYEgg7MxaVJZt-2zIGIR%85maEFmGqx&cLw2mVX!jE(V4JtfJYAM^Z7l=ezXPI2O+pmU2QV-kE3k(cT zxi_k8RAFHF$aY2aiYNm^u+gvSzos)Vq!?ICvY5oc5XGIUl&ZwQuwCg{#$+;!S?rCrn6msl_PV^I8kXqFayI<&X2MmWf>T*vDEU{@-r|<>-u!~bTBaJ z@x9V|rNzKd%CS&#p(F!?muQSbi~|EhzlejKgB=6IcQy%82~h@yhg`oDekm|8a7aD$ zd+6tz@F&(?d+XlcZHw!IgudT(supa#CMtJ+YH#2?PR@dd^E4}MLzGKX7#P-aGpR7C zFffR-yNJ1nF)$P{`EmGhFfd$Eudk@DU|@JI7VH}A%D`}0l+%gRiGiU~^tZ!r2L=W~ zkwZ3zY#11L7}Ocm85kJ)1YC?_}!yL|A zvbSUz7#^|C7n(1`z`)M*kL@2DC>%W)JV4e%@h9LR z7_NymxHh;lFyx8)I{G>?Fw7UeZGGFCfgxMa&D715f#Dh7M%|6N3=I4{I;uLV3=Ho% z&Pkt>W?-1jdS39nAOnLWlP$X~I|G9RLp?)1)J|k-ka|Cai-ZW)k@Dq4z_|}ktVIkimokuzh4AXgzs2x#bU@+raF27u!fuWCmrT9v5 g28MYoH~DVzF)&PKoWwebm4QK!A%-Ca*+LXH0EpnKh5!Hn literal 0 HcmV?d00001 diff --git a/test/data/README.md b/test/data/README.md index 4c7173b1..dad20c14 100644 --- a/test/data/README.md +++ b/test/data/README.md @@ -39,7 +39,8 @@ The non-ascii directory holds trivial UTF-8 (but not ASCII) text files. --- `36.png` and `49.png` are simple, artificially generated images. The generation -script is `gen-36-49.go` from https://github.com/nigeltao/etc2 +script is `gen-36-49.go` from https://github.com/nigeltao/etc2 and the +`49.*.nie` variants were generated from a customized version of that script. `DCI-P3-D65.icc` comes from [color.org](https://www.color.org/chardata/rgb/DCIP3.xalter). diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 792b5dee..12ca826b 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -1,5 +1,9 @@ # Generated by script/print-nia-checksums.sh OK. 9720c028 test/data/36.png +OK. c3528d19 test/data/49.bn4.nie +OK. c3528d19 test/data/49.bn8.nie +OK. e3bae566 test/data/49.bp4.nie +OK. c3528d19 test/data/49.bp8.nie OK. f2a0a3f6 test/data/49.png OK. d3bb0beb test/data/DCI-P3-D65.icc OK. 646e081a test/data/animated-red-blue.000000.nie