From 34cfc3f8636c667cea81b83655af934478c05f3a Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 24 May 2018 10:33:02 +1000 Subject: [PATCH] Have std/gif's palettes be BGRA, not RGB --- gen/c/std/gif.c | 45 +++++++++++++++++------------- gen/h/std/gif.h | 7 ++--- script/extract-palette-indexes.go | 16 ++++++----- std/gif/decode_gif.wuffs | 35 ++++++++++++----------- test/c/std/gif.c | 8 +++--- test/c/testlib/testlib.c | 2 +- test/data/bricks-dither.palette | Bin 768 -> 1024 bytes test/data/bricks-nodither.palette | Bin 768 -> 1024 bytes 8 files changed, 60 insertions(+), 53 deletions(-) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 1614909b..b8f340b9 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1213,8 +1213,7 @@ typedef struct { uint32_t f_uncompressed_ri; uint32_t f_uncompressed_wi; uint8_t f_uncompressed[4096]; - uint8_t f_gct[768]; - uint8_t f_lct[768]; + uint8_t f_palettes[2][1024]; wuffs_gif__lzw_decoder f_lzw; struct { @@ -1236,7 +1235,7 @@ typedef struct { uint32_t coro_susp_point; uint8_t v_c[7]; uint32_t v_i; - uint32_t v_gct_size; + uint32_t v_num_palette_entries; } c_decode_lsd[1]; struct { uint32_t coro_susp_point; @@ -1264,7 +1263,7 @@ typedef struct { struct { uint32_t coro_susp_point; uint8_t v_flags; - uint32_t v_lct_size; + uint32_t v_num_palette_entries; uint32_t v_i; uint8_t v_lw; uint64_t v_block_size; @@ -2321,7 +2320,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( uint8_t v_c[7]; uint32_t v_i; - uint32_t v_gct_size; + uint32_t v_num_palette_entries; uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; @@ -2343,7 +2342,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( if (coro_susp_point) { memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, sizeof(v_c)); v_i = self->private_impl.c_decode_lsd[0].v_i; - v_gct_size = self->private_impl.c_decode_lsd[0].v_gct_size; + v_num_palette_entries = + self->private_impl.c_decode_lsd[0].v_num_palette_entries; } else { } switch (coro_susp_point) { @@ -2369,16 +2369,16 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( self->private_impl.f_background_color_index = v_c[5]; self->private_impl.f_have_gct = ((v_c[4] & 128) != 0); if (self->private_impl.f_have_gct) { - v_gct_size = (((uint32_t)(1)) << (1 + (v_c[4] & 7))); + v_num_palette_entries = (((uint32_t)(1)) << (1 + (v_c[4] & 7))); v_i = 0; - while (v_i < v_gct_size) { + while (v_i < v_num_palette_entries) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) { goto short_read_src; } uint8_t t_1 = *ioptr_src++; - self->private_impl.f_gct[((3 * v_i) + 0)] = t_1; + self->private_impl.f_palettes[0][((4 * v_i) + 2)] = t_1; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); @@ -2386,7 +2386,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( goto short_read_src; } uint8_t t_2 = *ioptr_src++; - self->private_impl.f_gct[((3 * v_i) + 1)] = t_2; + self->private_impl.f_palettes[0][((4 * v_i) + 1)] = t_2; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); @@ -2394,8 +2394,9 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( goto short_read_src; } uint8_t t_3 = *ioptr_src++; - self->private_impl.f_gct[((3 * v_i) + 2)] = t_3; + self->private_impl.f_palettes[0][((4 * v_i) + 0)] = t_3; } + self->private_impl.f_palettes[0][((4 * v_i) + 3)] = 255; v_i += 1; } } @@ -2411,7 +2412,8 @@ suspend: self->private_impl.c_decode_lsd[0].coro_susp_point = coro_susp_point; memcpy(self->private_impl.c_decode_lsd[0].v_c, v_c, sizeof(v_c)); self->private_impl.c_decode_lsd[0].v_i = v_i; - self->private_impl.c_decode_lsd[0].v_gct_size = v_gct_size; + self->private_impl.c_decode_lsd[0].v_num_palette_entries = + v_num_palette_entries; goto exit; exit: @@ -3036,7 +3038,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( wuffs_gif__status status = WUFFS_GIF__STATUS_OK; uint8_t v_flags; - uint32_t v_lct_size; + uint32_t v_num_palette_entries; uint32_t v_i; uint8_t v_lw; uint64_t v_block_size; @@ -3092,7 +3094,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( self->private_impl.c_decode_id_part1[0].coro_susp_point; if (coro_susp_point) { v_flags = self->private_impl.c_decode_id_part1[0].v_flags; - v_lct_size = self->private_impl.c_decode_id_part1[0].v_lct_size; + v_num_palette_entries = + self->private_impl.c_decode_id_part1[0].v_num_palette_entries; v_i = self->private_impl.c_decode_id_part1[0].v_i; v_lw = self->private_impl.c_decode_id_part1[0].v_lw; v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; @@ -3125,16 +3128,16 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( self->private_impl.f_interlace = ((v_flags & 64) != 0); self->private_impl.f_have_lct = ((v_flags & 128) != 0); if (self->private_impl.f_have_lct) { - v_lct_size = (((uint32_t)(1)) << (1 + (v_flags & 7))); + v_num_palette_entries = (((uint32_t)(1)) << (1 + (v_flags & 7))); v_i = 0; - while (v_i < v_lct_size) { + while (v_i < v_num_palette_entries) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) { goto short_read_src; } uint8_t t_1 = *ioptr_src++; - self->private_impl.f_lct[((3 * v_i) + 0)] = t_1; + self->private_impl.f_palettes[1][((4 * v_i) + 2)] = t_1; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); @@ -3142,7 +3145,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( goto short_read_src; } uint8_t t_2 = *ioptr_src++; - self->private_impl.f_lct[((3 * v_i) + 1)] = t_2; + self->private_impl.f_palettes[1][((4 * v_i) + 1)] = t_2; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); @@ -3150,8 +3153,9 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( goto short_read_src; } uint8_t t_3 = *ioptr_src++; - self->private_impl.f_lct[((3 * v_i) + 2)] = t_3; + self->private_impl.f_palettes[1][((4 * v_i) + 0)] = t_3; } + self->private_impl.f_palettes[1][((4 * v_i) + 3)] = 255; v_i += 1; } } @@ -3293,7 +3297,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( suspend: self->private_impl.c_decode_id_part1[0].coro_susp_point = coro_susp_point; self->private_impl.c_decode_id_part1[0].v_flags = v_flags; - self->private_impl.c_decode_id_part1[0].v_lct_size = v_lct_size; + self->private_impl.c_decode_id_part1[0].v_num_palette_entries = + v_num_palette_entries; self->private_impl.c_decode_id_part1[0].v_i = v_i; self->private_impl.c_decode_id_part1[0].v_lw = v_lw; self->private_impl.c_decode_id_part1[0].v_block_size = v_block_size; diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index d7129c83..5b8a327a 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1213,8 +1213,7 @@ typedef struct { uint32_t f_uncompressed_ri; uint32_t f_uncompressed_wi; uint8_t f_uncompressed[4096]; - uint8_t f_gct[768]; - uint8_t f_lct[768]; + uint8_t f_palettes[2][1024]; wuffs_gif__lzw_decoder f_lzw; struct { @@ -1236,7 +1235,7 @@ typedef struct { uint32_t coro_susp_point; uint8_t v_c[7]; uint32_t v_i; - uint32_t v_gct_size; + uint32_t v_num_palette_entries; } c_decode_lsd[1]; struct { uint32_t coro_susp_point; @@ -1264,7 +1263,7 @@ typedef struct { struct { uint32_t coro_susp_point; uint8_t v_flags; - uint32_t v_lct_size; + uint32_t v_num_palette_entries; uint32_t v_i; uint8_t v_lw; uint64_t v_block_size; diff --git a/script/extract-palette-indexes.go b/script/extract-palette-indexes.go index 3d12ad8e..33061441 100644 --- a/script/extract-palette-indexes.go +++ b/script/extract-palette-indexes.go @@ -17,8 +17,9 @@ package main // extract-palette-indexes.go extracts the 1-byte-per-pixel indexes and, for -// paletted images, the 3-byte-per-entry RGB palette of a paletted or gray GIF -// and PNG image. It checks that the GIF and PNG encode equivalent images. +// paletted images, the 4-byte-per-entry BGRA (premultiplied alpha) palette of +// a paletted or gray GIF and PNG image. It checks that the GIF and PNG encode +// equivalent images. // // Usage: go run extract-palette-indexes.go foo.gif foo.png @@ -94,13 +95,14 @@ func decode(filename string) (palette []byte, indexes []byte, err error) { case *image.Gray: return nil, m.Pix, nil case *image.Paletted: - palette = make([]byte, 3*256) + palette = make([]byte, 4*256) allGray := true for i, c := range m.Palette { - r, g, b, _ := c.RGBA() - palette[3*i+0] = uint8(r >> 8) - palette[3*i+1] = uint8(g >> 8) - palette[3*i+2] = uint8(b >> 8) + r, g, b, a := c.RGBA() + palette[4*i+0] = uint8(b >> 8) + palette[4*i+1] = uint8(g >> 8) + palette[4*i+2] = uint8(r >> 8) + palette[4*i+3] = uint8(a >> 8) if allGray { y := uint32(i) allGray = r>>8 == y && g>>8 == y && b>>8 == y diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 9e08dc9b..6c2b38a6 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -56,11 +56,8 @@ pub struct decoder?( uncompressed_wi base.u32[..4096], uncompressed array[4096] base.u8, - // gct and lct are the Global / Local Color Tables: 256 (R, G, B) entries. - // - // TODO: 4 byte per pixel RGBA or BGRA instead of 3 bpp RGB? - gct array[3 * 256] base.u8, - lct array[3 * 256] base.u8, + // palettes[0] and palettes[1] are the Global and Local Color Table. + palettes array[2] array[4 * 256] base.u8, lzw lzw_decoder, ) @@ -162,13 +159,15 @@ pri func decoder.decode_lsd?(src base.io_reader)() { // Read the optional Global Color Table. this.have_gct = (c[4] & 0x80) != 0 if this.have_gct { - var gct_size base.u32[..256] = (1 as base.u32) << (1 + (c[4] & 0x07)) + var num_palette_entries base.u32[..256] = (1 as base.u32) << (1 + (c[4] & 0x07)) i = 0 - while i < gct_size { - assert i < 256 via "a < b: a < c; c <= b"(c:gct_size) - this.gct[(3 * i) + 0] = in.src.read_u8?() - this.gct[(3 * i) + 1] = in.src.read_u8?() - this.gct[(3 * i) + 2] = in.src.read_u8?() + while i < num_palette_entries { + assert i < 256 via "a < b: a < c; c <= b"(c:num_palette_entries) + // Convert from RGB to BGRA. + this.palettes[0][(4 * i) + 2] = in.src.read_u8?() + this.palettes[0][(4 * i) + 1] = in.src.read_u8?() + this.palettes[0][(4 * i) + 0] = in.src.read_u8?() + this.palettes[0][(4 * i) + 3] = 0xFF i += 1 } } @@ -319,13 +318,15 @@ pri func decoder.decode_id_part1?(ib ptr base.image_buffer, dst base.io_writer, // Read the optional Local Color Table. this.have_lct = (flags & 0x80) != 0 if this.have_lct { - var lct_size base.u32[..256] = (1 as base.u32) << (1 + (flags & 0x07)) + var num_palette_entries base.u32[..256] = (1 as base.u32) << (1 + (flags & 0x07)) var i base.u32 - while i < lct_size { - assert i < 256 via "a < b: a < c; c <= b"(c:lct_size) - this.lct[(3 * i) + 0] = in.src.read_u8?() - this.lct[(3 * i) + 1] = in.src.read_u8?() - this.lct[(3 * i) + 2] = in.src.read_u8?() + while i < num_palette_entries { + assert i < 256 via "a < b: a < c; c <= b"(c:num_palette_entries) + // Convert from RGB to BGRA. + this.palettes[1][(4 * i) + 2] = in.src.read_u8?() + this.palettes[1][(4 * i) + 1] = in.src.read_u8?() + this.palettes[1][(4 * i) + 0] = in.src.read_u8?() + this.palettes[1][(4 * i) + 3] = 0xFF i += 1 } } diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 33953947..b07f8d4b 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -496,11 +496,11 @@ bool do_test_wuffs_gif_decode(const char* filename, } // TODO: provide a public API for getting the palette. - wuffs_base__io_buffer pal_got = {.ptr = dec.private_impl.f_gct, - .len = 3 * 256}; + wuffs_base__io_buffer pal_got = {.ptr = dec.private_impl.f_palettes[0], + .len = 4 * 256}; wuffs_base__io_buffer pal_want = {.ptr = global_palette_buffer, - .len = 3 * 256}; - pal_got.wi = 3 * 256; + .len = 4 * 256}; + pal_got.wi = 4 * 256; if (!read_file(&pal_want, palette_filename)) { return false; } diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 648752d7..835a888c 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -20,7 +20,7 @@ #include #define BUFFER_SIZE (64 * 1024 * 1024) -#define PALETTE_BUFFER_SIZE (4 * 245) +#define PALETTE_BUFFER_SIZE (4 * 256) #define WUFFS_TESTLIB_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) diff --git a/test/data/bricks-dither.palette b/test/data/bricks-dither.palette index 91991d819dcb8982b4572fe81bc8ddd5ad5e78dd..dfc786ee48b4702db6fe8df39436c7d60ee4a6cd 100644 GIT binary patch literal 1024 zcmZQ!X8h00!|qpHZXyzbbp>e?$I~|9UE+|9L$a{);#>{1@?I_%H3k_+Q$G;lHdW&wueS#{VK= zeE(&V8UCw!GXB?&X8f-f#`xbXis`?ZH{*Ye45t5P=`8;(%9#G^7Bl|W^HBQF>|XJo z%fI-)hJW^d_3-rnE+P#7y+s-R`$#kXcadWKA0o~8KU#+If3P^ye^*hS|K7?h|3j3S z{zt1Y{*TgN{~xN)_di9J@qe-kz#!UaKt(pFpnQ{LwFcJPAp`-ghOe5*Pdj!M(kZ{KTuGK96{nA+eS39x& z&-dp0pOwe*Kf}lHe@aB`e=dgB|B~z-|D`x*{1@ez_FtNP>3=ECE&rL!+WxC?wEtJ( zp8j87XwrXW?&bg0#FzXx5Z?6PQhD=#bIEJ}_4&{Kx0b*DpV7VTKU+lmf7Y;x|M{{e z{%0&({$HzT;(s@Zo&SBMHvjk0*!DlcVBvocsWblrbk6;KF5&HEoRZ~1?pohSac z*f9NXw_yH1#fs^Fs|ol2nRWvITU?m`cRMrv@AhW?-{Hyizc-lu|6~`Y|5Ln~|IhSd z|34#??f(RS;s0|JS^rPS<^R9bljZ-?NcR70qj~|B-C=|A%Y2{+}x4_kubL41f6)!8|3{m6{-12-`G35X>;I7!q5nraMgE`e75RUR z-NO0*cDu;`E7K(YU!2MJ|8%#?|8rBd{$HM|`Tyz+i~kpUwf{fu;QIf1s@VT8vqb;D z>gWIeVy5Q*-)lwx|5_pW|L-o&|9>`#{r|H?`v0Guvj2bY68`^fIsgAZyOsa{-md!p z^IEf4jl+|Gh;K|Nk6e{r~HP$e!u+x@86&QfBt;^|MuP6|Br7z|9^JJ{Qm%8QV$FO literal 768 zcmZQ%W?|rAW@O`L5MgDI;bM?vXJixQgbpFcxO8 z5n;5D7Ss}F6lw}MP=L-{I zNS0yrRAr3TW(-qfiZWyLHe<@rU`aP)DzjiL)>ZP*t8iy7_UFp>*GLanXAp5=5cOu1 z_FRB zX3{NY)+uK)E@8GRWiqa2vaaSfD-$*;(A9}Z(gR^|g!6`M3Lv$&-^cGI3HZ!Jn4z=mrDwBltmvbvG5m(zJY_M6`@|vXi zS$_TN^44wcjO`I@6T?_1X7MdAW1Lu|wNt`vvy|^P4WESu31_4{&gld^(eycQp7z)x zb&GphcYeeb_q?Z`#SE=hOx?cB>+?9~B={apSl`JtuTOsYypR(+eVA-om@V3wtfp|A zv5j;CT%UyIKA!r%W&bLI=twZA1-{Nmj8S8UTC=`DX`cm5IH z^_zeBH|5=bRJZ@uTl-mV$z{(CZzC4nV?FXm^29Ior<^M&Pv;K>-l>cXv$otQv5&oZ3FX%smX2yR;3lJ{* z&!|!UUzNS`zaf9ge?67Z|GXXy|3#b`{)_l9{FioN{4edp@L$%G=f8Lu-0 z&&p%@pW$QpKP4jeKNmyme@XU^|5BVY{)=)<`!CJD^uHA6mj6tqZU5Cc+W)I?Pyeqk zH0i%G_wxU0;!FM;2ygmtsl55Wx#YF~`uu1ATgzYn&*L$W`6#Es>S2~W$s)4N91?^ z&vU=>zu5EXf2&r8|GwQ!|I?PT{!cjS`=6_G{eStsdH+M^E&uPc^Thua8>av57R>*r zSTX%?HR1k0(@x-jiwpDrZfB;DP4{QsAFvix5f$^L(BG|&GP=^X#Jr?daxRnGN)bFT3J>B+kPC#FaKKa$P< z|8OnW|5K$L|F2eY{6AeG{Qq2y?EjN>&i`k`to=VV^~wKbVSE1XZRGpEXtw76RTE|C7x;|BttF{Xfzo^#5q5$p6#5BL7c!OaDL7F82TIB=P^ZTR8vUZWsA~ zWtznQi!=HDpYB%qe{QPQ|I1S~|6iS9@&974_W!3HT>oEB75o2XmgxUi{rvxbuND3O zYlYg9|Jfw=|Ia4L|9`hi{r|g7_W$oK(*OVLl>PsEm+=2@%lZHR*{%Hl_jc9) zpV#XBe>Pj=|Jx0o|L-k|`2Xh!>;GRTB>(?DuKxe$C4>L(o|*suanbMpm&-Z-f4uYk z|MNrM|0_3>|8KwU{(r@cng7@Kzx>~S>)QX>4{!h9@a)e2wU2K8Kfmbp{~uo`{{Q)P vem0C-_HO4_50=jfB*jc|MTbT|F`en{(pS)`Tw&!=Klu(OwAF7 literal 768 zcmZQ%W?|rAW@O`L5MgDI;bM?vXJixQk&`;wWe2$YK^LXA#enU<%h@ z3ew}u&}7K4U@Ws>EZ1PHWLGWWHw;zLWANZ*a28?k5n*(ZX7G{b@swo@6Xy#PVMvx? z^i*Yx)@BS-V~R3k^fqJ4&|pb7V=A*?EY?->(5rA~F81fj_SZ-cS7#7$VG#9Zl=fkj za$%GXVU&qx5)bAPb!AcZW>OAeREcKSh~m=^Wt2@}R7qyiN?}yZX41*#)=p+;rZ?u_jbY?H!RCuZ?2FJqioq_tDRZL^f`HVvPJ1_@`RJkIF^Jkj(yZ=UwpB6W*< zS$BTK75BWSp2ZBUR!rT#tV`2;k0z||}E2% zv@kh$GkbS)d3LY|_cFOmX7--K?lqGwbcV411lGj4{J9fYJeRUZF6D_{%aOi5tUbzp~r@N^kisyYr9m zuHXF2zbWtjqq_aK-rCO^v!8ixcpI_k9_x`mk|%ztAOCG|>8JU#cYYUtS=gZ%} V{`~v*_0ONT@7_MY`FQ@0vj9fX5_bRq