From 2db88dd98e79c24c0fd6d53ce37e00ab6c15d250 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 3 Apr 2020 22:13:56 +1100 Subject: [PATCH] Fix -Wshadow warnings --- build-all.sh | 2 +- example/gifplayer/gifplayer.c | 43 +++++------ internal/cgen/base/image-impl.c | 34 ++++----- internal/cgen/base/image-public.h | 64 +++++++++-------- internal/cgen/data.go | 28 ++++---- release/c/wuffs-unsupported-snapshot.c | 98 ++++++++++++++------------ 6 files changed, 142 insertions(+), 127 deletions(-) diff --git a/build-all.sh b/build-all.sh index e035a516..3ebe5198 100755 --- a/build-all.sh +++ b/build-all.sh @@ -51,7 +51,7 @@ wuffs gen # Compiler warning flags are discussed at # http://fastcompression.blogspot.com/2019/01/compiler-warnings.html -WARNING_FLAGS="-Wall -Werror -Wpedantic -Wcast-qual -Wcast-align -Wpointer-arith -Wfloat-equal -Wundef -Wvla -Wconversion" +WARNING_FLAGS="-Wall -Werror -Wpedantic -Wcast-qual -Wcast-align -Wpointer-arith -Wfloat-equal -Wundef -Wvla -Wconversion -Wshadow" echo "Checking snapshot compiles cleanly (as C)" $CC -c $WARNING_FLAGS -std=c99 -Wc++-compat \ diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index 0ad7154a..f541fa8d 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -237,8 +237,9 @@ print_ascii_art(wuffs_base__pixel_buffer* pb) { uint32_t b = 0xFF & (c >> 0); uint32_t g = 0xFF & (c >> 8); uint32_t r = 0xFF & (c >> 16); - uint32_t y = ((19595 * r) + (38470 * g) + (7471 * b) + (1 << 15)) >> 16; - *p++ = "-:=+IOX@"[(y & 0xFF) >> 5]; + uint32_t gray = + ((19595 * r) + (38470 * g) + (7471 * b) + (1 << 15)) >> 16; + *p++ = "-:=+IOX@"[(gray & 0xFF) >> 5]; } *p++ = '\n'; } @@ -340,10 +341,10 @@ allocate(wuffs_gif__decoder* dec) { const char* // play() { wuffs_gif__decoder dec; - wuffs_base__status status = + wuffs_base__status i_status = wuffs_gif__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, 0); - if (!wuffs_base__status__is_ok(&status)) { - return wuffs_base__status__message(&status); + if (!wuffs_base__status__is_ok(&i_status)) { + return wuffs_base__status__message(&i_status); } if (g_flags.quirk_honor_background_color) { @@ -360,9 +361,10 @@ play() { src.meta.closed = true; if (g_first_play) { - status = wuffs_gif__decoder__decode_image_config(&dec, &g_ic, &src); - if (!wuffs_base__status__is_ok(&status)) { - return wuffs_base__status__message(&status); + wuffs_base__status dic_status = + wuffs_gif__decoder__decode_image_config(&dec, &g_ic, &src); + if (!wuffs_base__status__is_ok(&dic_status)) { + return wuffs_base__status__message(&dic_status); } if (!wuffs_base__image_config__is_valid(&g_ic)) { return "invalid image configuration"; @@ -382,23 +384,23 @@ play() { if (msg) { return msg; } - status = wuffs_base__pixel_buffer__set_from_slice( + wuffs_base__status sfs0_status = wuffs_base__pixel_buffer__set_from_slice( &g_pb, &g_ic.pixcfg, wuffs_base__make_slice_u8(g_curr_dst_buffer, g_dst_len)); - if (!wuffs_base__status__is_ok(&status)) { - return wuffs_base__status__message(&status); + if (!wuffs_base__status__is_ok(&sfs0_status)) { + return wuffs_base__status__message(&sfs0_status); } } while (1) { wuffs_base__frame_config fc = {0}; - wuffs_base__status status = + wuffs_base__status dfc_status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) { - if (status.repr == wuffs_base__note__end_of_data) { + if (!wuffs_base__status__is_ok(&dfc_status)) { + if (dfc_status.repr == wuffs_base__note__end_of_data) { break; } - return wuffs_base__status__message(&status); + return wuffs_base__status__message(&dfc_status); } if (wuffs_base__frame_config__index(&fc) == 0) { @@ -439,11 +441,12 @@ play() { g_curr_dst_buffer = g_prev_dst_buffer; g_prev_dst_buffer = swap; - wuffs_base__status status = wuffs_base__pixel_buffer__set_from_slice( - &g_pb, &g_ic.pixcfg, - wuffs_base__make_slice_u8(g_curr_dst_buffer, g_dst_len)); - if (!wuffs_base__status__is_ok(&status)) { - return wuffs_base__status__message(&status); + wuffs_base__status sfs1_status = + wuffs_base__pixel_buffer__set_from_slice( + &g_pb, &g_ic.pixcfg, + wuffs_base__make_slice_u8(g_curr_dst_buffer, g_dst_len)); + if (!wuffs_base__status__is_ok(&sfs1_status)) { + return wuffs_base__status__message(&sfs1_status); } break; } diff --git a/internal/cgen/base/image-impl.c b/internal/cgen/base/image-impl.c index e4ddec54..6f552eb0 100644 --- a/internal/cgen/base/image-impl.c +++ b/internal/cgen/base/image-impl.c @@ -104,23 +104,23 @@ wuffs_base__nonpremul_u32_axxx(uint32_t premul) { } wuffs_base__color_u32_argb_premul // -wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y) { - if (!b || (x >= b->pixcfg.private_impl.width) || - (y >= b->pixcfg.private_impl.height)) { + if (!pb || (x >= pb->pixcfg.private_impl.width) || + (y >= pb->pixcfg.private_impl.height)) { return 0; } - if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) { + if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) { // TODO: support planar formats. return 0; } - size_t stride = b->private_impl.planes[0].stride; - uint8_t* row = b->private_impl.planes[0].ptr + (stride * ((size_t)y)); + size_t stride = pb->private_impl.planes[0].stride; + uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)); - switch (b->pixcfg.private_impl.pixfmt.repr) { + switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: @@ -129,7 +129,7 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: { - uint8_t* palette = b->private_impl.planes[3].ptr; + uint8_t* palette = pb->private_impl.planes[3].ptr; return wuffs_base__load_u32le__no_bounds_check(palette + (4 * ((size_t)row[x]))); } @@ -140,7 +140,7 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x]))); case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: { - uint8_t* palette = b->private_impl.planes[3].ptr; + uint8_t* palette = pb->private_impl.planes[3].ptr; return wuffs_base__premul_u32_axxx( wuffs_base__load_u32le__no_bounds_check(palette + (4 * ((size_t)row[x])))); @@ -194,27 +194,27 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, wuffs_base__status // wuffs_base__pixel_buffer__set_color_u32_at( - wuffs_base__pixel_buffer* b, + wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y, wuffs_base__color_u32_argb_premul color) { - if (!b) { + if (!pb) { return wuffs_base__make_status(wuffs_base__error__bad_receiver); } - if ((x >= b->pixcfg.private_impl.width) || - (y >= b->pixcfg.private_impl.height)) { + if ((x >= pb->pixcfg.private_impl.width) || + (y >= pb->pixcfg.private_impl.height)) { return wuffs_base__make_status(wuffs_base__error__bad_argument); } - if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) { + if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) { // TODO: support planar formats. return wuffs_base__make_status(wuffs_base__error__unsupported_option); } - size_t stride = b->private_impl.planes[0].stride; - uint8_t* row = b->private_impl.planes[0].ptr + (stride * ((size_t)y)); + size_t stride = pb->private_impl.planes[0].stride; + uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)); - switch (b->pixcfg.private_impl.pixfmt.repr) { + switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRX: diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index 1d300dd6..dc4008d1 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -930,13 +930,13 @@ wuffs_base__null_pixel_buffer() { } static inline wuffs_base__status // -wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* pb, const wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory) { - if (!b) { + if (!pb) { return wuffs_base__make_status(wuffs_base__error__bad_receiver); } - memset(b, 0, sizeof(*b)); + memset(pb, 0, sizeof(*pb)); if (!pixcfg) { return wuffs_base__make_status(wuffs_base__error__bad_argument); } @@ -964,7 +964,8 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, wuffs_base__error__bad_argument_length_too_short); } wuffs_base__table_u8* tab = - &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; + &pb->private_impl + .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; tab->ptr = ptr; tab->width = 1024; tab->height = 1; @@ -987,8 +988,8 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, wuffs_base__error__bad_argument_length_too_short); } - b->pixcfg = *pixcfg; - wuffs_base__table_u8* tab = &b->private_impl.planes[0]; + pb->pixcfg = *pixcfg; + wuffs_base__table_u8* tab = &pb->private_impl.planes[0]; tab->ptr = ptr; tab->width = width; tab->height = pixcfg->private_impl.height; @@ -997,13 +998,13 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, } static inline wuffs_base__status // -wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* pb, const wuffs_base__pixel_config* pixcfg, wuffs_base__table_u8 pixbuf_memory) { - if (!b) { + if (!pb) { return wuffs_base__make_status(wuffs_base__error__bad_receiver); } - memset(b, 0, sizeof(*b)); + memset(pb, 0, sizeof(*pb)); if (!pixcfg || wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) { return wuffs_base__make_status(wuffs_base__error__bad_argument); @@ -1023,19 +1024,20 @@ wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* b, return wuffs_base__make_status(wuffs_base__error__bad_argument); } - b->pixcfg = *pixcfg; - b->private_impl.planes[0] = pixbuf_memory; + pb->pixcfg = *pixcfg; + pb->private_impl.planes[0] = pixbuf_memory; return wuffs_base__make_status(NULL); } // wuffs_base__pixel_buffer__palette returns the palette color data. If // non-empty, it will have length 1024. static inline wuffs_base__slice_u8 // -wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { - if (b && - wuffs_base__pixel_format__is_indexed(&b->pixcfg.private_impl.pixfmt)) { +wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* pb) { + if (pb && + wuffs_base__pixel_format__is_indexed(&pb->pixcfg.private_impl.pixfmt)) { wuffs_base__table_u8* tab = - &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; + &pb->private_impl + .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; if ((tab->width == 1024) && (tab->height == 1)) { return wuffs_base__make_slice_u8(tab->ptr, 1024); } @@ -1044,17 +1046,17 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { } static inline wuffs_base__pixel_format // -wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* b) { - if (b) { - return b->pixcfg.private_impl.pixfmt; +wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* pb) { + if (pb) { + return pb->pixcfg.private_impl.pixfmt; } return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__INVALID); } static inline wuffs_base__table_u8 // -wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { - if (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) { - return b->private_impl.planes[p]; +wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) { + if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) { + return pb->private_impl.planes[p]; } wuffs_base__table_u8 ret; @@ -1066,13 +1068,13 @@ wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { } wuffs_base__color_u32_argb_premul // -wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y); wuffs_base__status // wuffs_base__pixel_buffer__set_color_u32_at( - wuffs_base__pixel_buffer* b, + wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y, wuffs_base__color_u32_argb_premul color); @@ -1080,15 +1082,19 @@ wuffs_base__pixel_buffer__set_color_u32_at( #ifdef __cplusplus inline wuffs_base__status // -wuffs_base__pixel_buffer::set_from_slice(const wuffs_base__pixel_config* pixcfg, - wuffs_base__slice_u8 pixbuf_memory) { - return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory); +wuffs_base__pixel_buffer::set_from_slice( + const wuffs_base__pixel_config* pixcfg_arg, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg_arg, + pixbuf_memory); } inline wuffs_base__status // -wuffs_base__pixel_buffer::set_from_table(const wuffs_base__pixel_config* pixcfg, - wuffs_base__table_u8 pixbuf_memory) { - return wuffs_base__pixel_buffer__set_from_table(this, pixcfg, pixbuf_memory); +wuffs_base__pixel_buffer::set_from_table( + const wuffs_base__pixel_config* pixcfg_arg, + wuffs_base__table_u8 pixbuf_memory) { + return wuffs_base__pixel_buffer__set_from_table(this, pixcfg_arg, + pixbuf_memory); } inline wuffs_base__slice_u8 // diff --git a/internal/cgen/data.go b/internal/cgen/data.go index 915357ce..0537a673 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -30,12 +30,12 @@ const baseImageImplC = "" + "// ---------------- Images\n\nconst uint32_t wuffs_base__pixel_format__bits_per_channel[16] = {\n 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,\n 0x08, 0x0A, 0x0C, 0x10, 0x18, 0x20, 0x30, 0x40,\n};\n\nstatic inline uint32_t //\nwuffs_base__swap_u32_argb_abgr(uint32_t u) {\n uint32_t o = u & 0xFF00FF00;\n uint32_t r = u & 0x00FF0000;\n uint32_t b = u & 0x000000FF;\n return o | (r >> 16) | (b << 16);\n}\n\nstatic inline uint32_t //\nwuffs_base__composite_premul_nonpremul_u32_axxx(uint32_t dst_premul,\n uint32_t src_nonpremul) {\n // Convert from 8-bit color to 16-bit color.\n uint32_t sa = 0x101 * (0xFF & (src_nonpremul >> 24));\n uint32_t sr = 0x101 * (0xFF & (src_nonpremul >> 16));\n uint32_t sg = 0x101 * (0xFF & (src_nonpremul >> 8));\n uint32_t sb = 0x101 * (0xFF & (src_nonpremul >> 0));\n uint32_t da = 0x101 * (0xFF & (dst_premul >> 24));\n uint32_t dr = 0x101 * (0xFF & (dst_premul >> 16));\n uint32_t dg = 0x101 * (0xFF & (dst_premul >> 8));\n uint32_t db = 0x101" + " * (0xFF & (dst_premul >> 0));\n\n // Calculate the inverse of the src-alpha: how much of the dst to keep.\n uint32_t ia = 0xFFFF - sa;\n\n // Composite src (nonpremul) over dst (premul).\n da = sa + ((da * ia) / 0xFFFF);\n dr = ((sr * sa) + (dr * ia)) / 0xFFFF;\n dg = ((sg * sa) + (dg * ia)) / 0xFFFF;\n db = ((sb * sa) + (db * ia)) / 0xFFFF;\n\n // Convert from 16-bit color to 8-bit color and combine the components.\n da >>= 8;\n dr >>= 8;\n dg >>= 8;\n db >>= 8;\n return (db << 0) | (dg << 8) | (dr << 16) | (da << 24);\n}\n\nstatic inline uint32_t //\nwuffs_base__premul_u32_axxx(uint32_t nonpremul) {\n // Multiplying by 0x101 (twice, once for alpha and once for color) converts\n // from 8-bit to 16-bit color. Shifting right by 8 undoes that.\n //\n // Working in the higher bit depth can produce slightly different (and\n // arguably slightly more accurate) results. For example, given 8-bit blue\n // and alpha of 0x80 and 0x81:\n //\n // - ((0x80 * 0x81 ) / 0xFF ) = 0x40 = 0x40\n // - ((0x8080 * 0" + "x8181) / 0xFFFF) >> 8 = 0x4101 >> 8 = 0x41\n uint32_t a = 0xFF & (nonpremul >> 24);\n uint32_t a16 = a * (0x101 * 0x101);\n\n uint32_t r = 0xFF & (nonpremul >> 16);\n r = ((r * a16) / 0xFFFF) >> 8;\n uint32_t g = 0xFF & (nonpremul >> 8);\n g = ((g * a16) / 0xFFFF) >> 8;\n uint32_t b = 0xFF & (nonpremul >> 0);\n b = ((b * a16) / 0xFFFF) >> 8;\n\n return (a << 24) | (r << 16) | (g << 8) | (b << 0);\n}\n\nstatic inline uint32_t //\nwuffs_base__nonpremul_u32_axxx(uint32_t premul) {\n uint32_t a = 0xFF & (premul >> 24);\n if (a == 0xFF) {\n return premul;\n } else if (a == 0) {\n return 0;\n }\n uint32_t a16 = a * 0x101;\n\n uint32_t r = 0xFF & (premul >> 16);\n r = ((r * (0x101 * 0xFFFF)) / a16) >> 8;\n uint32_t g = 0xFF & (premul >> 8);\n g = ((g * (0x101 * 0xFFFF)) / a16) >> 8;\n uint32_t b = 0xFF & (premul >> 0);\n b = ((b * (0x101 * 0xFFFF)) / a16) >> 8;\n\n return (a << 24) | (r << 16) | (g << 8) | (b << 0);\n}\n\nwuffs_base__color_u32_argb_premul //\nwuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_" + - "buffer* b,\n uint32_t x,\n uint32_t y) {\n if (!b || (x >= b->pixcfg.private_impl.width) ||\n (y >= b->pixcfg.private_impl.height)) {\n return 0;\n }\n\n if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return 0;\n }\n\n size_t stride = b->private_impl.planes[0].stride;\n uint8_t* row = b->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (b->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n return wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: {\n uint8_t* palette = b->private_impl.planes[3].ptr;\n return wuffs_base__load_u32le__no_bounds_check(palette +\n " + - " (4 * ((size_t)row[x])));\n }\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x])));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {\n uint8_t* palette = b->private_impl.planes[3].ptr;\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(palette +\n (4 * ((size_t)row[x]))));\n }\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint16_t bgr =\n wuffs_base__load_u16le__no_bounds_check(row + (2 * ((size_t)x)));\n uint32_t b5 = 0x1F & (bgr >> 0);\n uint32_t b = (b5 << 3) | (b5 >> 2);\n uint32_t g6 = 0x3F & (bgr >> 5);\n uint32_t g = (g6 << 2) | (g6 >> 4);\n uint32_t r5 = 0x1F & (bgr >> 11);\n uint32_t r = (r5 << 3) | (r5 >> 2);\n return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n " + - " return 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n return 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))));\n case WUFFS_BASE__PIXEL_FORM" + - "AT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuffs_base__swap_u32_argb_abgr(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n\n default:\n // TODO: support more formats.\n break;\n }\n\n return 0;\n}\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__pixel_buffer* b,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color) {\n if (!b) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n if ((x >= b->pixcfg.private_impl.width) ||\n (y >= b->pixcfg.private_impl.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n size_t stride = b->private_impl.planes[0].stride;\n uint8_t* row = b->private_impl.planes[0].ptr " + - "+ (stride * ((size_t)y));\n\n switch (b->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n wuffs_base__store_u32le__no_bounds_check(row + (4 * ((size_t)x)), color);\n break;\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint32_t b5 = 0x1F & (color >> (8 - 5));\n uint32_t g6 = 0x3F & (color >> (16 - 6));\n uint32_t r5 = 0x1F & (color >> (24 - 5));\n uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);\n wuffs_base__store_u16le__no_bounds_check(row + (2 * ((size_t)x)),\n (uint16_t)bgr565);\n break;\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n wuffs_base__store_u24le__no_bounds_check(row + (3 * ((size_t)x)), color);\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_bas" + - "e__nonpremul_u32_axxx(color));\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n wuffs_base__store_u24le__no_bounds_check(\n row + (3 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__nonpremul_u32_axxx(\n wuffs_base__swap_u32_argb_abgr(color)));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n\n default:\n // TODO: support more formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n return wuffs_base__make_status(NULL);\n}\n\n" + + "buffer* pb,\n uint32_t x,\n uint32_t y) {\n if (!pb || (x >= pb->pixcfg.private_impl.width) ||\n (y >= pb->pixcfg.private_impl.height)) {\n return 0;\n }\n\n if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return 0;\n }\n\n size_t stride = pb->private_impl.planes[0].stride;\n uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (pb->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n return wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: {\n uint8_t* palette = pb->private_impl.planes[3].ptr;\n return wuffs_base__load_u32le__no_bounds_check(palette +\n " + + " (4 * ((size_t)row[x])));\n }\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x])));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {\n uint8_t* palette = pb->private_impl.planes[3].ptr;\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(palette +\n (4 * ((size_t)row[x]))));\n }\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint16_t bgr =\n wuffs_base__load_u16le__no_bounds_check(row + (2 * ((size_t)x)));\n uint32_t b5 = 0x1F & (bgr >> 0);\n uint32_t b = (b5 << 3) | (b5 >> 2);\n uint32_t g6 = 0x3F & (bgr >> 5);\n uint32_t g = (g6 << 2) | (g6 >> 4);\n uint32_t r5 = 0x1F & (bgr >> 11);\n uint32_t r = (r5 << 3) | (r5 >> 2);\n return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);\n }\n case WUFFS_BASE__PIXEL_FORMA" + + "T__BGR:\n return 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n return 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))));\n case WUFFS_BASE__" + + "PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuffs_base__swap_u32_argb_abgr(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n\n default:\n // TODO: support more formats.\n break;\n }\n\n return 0;\n}\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__pixel_buffer* pb,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color) {\n if (!pb) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n if ((x >= pb->pixcfg.private_impl.width) ||\n (y >= pb->pixcfg.private_impl.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n size_t stride = pb->private_impl.planes[0].stride;\n uint8_t* row = pb->private_im" + + "pl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (pb->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n wuffs_base__store_u32le__no_bounds_check(row + (4 * ((size_t)x)), color);\n break;\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint32_t b5 = 0x1F & (color >> (8 - 5));\n uint32_t g6 = 0x3F & (color >> (16 - 6));\n uint32_t r5 = 0x1F & (color >> (24 - 5));\n uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);\n wuffs_base__store_u16le__no_bounds_check(row + (2 * ((size_t)x)),\n (uint16_t)bgr565);\n break;\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n wuffs_base__store_u24le__no_bounds_check(row + (3 * ((size_t)x)), color);\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((siz" + + "e_t)x)), wuffs_base__nonpremul_u32_axxx(color));\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n wuffs_base__store_u24le__no_bounds_check(\n row + (3 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__nonpremul_u32_axxx(\n wuffs_base__swap_u32_argb_abgr(color)));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n\n default:\n // TODO: support more formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n return wuffs_base__make_status(NULL);\n}\n\n" + "" + "// --------\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n size_t dst_len4 = dst.len / 4;\n size_t src_len4 = src.len / 4;\n size_t len = dst_len4 < src_len4 ? dst_len4 : src_len4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n size_t n = len;\n\n // TODO: unroll.\n\n while (n >= 1) {\n uint32_t s0 = wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(s + (0 * 4)));\n wuffs_base__store_u32le__no_bounds_check(d + (0 * 4), s0);\n\n s += 1 * 4;\n d += 1 * 4;\n n -= 1;\n }\n\n return len;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n size_t dst_len4 = dst.len / 4;\n size_t src_len4 = src.len / 4;\n size_t len = dst_len4 < src_len4 ? dst_len4 : src_len4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n" + " size_t n = len;\n\n // TODO: unroll.\n\n while (n >= 1) {\n uint32_t d0 = wuffs_base__load_u32le__no_bounds_check(d + (0 * 4));\n uint32_t s0 = wuffs_base__load_u32le__no_bounds_check(s + (0 * 4));\n wuffs_base__store_u32le__no_bounds_check(\n d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));\n\n s += 1 * 4;\n d += 1 * 4;\n n -= 1;\n }\n\n return len;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n return wuffs_base__slice_u8__copy_from_slice(dst, src);\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_4_4(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n size_t dst_len4 = dst.len / 4;\n size_t src_len4 = src.len / 4;\n size_t len = dst_len4 < src_len4 ? dst_len4 : src_len4;\n if (l" + @@ -268,14 +268,14 @@ const baseImagePublicH = "" + "ase__frame_config__index(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::io_position() const {\n return wuffs_base__frame_config__io_position(this);\n}\n\ninline wuffs_base__animation_disposal //\nwuffs_base__frame_config::disposal() const {\n return wuffs_base__frame_config__disposal(this);\n}\n\ninline bool //\nwuffs_base__frame_config::opaque_within_bounds() const {\n return wuffs_base__frame_config__opaque_within_bounds(this);\n}\n\ninline bool //\nwuffs_base__frame_config::overwrite_instead_of_blend() const {\n return wuffs_base__frame_config__overwrite_instead_of_blend(this);\n}\n\ninline wuffs_base__color_u32_argb_premul //\nwuffs_base__frame_config::background_color() const {\n return wuffs_base__frame_config__background_color(this);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(\n const wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline wuffs_base__status set_from_table(\n const wuffs_base__pixel_config* pixcfg,\n wuffs_base__table_u8 pixbuf_memory);\n inline wuffs_base__slice_u8 palette();\n inline wuffs_base__pixel_format pixel_format() const;\n inline wuffs_base__table_u8 plane(uint32_t p);\n inline wuffs_base__color_u32_argb_premul color_u32_at(uint32_t x,\n uint32_t y) const;\n inline wuffs_base__status set_color_u32_at(\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul co" + - "lor);\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__pixel_buffer //\nwuffs_base__null_pixel_buffer() {\n wuffs_base__pixel_buffer ret;\n ret.pixcfg = wuffs_base__null_pixel_config();\n ret.private_impl.planes[0] = wuffs_base__empty_table_u8();\n ret.private_impl.planes[1] = wuffs_base__empty_table_u8();\n ret.private_impl.planes[2] = wuffs_base__empty_table_u8();\n ret.private_impl.planes[3] = wuffs_base__empty_table_u8();\n return ret;\n}\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n const wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n memset(b, 0, sizeof(*b));\n if (!pixcfg) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n if (wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {\n " + - " // TODO: support planar pixel formats, concious of pixel subsampling.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint8_t* ptr = pixbuf_memory.ptr;\n uint64_t len = pixbuf_memory.len;\n if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt)) {\n // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from\n // the start of pixbuf_memory. We split from the start, not the end, so\n // that the both chunks' pointers have the same alignment as the original\n // pointer, up to an alignment of 1024.\n if (len < 1024) {\n return wuffs_base__make_status(\n wuffs_base__e" + - "rror__bad_argument_length_too_short);\n }\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n tab->ptr = ptr;\n tab->width = 1024;\n tab->height = 1;\n tab->stride = 1024;\n ptr += 1024;\n len -= 1024;\n }\n\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n size_t width = (size_t)(pixcfg->private_impl.width);\n if ((wh > (UINT64_MAX / bytes_per_pixel)) ||\n (width > (SIZE_MAX / bytes_per_pixel))) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n wh *= bytes_per_pixel;\n width *= bytes_per_pixel;\n if (wh > len) {\n return wuffs_base__make_status(\n wuffs_base__error__bad_argument_length_too_short);\n }\n\n b->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = ptr;\n tab->width = width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = width;\n return wuffs_base__make_status(NULL);\n}\n\n" + - "static inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* b,\n const wuffs_base__pixel_config* pixcfg,\n wuffs_base__table_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n memset(b, 0, sizeof(*b));\n if (!pixcfg ||\n wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint64_t width_in_bytes =\n ((uint64_t)pixcfg->private_impl.width) * bytes_per_pixel;\n if ((width_in_bytes " + - "> pixbuf_memory.width) ||\n (pixcfg->private_impl.height > pixbuf_memory.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n b->pixcfg = *pixcfg;\n b->private_impl.planes[0] = pixbuf_memory;\n return wuffs_base__make_status(NULL);\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette color data. If\n// non-empty, it will have length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n if (b &&\n wuffs_base__pixel_format__is_indexed(&b->pixcfg.private_impl.pixfmt)) {\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n if ((tab->width == 1024) && (tab->height == 1)) {\n return wuffs_base__make_slice_u8(tab->ptr, 1024);\n }\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* b) {\n if (b) {\n return b->pixcfg.private_impl.p" + - "ixfmt;\n }\n return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__INVALID);\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {\n if (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) {\n return b->private_impl.planes[p];\n }\n\n wuffs_base__table_u8 ret;\n ret.ptr = NULL;\n ret.width = 0;\n ret.height = 0;\n ret.stride = 0;\n return ret;\n}\n\nwuffs_base__color_u32_argb_premul //\nwuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b,\n uint32_t x,\n uint32_t y);\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__pixel_buffer* b,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color);\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(const wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory" + - ") {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_table(const wuffs_base__pixel_config* pixcfg,\n wuffs_base__table_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_table(this, pixcfg, pixbuf_memory);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer::pixel_format() const {\n return wuffs_base__pixel_buffer__pixel_format(this);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\ninline wuffs_base__color_u32_argb_premul //\nwuffs_base__pixel_buffer::color_u32_at(uint32_t x, uint32_t y) const {\n return wuffs_base__pixel_buffer__color_u32_at(this, x, y);\n}\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_color_u32_at(\n uint32_t" + - " x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color) {\n return wuffs_base__pixel_buffer__set_color_u32_at(this, x, y, color);\n}\n\n#endif // __cplusplus\n\n" + + "lor);\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__pixel_buffer //\nwuffs_base__null_pixel_buffer() {\n wuffs_base__pixel_buffer ret;\n ret.pixcfg = wuffs_base__null_pixel_config();\n ret.private_impl.planes[0] = wuffs_base__empty_table_u8();\n ret.private_impl.planes[1] = wuffs_base__empty_table_u8();\n ret.private_impl.planes[2] = wuffs_base__empty_table_u8();\n ret.private_impl.planes[3] = wuffs_base__empty_table_u8();\n return ret;\n}\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* pb,\n const wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!pb) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n memset(pb, 0, sizeof(*pb));\n if (!pixcfg) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n if (wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) " + + "{\n // TODO: support planar pixel formats, concious of pixel subsampling.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint8_t* ptr = pixbuf_memory.ptr;\n uint64_t len = pixbuf_memory.len;\n if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt)) {\n // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from\n // the start of pixbuf_memory. We split from the start, not the end, so\n // that the both chunks' pointers have the same alignment as the original\n // pointer, up to an alignment of 1024.\n if (len < 1024) {\n return wuffs_base__make_status(\n wuffs_bas" + + "e__error__bad_argument_length_too_short);\n }\n wuffs_base__table_u8* tab =\n &pb->private_impl\n .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n tab->ptr = ptr;\n tab->width = 1024;\n tab->height = 1;\n tab->stride = 1024;\n ptr += 1024;\n len -= 1024;\n }\n\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n size_t width = (size_t)(pixcfg->private_impl.width);\n if ((wh > (UINT64_MAX / bytes_per_pixel)) ||\n (width > (SIZE_MAX / bytes_per_pixel))) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n wh *= bytes_per_pixel;\n width *= bytes_per_pixel;\n if (wh > len) {\n return wuffs_base__make_status(\n wuffs_base__error__bad_argument_length_too_short);\n }\n\n pb->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &pb->private_impl.planes[0];\n tab->ptr = ptr;\n tab->width = width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = width;\n return wuffs_base__m" + + "ake_status(NULL);\n}\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* pb,\n const wuffs_base__pixel_config* pixcfg,\n wuffs_base__table_u8 pixbuf_memory) {\n if (!pb) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n memset(pb, 0, sizeof(*pb));\n if (!pixcfg ||\n wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint64_t width_in_bytes =\n ((uint64_t)pixcfg->private_impl.width) * bytes_per_pixe" + + "l;\n if ((width_in_bytes > pixbuf_memory.width) ||\n (pixcfg->private_impl.height > pixbuf_memory.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n pb->pixcfg = *pixcfg;\n pb->private_impl.planes[0] = pixbuf_memory;\n return wuffs_base__make_status(NULL);\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette color data. If\n// non-empty, it will have length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* pb) {\n if (pb &&\n wuffs_base__pixel_format__is_indexed(&pb->pixcfg.private_impl.pixfmt)) {\n wuffs_base__table_u8* tab =\n &pb->private_impl\n .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n if ((tab->width == 1024) && (tab->height == 1)) {\n return wuffs_base__make_slice_u8(tab->ptr, 1024);\n }\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* pb) {\n" + + " if (pb) {\n return pb->pixcfg.private_impl.pixfmt;\n }\n return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__INVALID);\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) {\n if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) {\n return pb->private_impl.planes[p];\n }\n\n wuffs_base__table_u8 ret;\n ret.ptr = NULL;\n ret.width = 0;\n ret.height = 0;\n ret.stride = 0;\n return ret;\n}\n\nwuffs_base__color_u32_argb_premul //\nwuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb,\n uint32_t x,\n uint32_t y);\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__pixel_buffer* pb,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color);\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(\n const wuffs_base__pixel_config* pixcfg_arg,\n wuffs_bas" + + "e__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg_arg,\n pixbuf_memory);\n}\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_table(\n const wuffs_base__pixel_config* pixcfg_arg,\n wuffs_base__table_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_table(this, pixcfg_arg,\n pixbuf_memory);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer::pixel_format() const {\n return wuffs_base__pixel_buffer__pixel_format(this);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\ninline wuffs_base__color_u32_argb_premul //\nwuffs_base__pixel_buffer::color_u32_at(uint32_t x, uint32_t y) const {\n return wuffs_base__pixel_buffer__color_u32_" + + "at(this, x, y);\n}\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_color_u32_at(\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color) {\n return wuffs_base__pixel_buffer__set_color_u32_at(this, x, y, color);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t TODO;\n } private_impl;\n\n#ifdef __cplusplus\n#endif // __cplusplus\n\n} wuffs_base__decode_frame_options;\n\n#ifdef __cplusplus\n\n#endif // __cplusplus\n\n" + "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 330dbe44..bd4ff6b9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -3331,13 +3331,13 @@ wuffs_base__null_pixel_buffer() { } static inline wuffs_base__status // -wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* pb, const wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory) { - if (!b) { + if (!pb) { return wuffs_base__make_status(wuffs_base__error__bad_receiver); } - memset(b, 0, sizeof(*b)); + memset(pb, 0, sizeof(*pb)); if (!pixcfg) { return wuffs_base__make_status(wuffs_base__error__bad_argument); } @@ -3365,7 +3365,8 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, wuffs_base__error__bad_argument_length_too_short); } wuffs_base__table_u8* tab = - &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; + &pb->private_impl + .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; tab->ptr = ptr; tab->width = 1024; tab->height = 1; @@ -3388,8 +3389,8 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, wuffs_base__error__bad_argument_length_too_short); } - b->pixcfg = *pixcfg; - wuffs_base__table_u8* tab = &b->private_impl.planes[0]; + pb->pixcfg = *pixcfg; + wuffs_base__table_u8* tab = &pb->private_impl.planes[0]; tab->ptr = ptr; tab->width = width; tab->height = pixcfg->private_impl.height; @@ -3398,13 +3399,13 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, } static inline wuffs_base__status // -wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* pb, const wuffs_base__pixel_config* pixcfg, wuffs_base__table_u8 pixbuf_memory) { - if (!b) { + if (!pb) { return wuffs_base__make_status(wuffs_base__error__bad_receiver); } - memset(b, 0, sizeof(*b)); + memset(pb, 0, sizeof(*pb)); if (!pixcfg || wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) { return wuffs_base__make_status(wuffs_base__error__bad_argument); @@ -3424,19 +3425,20 @@ wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* b, return wuffs_base__make_status(wuffs_base__error__bad_argument); } - b->pixcfg = *pixcfg; - b->private_impl.planes[0] = pixbuf_memory; + pb->pixcfg = *pixcfg; + pb->private_impl.planes[0] = pixbuf_memory; return wuffs_base__make_status(NULL); } // wuffs_base__pixel_buffer__palette returns the palette color data. If // non-empty, it will have length 1024. static inline wuffs_base__slice_u8 // -wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { - if (b && - wuffs_base__pixel_format__is_indexed(&b->pixcfg.private_impl.pixfmt)) { +wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* pb) { + if (pb && + wuffs_base__pixel_format__is_indexed(&pb->pixcfg.private_impl.pixfmt)) { wuffs_base__table_u8* tab = - &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; + &pb->private_impl + .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE]; if ((tab->width == 1024) && (tab->height == 1)) { return wuffs_base__make_slice_u8(tab->ptr, 1024); } @@ -3445,17 +3447,17 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { } static inline wuffs_base__pixel_format // -wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* b) { - if (b) { - return b->pixcfg.private_impl.pixfmt; +wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* pb) { + if (pb) { + return pb->pixcfg.private_impl.pixfmt; } return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__INVALID); } static inline wuffs_base__table_u8 // -wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { - if (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) { - return b->private_impl.planes[p]; +wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) { + if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) { + return pb->private_impl.planes[p]; } wuffs_base__table_u8 ret; @@ -3467,13 +3469,13 @@ wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { } wuffs_base__color_u32_argb_premul // -wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y); wuffs_base__status // wuffs_base__pixel_buffer__set_color_u32_at( - wuffs_base__pixel_buffer* b, + wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y, wuffs_base__color_u32_argb_premul color); @@ -3481,15 +3483,19 @@ wuffs_base__pixel_buffer__set_color_u32_at( #ifdef __cplusplus inline wuffs_base__status // -wuffs_base__pixel_buffer::set_from_slice(const wuffs_base__pixel_config* pixcfg, - wuffs_base__slice_u8 pixbuf_memory) { - return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory); +wuffs_base__pixel_buffer::set_from_slice( + const wuffs_base__pixel_config* pixcfg_arg, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg_arg, + pixbuf_memory); } inline wuffs_base__status // -wuffs_base__pixel_buffer::set_from_table(const wuffs_base__pixel_config* pixcfg, - wuffs_base__table_u8 pixbuf_memory) { - return wuffs_base__pixel_buffer__set_from_table(this, pixcfg, pixbuf_memory); +wuffs_base__pixel_buffer::set_from_table( + const wuffs_base__pixel_config* pixcfg_arg, + wuffs_base__table_u8 pixbuf_memory) { + return wuffs_base__pixel_buffer__set_from_table(this, pixcfg_arg, + pixbuf_memory); } inline wuffs_base__slice_u8 // @@ -7897,23 +7903,23 @@ wuffs_base__nonpremul_u32_axxx(uint32_t premul) { } wuffs_base__color_u32_argb_premul // -wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, +wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y) { - if (!b || (x >= b->pixcfg.private_impl.width) || - (y >= b->pixcfg.private_impl.height)) { + if (!pb || (x >= pb->pixcfg.private_impl.width) || + (y >= pb->pixcfg.private_impl.height)) { return 0; } - if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) { + if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) { // TODO: support planar formats. return 0; } - size_t stride = b->private_impl.planes[0].stride; - uint8_t* row = b->private_impl.planes[0].ptr + (stride * ((size_t)y)); + size_t stride = pb->private_impl.planes[0].stride; + uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)); - switch (b->pixcfg.private_impl.pixfmt.repr) { + switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: @@ -7922,7 +7928,7 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: { - uint8_t* palette = b->private_impl.planes[3].ptr; + uint8_t* palette = pb->private_impl.planes[3].ptr; return wuffs_base__load_u32le__no_bounds_check(palette + (4 * ((size_t)row[x]))); } @@ -7933,7 +7939,7 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x]))); case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: { - uint8_t* palette = b->private_impl.planes[3].ptr; + uint8_t* palette = pb->private_impl.planes[3].ptr; return wuffs_base__premul_u32_axxx( wuffs_base__load_u32le__no_bounds_check(palette + (4 * ((size_t)row[x])))); @@ -7987,27 +7993,27 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* b, wuffs_base__status // wuffs_base__pixel_buffer__set_color_u32_at( - wuffs_base__pixel_buffer* b, + wuffs_base__pixel_buffer* pb, uint32_t x, uint32_t y, wuffs_base__color_u32_argb_premul color) { - if (!b) { + if (!pb) { return wuffs_base__make_status(wuffs_base__error__bad_receiver); } - if ((x >= b->pixcfg.private_impl.width) || - (y >= b->pixcfg.private_impl.height)) { + if ((x >= pb->pixcfg.private_impl.width) || + (y >= pb->pixcfg.private_impl.height)) { return wuffs_base__make_status(wuffs_base__error__bad_argument); } - if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) { + if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) { // TODO: support planar formats. return wuffs_base__make_status(wuffs_base__error__unsupported_option); } - size_t stride = b->private_impl.planes[0].stride; - uint8_t* row = b->private_impl.planes[0].ptr + (stride * ((size_t)y)); + size_t stride = pb->private_impl.planes[0].stride; + uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)); - switch (b->pixcfg.private_impl.pixfmt.repr) { + switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRX: