diff --git a/release/c/wuffs-v0.2.h b/release/c/wuffs-v0.2.h index 471c3035..c2bf7a3f 100644 --- a/release/c/wuffs-v0.2.h +++ b/release/c/wuffs-v0.2.h @@ -8,22 +8,6 @@ // "foo.h"-like header, #define WUFFS_IMPLEMENTATION before #include'ing or // compiling it. -// Copyright 2018 The Wuffs Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Code generated by wuffs-c. DO NOT EDIT. - // Copyright 2017 The Wuffs Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -65,14 +49,14 @@ extern "C" { // work-in-progress version, not a release version, and has no backwards or // forwards compatibility guarantees. // -// WUFFS_VERSION was overridden by "wuffs gen -version" on 2018-10-21 UTC, -// based on revision 479326cbadac8240564d5b4a7a0ca859bb767ba4. +// WUFFS_VERSION was overridden by "wuffs gen -version" on 2018-12-08 UTC, +// based on revision 45ab79b451deda28a0898c51987bb03b37c1076f. #define WUFFS_VERSION ((uint64_t)0x0000000000020000) #define WUFFS_VERSION_MAJOR ((uint64_t)0x00000000) #define WUFFS_VERSION_MINOR ((uint64_t)0x0002) #define WUFFS_VERSION_PATCH ((uint64_t)0x0000) -#define WUFFS_VERSION_EXTENSION "alpha.22" -#define WUFFS_VERSION_STRING "0.2.0-alpha.22" +#define WUFFS_VERSION_EXTENSION "alpha.23" +#define WUFFS_VERSION_STRING "0.2.0-alpha.23" // Define WUFFS_CONFIG__STATIC_FUNCTIONS to make all of Wuffs' functions have // static storage. The motivation is discussed in the "ALLOW STATIC @@ -300,43 +284,6 @@ wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -// -------- - -// Clang also defines "__GNUC__". - -static inline uint16_t // -wuffs_base__u16__byte_swapped(uint16_t x) { -#if defined(__GNUC__) - return __builtin_bswap16(x); -#else - return (x >> 8) | (x << 8); -#endif -} - -static inline uint32_t // -wuffs_base__u32__byte_swapped(uint32_t x) { -#if defined(__GNUC__) - return __builtin_bswap32(x); -#else - static const uint32_t mask8 = 0x00FF00FF; - x = ((x >> 8) & mask8) | ((x & mask8) << 8); - return (x >> 16) | (x << 16); -#endif -} - -static inline uint64_t // -wuffs_base__u64__byte_swapped(uint64_t x) { -#if defined(__GNUC__) - return __builtin_bswap64(x); -#else - static const uint64_t mask8 = 0x00FF00FF00FF00FF; - static const uint64_t mask16 = 0x0000FFFF0000FFFF; - x = ((x >> 8) & mask8) | ((x & mask8) << 8); - x = ((x >> 16) & mask16) | ((x & mask16) << 16); - return (x >> 32) | (x << 32); -#endif -} - // ---------------- Slices and Tables // WUFFS_BASE__SLICE is a 1-dimensional buffer. @@ -1265,34 +1212,12 @@ wuffs_base__malloc_slice_u64(void* (*malloc_func)(size_t), uint64_t num_u64) { return ((wuffs_base__slice_u64){}); } -#ifdef __cplusplus -} // extern "C" -#endif - -// Copyright 2017 The Wuffs Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifdef __cplusplus -extern "C" { -#endif - // ---------------- Images -// wuffs_base__color_u32argb is an 8 bit per channel Alpha, Red, Green, Blue -// color, as a uint32_t value. It is in word order, not byte order: its value -// is always 0xAARRGGBB, regardless of endianness. It uses premultiplied alpha. -typedef uint32_t wuffs_base__color_u32argb; +// wuffs_base__color_u32_argb_premul is an 8 bit per channel premultiplied +// Alpha, Red, Green, Blue color, as a uint32_t value. It is in word order, not +// byte order: its value is always 0xAARRGGBB, regardless of endianness. +typedef uint32_t wuffs_base__color_u32_argb_premul; // -------- @@ -1326,7 +1251,7 @@ typedef uint32_t wuffs_base__color_u32argb; // // For direct formats with N > 1 channels, those channels can be laid out in // either 1 (packed) or N (planar) planes. For example, RGBA data is usually -// packed, but YUV data is usually planar, due to chroma subsampling (for +// packed, but YCbCr data is usually planar, due to chroma subsampling (for // details, see the wuffs_base__pixel_subsampling type). // // For indexed formats, the palette (always 256 × 4 bytes) holds 8 bits per @@ -1335,12 +1260,13 @@ typedef uint32_t wuffs_base__color_u32argb; // indices. Plane 3 is re-purposed to hold the per-index colors. // // The color field is encoded in 3 bits: -// - 0 means A (Alpha). -// - 1 means Y or YA (Gray, Alpha). -// - 2 means BGR, BGRX or BGRA (Blue, Green, Red, X-padding or Alpha). -// - 3 means RGB, RGBX or RGBA (Red, Green, Blue, X-padding or Alpha). -// - 4 means YUV or YUVA (Luma, Chroma-blue, Chroma-red, Alpha). -// - 5 means CMY or CMYK (Cyan, Magenta, Yellow, Black). +// - 0 means A (Alpha). +// - 1 means Y or YA (Gray, Alpha). +// - 2 means YCbCr or YCbCrA (Luma, Chroma-blue, Chroma-red, Alpha). +// - 3 means YCoCg or YCoCgA (Luma, Chroma-orange, Chroma-green, Alpha). +// - 4 means BGR, BGRX or BGRA (Blue, Green, Red, X-padding or Alpha). +// - 5 means RGB, RGBX or RGBA (Red, Green, Blue, X-padding or Alpha). +// - 6 means CMY or CMYK (Cyan, Magenta, Yellow, Black). // - all other values are reserved. // // In Wuffs, channels are given in memory order (also known as byte order), @@ -1371,7 +1297,7 @@ typedef uint32_t wuffs_base__color_u32argb; // - 14 means a bit depth of 48. // - 15 means a bit depth of 64. // -// For example, wuffs_base__pixel_format 0x3210BBBB is a natural format for +// For example, wuffs_base__pixel_format 0x5210BBBB is a natural format for // decoding a PNG image - network byte order (also known as big-endian), // packed, non-premultiplied alpha - that happens to be 16-bit-depth truecolor // with alpha (RGBA). In memory order: @@ -1379,7 +1305,7 @@ typedef uint32_t wuffs_base__color_u32argb; // ptr+0 ptr+1 ptr+2 ptr+3 ptr+4 ptr+5 ptr+6 ptr+7 // Rhi Rlo Ghi Glo Bhi Blo Ahi Alo // -// For example, the value wuffs_base__pixel_format 0x20000565 means BGR with no +// For example, the value wuffs_base__pixel_format 0x40000565 means BGR with no // alpha or padding, 5/6/5 bits for blue/green/red, packed 2 bytes per pixel, // laid out LSB-first in memory order: // @@ -1388,12 +1314,12 @@ typedef uint32_t wuffs_base__color_u32argb; // G₂G₁G₀B₄B₃B₂B₁B₀ R₄R₃R₂R₁R₀G₅G₄G₃ // // On little-endian systems (but not big-endian), this Wuffs pixel format value -// (0x20000565) corresponds to the Cairo library's CAIRO_FORMAT_RGB16_565, the +// (0x40000565) corresponds to the Cairo library's CAIRO_FORMAT_RGB16_565, the // SDL2 (Simple DirectMedia Layer 2) library's SDL_PIXELFORMAT_RGB565 and the // Skia library's kRGB_565_SkColorType. Note BGR in Wuffs versus RGB in the // other libraries. // -// Regardless of endianness, this Wuffs pixel format value (0x20000565) +// Regardless of endianness, this Wuffs pixel format value (0x40000565) // corresponds to the V4L2 (Video For Linux 2) library's V4L2_PIX_FMT_RGB565 // and the Wayland-DRM library's WL_DRM_FORMAT_RGB565. // @@ -1421,30 +1347,35 @@ typedef uint32_t wuffs_base__pixel_format; #define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL \ ((wuffs_base__pixel_format)0x13000008) +#define WUFFS_BASE__PIXEL_FORMAT__YCBCR ((wuffs_base__pixel_format)0x20020888) +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK ((wuffs_base__pixel_format)0x21038888) +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL \ + ((wuffs_base__pixel_format)0x22038888) + +#define WUFFS_BASE__PIXEL_FORMAT__YCOCG ((wuffs_base__pixel_format)0x30020888) +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK ((wuffs_base__pixel_format)0x31038888) +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL \ + ((wuffs_base__pixel_format)0x32038888) + #define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL \ - ((wuffs_base__pixel_format)0x22040008) + ((wuffs_base__pixel_format)0x42040008) -#define WUFFS_BASE__PIXEL_FORMAT__BGR ((wuffs_base__pixel_format)0x20000888) -#define WUFFS_BASE__PIXEL_FORMAT__BGRX ((wuffs_base__pixel_format)0x21008888) +#define WUFFS_BASE__PIXEL_FORMAT__BGR ((wuffs_base__pixel_format)0x40000888) +#define WUFFS_BASE__PIXEL_FORMAT__BGRX ((wuffs_base__pixel_format)0x41008888) #define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL \ - ((wuffs_base__pixel_format)0x22008888) + ((wuffs_base__pixel_format)0x42008888) #define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL \ - ((wuffs_base__pixel_format)0x23008888) + ((wuffs_base__pixel_format)0x43008888) -#define WUFFS_BASE__PIXEL_FORMAT__RGB ((wuffs_base__pixel_format)0x30000888) -#define WUFFS_BASE__PIXEL_FORMAT__RGBX ((wuffs_base__pixel_format)0x31008888) +#define WUFFS_BASE__PIXEL_FORMAT__RGB ((wuffs_base__pixel_format)0x50000888) +#define WUFFS_BASE__PIXEL_FORMAT__RGBX ((wuffs_base__pixel_format)0x51008888) #define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL \ - ((wuffs_base__pixel_format)0x32008888) + ((wuffs_base__pixel_format)0x52008888) #define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL \ - ((wuffs_base__pixel_format)0x33008888) + ((wuffs_base__pixel_format)0x53008888) -#define WUFFS_BASE__PIXEL_FORMAT__YUV ((wuffs_base__pixel_format)0x40020888) -#define WUFFS_BASE__PIXEL_FORMAT__YUVK ((wuffs_base__pixel_format)0x41038888) -#define WUFFS_BASE__PIXEL_FORMAT__YUVA_NONPREMUL \ - ((wuffs_base__pixel_format)0x42038888) - -#define WUFFS_BASE__PIXEL_FORMAT__CMY ((wuffs_base__pixel_format)0x50020888) -#define WUFFS_BASE__PIXEL_FORMAT__CMYK ((wuffs_base__pixel_format)0x51038888) +#define WUFFS_BASE__PIXEL_FORMAT__CMY ((wuffs_base__pixel_format)0x60020888) +#define WUFFS_BASE__PIXEL_FORMAT__CMYK ((wuffs_base__pixel_format)0x61038888) static inline bool // wuffs_base__pixel_format__is_valid(wuffs_base__pixel_format f) { @@ -1475,9 +1406,9 @@ wuffs_base__pixel_format__num_planes(wuffs_base__pixel_format f) { // // For packed pixel formats, the mapping is trivial: i = x and j = y. For // planar pixel formats, the mapping can differ due to chroma subsampling. For -// example, consider a three plane YUV pixel format with 4:2:2 subsampling. For -// the luma (Y) channel, there is one sample for every pixel, but for the -// chroma (U, V) channels, there is one sample for every two pixels: pairs of +// example, consider a three plane YCbCr pixel format with 4:2:2 subsampling. +// For the luma (Y) channel, there is one sample for every pixel, but for the +// chroma (Cb, Cr) channels, there is one sample for every two pixels: pairs of // horizontally adjacent pixels form one macropixel, i = x / 2 and j == y. In // general, for a given p: // - i = (x + bias_x) >> shift_x. @@ -1647,17 +1578,40 @@ wuffs_base__pixel_config__height(wuffs_base__pixel_config* c) { // example, decoding a JPEG image straight to RGBA instead of to YCbCr? static inline uint64_t // wuffs_base__pixel_config__pixbuf_len(wuffs_base__pixel_config* c) { - if (c) { - uint64_t n = - ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height); - // TODO: handle things other than 1 byte per pixel. When doing so, consider - // that the +1024 below could overflow. - if (wuffs_base__pixel_format__is_indexed(c->private_impl.pixfmt)) { - n += 1024; - } - return n; + // TODO: support more pixel formats. + uint64_t bytes_per_pixel = 0; + switch (wuffs_base__pixel_config__pixel_format(c)) { + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + bytes_per_pixel = 1; + break; + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + bytes_per_pixel = 4; + break; + default: + return 0; } - return 0; + + if (!c) { + return 0; + } + + uint64_t n = + ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height); + + if (n > (UINT64_MAX / bytes_per_pixel)) { + return 0; + } + n *= bytes_per_pixel; + + if (wuffs_base__pixel_format__is_indexed(c->private_impl.pixfmt)) { + if (n > (UINT64_MAX - 1024)) { + return 0; + } + n += 1024; + } + + return n; } #ifdef __cplusplus @@ -2053,6 +2007,7 @@ typedef struct { inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory); inline wuffs_base__slice_u8 palette(); + inline wuffs_base__pixel_format pixel_format(); inline wuffs_base__table_u8 plane(uint32_t p); #endif // __cplusplus @@ -2090,18 +2045,40 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, len -= 1024; } - // TODO: don't assume 1 byte per pixel. Don't assume packed. + // TODO: support more pixel formats. + uint64_t bytes_per_pixel = 0; + switch (wuffs_base__pixel_config__pixel_format(pixcfg)) { + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + bytes_per_pixel = 1; + break; + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + bytes_per_pixel = 4; + break; + default: + return wuffs_base__error__bad_argument; + } + + // TODO: don't assume packed. uint64_t wh = ((uint64_t)pixcfg->private_impl.width) * ((uint64_t)pixcfg->private_impl.height); + size_t width = (size_t)(pixcfg->private_impl.width); + if ((wh > (UINT64_MAX / bytes_per_pixel)) || + (width > (SIZE_MAX / bytes_per_pixel))) { + return wuffs_base__error__bad_argument; + } + wh *= bytes_per_pixel; + width *= bytes_per_pixel; if (wh > len) { return wuffs_base__error__bad_argument_length_too_short; } + b->pixcfg = *pixcfg; wuffs_base__table_u8* tab = &b->private_impl.planes[0]; tab->ptr = ptr; - tab->width = pixcfg->private_impl.width; + tab->width = width; tab->height = pixcfg->private_impl.height; - tab->stride = pixcfg->private_impl.width; + tab->stride = width; return NULL; } @@ -2123,6 +2100,14 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__pixel_format // +wuffs_base__pixel_buffer__pixel_format(wuffs_base__pixel_buffer* b) { + if (b) { + return b->pixcfg.private_impl.pixfmt; + } + return WUFFS_BASE__PIXEL_FORMAT__INVALID; +} + static inline wuffs_base__table_u8 // wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) @@ -2143,6 +2128,11 @@ wuffs_base__pixel_buffer::palette() { return wuffs_base__pixel_buffer__palette(this); } +inline wuffs_base__pixel_format // +wuffs_base__pixel_buffer::pixel_format() { + return wuffs_base__pixel_buffer__pixel_format(this); +} + inline wuffs_base__table_u8 // wuffs_base__pixel_buffer::plane(uint32_t p) { return wuffs_base__pixel_buffer__plane(this, p); @@ -2168,14 +2158,70 @@ typedef struct { #endif // __cplusplus +// -------- + +typedef struct { + // Do not access the private_impl's fields directly. There is no API/ABI + // compatibility or safety guarantee if you do so. + struct { + // TODO: should the func type take restrict pointers? + uint64_t (*func)(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src); + } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette); + inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src); +#endif // __cplusplus + +} wuffs_base__pixel_swizzler; + +// TODO: should initialize (both the C and C++ methods) return a status? + +void // +wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, + wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette); + +uint64_t // +wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, + wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src); + +#ifdef __cplusplus + +inline void // +wuffs_base__pixel_swizzler::initialize(wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette) { + wuffs_base__pixel_swizzler__initialize(this, dst_format, dst_palette, + src_format, src_palette); +} + +uint64_t // +wuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) { + return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette, + src); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - #ifdef __cplusplus extern "C" { #endif @@ -2257,10 +2303,6 @@ struct wuffs_adler32__hasher__struct { } // extern "C" #endif -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - #ifdef __cplusplus extern "C" { #endif @@ -2341,10 +2383,6 @@ struct wuffs_crc32__ieee_hasher__struct { } // extern "C" #endif -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - #ifdef __cplusplus extern "C" { #endif @@ -2424,25 +2462,16 @@ struct wuffs_deflate__decoder__struct { struct { uint32_t coro_susp_point; - wuffs_base__status v_z; - uint64_t v_n_copied; - uint32_t v_already_full; } c_decode[1]; struct { uint32_t coro_susp_point; uint32_t v_final; - uint32_t v_type; } c_decode_blocks[1]; struct { uint32_t coro_susp_point; uint32_t v_length; - uint32_t v_n_copied; uint64_t scratch; } c_decode_uncompressed[1]; - struct { - uint32_t coro_susp_point; - uint32_t v_i; - } c_init_fixed_huffman[1]; struct { uint32_t coro_susp_point; uint32_t v_bits; @@ -2453,7 +2482,6 @@ struct wuffs_deflate__decoder__struct { uint32_t v_i; uint32_t v_mask; uint32_t v_table_entry; - uint32_t v_table_entry_n_bits; uint32_t v_n_extra_bits; uint8_t v_rep_symbol; uint32_t v_rep_count; @@ -2470,7 +2498,6 @@ struct wuffs_deflate__decoder__struct { uint32_t v_redir_mask; uint32_t v_length; uint32_t v_dist_minus_1; - uint32_t v_n_copied; uint32_t v_hlen; uint32_t v_hdist; } c_decode_huffman_slow[1]; @@ -2499,16 +2526,6 @@ struct wuffs_deflate__decoder__struct { } // extern "C" #endif -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - -// ---------------- BEGIN USE "std/lzw" - -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - #ifdef __cplusplus extern "C" { #endif @@ -2540,7 +2557,7 @@ sizeof__wuffs_lzw__decoder(); // ---------------- Public Function Prototypes -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -2586,19 +2603,11 @@ struct wuffs_lzw__decoder__struct { uint32_t v_j; uint32_t v_bits; uint32_t v_n_bits; - uint32_t v_code; - uint16_t v_lm1_a; - uint32_t v_c; - uint32_t v_o; - uint32_t v_steps; - uint8_t v_first_byte; - uint16_t v_lm1_b; } c_decode[1]; struct { uint32_t coro_susp_point; uint32_t v_i; uint32_t v_j; - uint64_t v_n; } c_flush[1]; } private_impl; @@ -2610,7 +2619,7 @@ struct wuffs_lzw__decoder__struct { wuffs_version); } - inline void // + inline wuffs_base__empty_struct // set_literal_width(uint32_t a_lw) { return wuffs_lzw__decoder__set_literal_width(this, a_lw); } @@ -2630,8 +2639,6 @@ struct wuffs_lzw__decoder__struct { } // extern "C" #endif -// ---------------- END USE "std/lzw" - #ifdef __cplusplus extern "C" { #endif @@ -2675,16 +2682,19 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, wuffs_base__io_reader a_src); WUFFS_BASE__MAYBE_STATIC uint32_t // -wuffs_gif__decoder__num_animation_loops(wuffs_gif__decoder* self); +wuffs_gif__decoder__num_animation_loops(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self); +wuffs_gif__decoder__num_decoded_frame_configs(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self); +wuffs_gif__decoder__num_decoded_frames(const wuffs_gif__decoder* self); + +WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32 // +wuffs_gif__decoder__frame_dirty_rect(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // -wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self); +wuffs_gif__decoder__workbuf_len(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_gif__decoder__restart_frame(wuffs_gif__decoder* self, @@ -2747,25 +2757,24 @@ struct wuffs_gif__decoder__struct { uint32_t f_frame_rect_y1; uint32_t f_dst_x; uint32_t f_dst_y; + wuffs_base__range_ie_u32 f_dirty_y; uint32_t f_uncompressed_ri; uint32_t f_uncompressed_wi; uint8_t f_uncompressed[4096]; uint8_t f_palettes[2][1024]; + uint8_t f_dst_palette[1024]; + wuffs_base__pixel_swizzler f_swizzler; wuffs_base__utility f_util; wuffs_lzw__decoder f_lzw; struct { uint32_t coro_susp_point; - bool v_ffio; } c_decode_image_config[1]; struct { uint32_t coro_susp_point; - uint8_t v_blend; } c_decode_frame_config[1]; struct { uint32_t coro_susp_point; - uint8_t v_flags; - uint8_t v_lw; uint64_t scratch; } c_skip_frame[1]; struct { @@ -2773,7 +2782,6 @@ struct wuffs_gif__decoder__struct { } c_decode_frame[1]; struct { uint32_t coro_susp_point; - uint8_t v_block_type; } c_decode_up_to_id_part1[1]; struct { uint32_t coro_susp_point; @@ -2785,21 +2793,17 @@ struct wuffs_gif__decoder__struct { uint8_t v_flags; uint32_t v_num_palette_entries; uint32_t v_i; - uint32_t v_argb; uint64_t scratch; } c_decode_lsd[1]; struct { uint32_t coro_susp_point; - uint8_t v_label; } c_decode_extension[1]; struct { uint32_t coro_susp_point; - uint8_t v_block_size; uint64_t scratch; } c_skip_blocks[1]; struct { uint32_t coro_susp_point; - uint8_t v_c; uint8_t v_block_size; bool v_not_animexts; bool v_not_netscape; @@ -2807,8 +2811,6 @@ struct wuffs_gif__decoder__struct { } c_decode_ae[1]; struct { uint32_t coro_susp_point; - uint8_t v_c; - uint8_t v_flags; uint64_t scratch; } c_decode_gc[1]; struct { @@ -2817,13 +2819,9 @@ struct wuffs_gif__decoder__struct { } c_decode_id_part0[1]; struct { uint32_t coro_susp_point; - uint8_t v_flags; uint32_t v_num_palette_entries; uint32_t v_i; - uint32_t v_argb; - uint8_t v_lw; uint64_t v_block_size; - wuffs_base__status v_z; uint64_t scratch; } c_decode_id_part1[1]; } private_impl; @@ -2843,22 +2841,27 @@ struct wuffs_gif__decoder__struct { } inline uint32_t // - num_animation_loops() { + num_animation_loops() const { return wuffs_gif__decoder__num_animation_loops(this); } inline uint64_t // - num_decoded_frame_configs() { + num_decoded_frame_configs() const { return wuffs_gif__decoder__num_decoded_frame_configs(this); } inline uint64_t // - num_decoded_frames() { + num_decoded_frames() const { return wuffs_gif__decoder__num_decoded_frames(this); } + inline wuffs_base__rect_ie_u32 // + frame_dirty_rect() const { + return wuffs_gif__decoder__frame_dirty_rect(this); + } + inline wuffs_base__range_ii_u64 // - workbuf_len() { + workbuf_len() const { return wuffs_gif__decoder__workbuf_len(this); } @@ -2892,18 +2895,6 @@ struct wuffs_gif__decoder__struct { } // extern "C" #endif -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - -// ---------------- BEGIN USE "std/crc32" - -// ---------------- END USE "std/crc32" - -// ---------------- BEGIN USE "std/deflate" - -// ---------------- END USE "std/deflate" - #ifdef __cplusplus extern "C" { #endif @@ -2938,7 +2929,7 @@ sizeof__wuffs_gzip__decoder(); // ---------------- Public Function Prototypes -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -2972,14 +2963,10 @@ struct wuffs_gzip__decoder__struct { struct { uint32_t coro_susp_point; - uint8_t v_c; uint8_t v_flags; - uint16_t v_xlen; uint32_t v_checksum_got; uint32_t v_decoded_length_got; - wuffs_base__status v_z; uint32_t v_checksum_want; - uint32_t v_decoded_length_want; uint64_t scratch; } c_decode[1]; } private_impl; @@ -2992,7 +2979,7 @@ struct wuffs_gzip__decoder__struct { wuffs_version); } - inline void // + inline wuffs_base__empty_struct // set_ignore_checksum(bool a_ic) { return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic); } @@ -3012,18 +2999,6 @@ struct wuffs_gzip__decoder__struct { } // extern "C" #endif -// Code generated by wuffs-c. DO NOT EDIT. - -// ---------------- Use Declarations - -// ---------------- BEGIN USE "std/adler32" - -// ---------------- END USE "std/adler32" - -// ---------------- BEGIN USE "std/deflate" - -// ---------------- END USE "std/deflate" - #ifdef __cplusplus extern "C" { #endif @@ -3058,7 +3033,7 @@ sizeof__wuffs_zlib__decoder(); // ---------------- Public Function Prototypes -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -3092,10 +3067,7 @@ struct wuffs_zlib__decoder__struct { struct { uint32_t coro_susp_point; - uint16_t v_x; uint32_t v_checksum_got; - wuffs_base__status v_z; - uint32_t v_checksum_want; uint64_t scratch; } c_decode[1]; } private_impl; @@ -3108,7 +3080,7 @@ struct wuffs_zlib__decoder__struct { wuffs_version); } - inline void // + inline wuffs_base__empty_struct // set_ignore_checksum(bool a_ic) { return wuffs_zlib__decoder__set_ignore_checksum(this, a_ic); } @@ -3131,20 +3103,6 @@ struct wuffs_zlib__decoder__struct { // WUFFS C HEADER ENDS HERE. #ifdef WUFFS_IMPLEMENTATION -// Copyright 2017 The Wuffs Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #ifdef __cplusplus extern "C" { #endif @@ -3459,6 +3417,18 @@ wuffs_base__store_u64le(uint8_t* p, uint64_t x) { // -------- +extern const uint8_t wuffs_base__low_bits_mask__u8[9]; +extern const uint16_t wuffs_base__low_bits_mask__u16[17]; +extern const uint32_t wuffs_base__low_bits_mask__u32[33]; +extern const uint64_t wuffs_base__low_bits_mask__u64[65]; + +#define WUFFS_BASE__LOW_BITS_MASK__U8(n) (wuffs_base__low_bits_mask__u8[n]) +#define WUFFS_BASE__LOW_BITS_MASK__U16(n) (wuffs_base__low_bits_mask__u16[n]) +#define WUFFS_BASE__LOW_BITS_MASK__U32(n) (wuffs_base__low_bits_mask__u32[n]) +#define WUFFS_BASE__LOW_BITS_MASK__U64(n) (wuffs_base__low_bits_mask__u64[n]) + +// -------- + static inline void // wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { *x = wuffs_base__u8__sat_add(*x, y); @@ -3520,19 +3490,19 @@ wuffs_base__slice_u8__suffix(wuffs_base__slice_u8 s, uint64_t up_to) { return s; } -// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr, -// length) where length is the minimum of dst.len and src.len. +// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr, len) +// where len is the minimum of dst.len and src.len. // // Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty // slice) is valid and results in a no-op. static inline uint64_t // wuffs_base__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src) { - size_t length = dst.len < src.len ? dst.len : src.len; - if (length > 0) { - memmove(dst.ptr, src.ptr, length); + size_t len = dst.len < src.len ? dst.len : src.len; + if (len > 0) { + memmove(dst.ptr, src.ptr, len); } - return length; + return len; } // -------- @@ -3548,10 +3518,52 @@ wuffs_base__table_u8__row(wuffs_base__table_u8 t, uint32_t y) { return ((wuffs_base__slice_u8){}); } +// ---------------- Ranges and Rects + +static inline uint32_t // +wuffs_base__range_ii_u32__get_min_incl(const wuffs_base__range_ii_u32* r) { + return r->min_incl; +} + +static inline uint32_t // +wuffs_base__range_ii_u32__get_max_incl(const wuffs_base__range_ii_u32* r) { + return r->max_incl; +} + +static inline uint32_t // +wuffs_base__range_ie_u32__get_min_incl(const wuffs_base__range_ie_u32* r) { + return r->min_incl; +} + +static inline uint32_t // +wuffs_base__range_ie_u32__get_max_excl(const wuffs_base__range_ie_u32* r) { + return r->max_excl; +} + +static inline uint64_t // +wuffs_base__range_ii_u64__get_min_incl(const wuffs_base__range_ii_u64* r) { + return r->min_incl; +} + +static inline uint64_t // +wuffs_base__range_ii_u64__get_max_incl(const wuffs_base__range_ii_u64* r) { + return r->max_incl; +} + +static inline uint64_t // +wuffs_base__range_ie_u64__get_min_incl(const wuffs_base__range_ie_u64* r) { + return r->min_incl; +} + +static inline uint64_t // +wuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_ie_u64* r) { + return r->max_excl; +} + // ---------------- Utility static inline wuffs_base__range_ii_u32 // -wuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored, uint32_t min_incl, uint32_t max_incl) { return ((wuffs_base__range_ii_u32){ @@ -3561,7 +3573,7 @@ wuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored, } static inline wuffs_base__range_ie_u32 // -wuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored, uint32_t min_incl, uint32_t max_excl) { return ((wuffs_base__range_ie_u32){ @@ -3571,7 +3583,7 @@ wuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored, } static inline wuffs_base__range_ii_u64 // -wuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored, uint64_t min_incl, uint64_t max_incl) { return ((wuffs_base__range_ii_u64){ @@ -3581,7 +3593,7 @@ wuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored, } static inline wuffs_base__range_ie_u64 // -wuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored, uint64_t min_incl, uint64_t max_excl) { return ((wuffs_base__range_ie_u64){ @@ -3591,7 +3603,7 @@ wuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored, uint32_t min_incl_x, uint32_t min_incl_y, uint32_t max_incl_x, @@ -3605,7 +3617,7 @@ wuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__utility__make_rect_ie_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored, uint32_t min_incl_x, uint32_t min_incl_y, uint32_t max_excl_x, @@ -3835,12 +3847,55 @@ wuffs_base__io_writer__set_mark(wuffs_base__io_writer* o, uint8_t* mark) { return ((wuffs_base__empty_struct){}); } -#ifdef __cplusplus -} // extern "C" -#endif + // ---------------- Memory Allocation + + // ---------------- Images #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) +const uint8_t wuffs_base__low_bits_mask__u8[9] = { + 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF, +}; + +const uint16_t wuffs_base__low_bits_mask__u16[17] = { + 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, + 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF, +}; + +const uint32_t wuffs_base__low_bits_mask__u32[33] = { + 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F, + 0x0000003F, 0x0000007F, 0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF, + 0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF, 0x0001FFFF, + 0x0003FFFF, 0x0007FFFF, 0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF, + 0x00FFFFFF, 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, 0x0FFFFFFF, 0x1FFFFFFF, + 0x3FFFFFFF, 0x7FFFFFFF, 0xFFFFFFFF, +}; + +const uint64_t wuffs_base__low_bits_mask__u64[65] = { + 0x0000000000000000, 0x0000000000000001, 0x0000000000000003, + 0x0000000000000007, 0x000000000000000F, 0x000000000000001F, + 0x000000000000003F, 0x000000000000007F, 0x00000000000000FF, + 0x00000000000001FF, 0x00000000000003FF, 0x00000000000007FF, + 0x0000000000000FFF, 0x0000000000001FFF, 0x0000000000003FFF, + 0x0000000000007FFF, 0x000000000000FFFF, 0x000000000001FFFF, + 0x000000000003FFFF, 0x000000000007FFFF, 0x00000000000FFFFF, + 0x00000000001FFFFF, 0x00000000003FFFFF, 0x00000000007FFFFF, + 0x0000000000FFFFFF, 0x0000000001FFFFFF, 0x0000000003FFFFFF, + 0x0000000007FFFFFF, 0x000000000FFFFFFF, 0x000000001FFFFFFF, + 0x000000003FFFFFFF, 0x000000007FFFFFFF, 0x00000000FFFFFFFF, + 0x00000001FFFFFFFF, 0x00000003FFFFFFFF, 0x00000007FFFFFFFF, + 0x0000000FFFFFFFFF, 0x0000001FFFFFFFFF, 0x0000003FFFFFFFFF, + 0x0000007FFFFFFFFF, 0x000000FFFFFFFFFF, 0x000001FFFFFFFFFF, + 0x000003FFFFFFFFFF, 0x000007FFFFFFFFFF, 0x00000FFFFFFFFFFF, + 0x00001FFFFFFFFFFF, 0x00003FFFFFFFFFFF, 0x00007FFFFFFFFFFF, + 0x0000FFFFFFFFFFFF, 0x0001FFFFFFFFFFFF, 0x0003FFFFFFFFFFFF, + 0x0007FFFFFFFFFFFF, 0x000FFFFFFFFFFFFF, 0x001FFFFFFFFFFFFF, + 0x003FFFFFFFFFFFFF, 0x007FFFFFFFFFFFFF, 0x00FFFFFFFFFFFFFF, + 0x01FFFFFFFFFFFFFF, 0x03FFFFFFFFFFFFFF, 0x07FFFFFFFFFFFFFF, + 0x0FFFFFFFFFFFFFFF, 0x1FFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFFFFF, + 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, +}; + const char* wuffs_base__warning__end_of_data = "~base: end of data"; const char* wuffs_base__suspension__short_read = "$base: short read"; const char* wuffs_base__suspension__short_write = "$base: short write"; @@ -3863,9 +3918,136 @@ const char* wuffs_base__error__check_wuffs_version_missing = const char* wuffs_base__error__disabled_by_previous_error = "?base: disabled by previous error"; +// ---------------- Images + +static uint64_t // +wuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) { + return wuffs_base__slice_u8__copy_from_slice(dst, src); +} + +static uint64_t // +wuffs_base__pixel_swizzler__copy_4_1(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) { + if (dst_palette.len != 1024) { + return 0; + } + size_t dst_len4 = dst.len / 4; + size_t len = dst_len4 < src.len ? dst_len4 : src.len; + uint8_t* d = dst.ptr; + uint8_t* s = src.ptr; + + size_t n = len; + while (n--) { + uint8_t* p = dst_palette.ptr + ((size_t)(*s) * 4); + uint8_t b0 = p[0]; + uint8_t b1 = p[1]; + uint8_t b2 = p[2]; + uint8_t b3 = p[3]; + d[0] = b0; + d[1] = b1; + d[2] = b2; + d[3] = b3; + s += 1; + d += 4; + } + return len; +} + +static uint64_t // +wuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 src) { + size_t len4 = (dst.len < src.len ? dst.len : src.len) / 4; + uint8_t* d = dst.ptr; + uint8_t* s = src.ptr; + + size_t n = len4; + while (n--) { + uint8_t b0 = s[0]; + uint8_t b1 = s[1]; + uint8_t b2 = s[2]; + uint8_t b3 = s[3]; + d[0] = b2; + d[1] = b1; + d[2] = b0; + d[3] = b3; + s += 4; + d += 4; + } + return len4 * 4; +} + +void // +wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, + wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette) { + if (!p) { + return; + } + + // TODO: support many more formats. + + uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) = NULL; + + switch (src_format) { + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + switch (dst_format) { + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + break; + } + func = wuffs_base__pixel_swizzler__copy_1_1; + break; + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + break; + } + func = wuffs_base__pixel_swizzler__copy_4_1; + break; + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + break; + } + func = wuffs_base__pixel_swizzler__copy_4_1; + break; + default: + break; + } + break; + + default: + break; + } + + p->private_impl.func = func; +} + +uint64_t // +wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, + wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) { + if (p && p->private_impl.func) { + return (*(p->private_impl.func))(dst, dst_palette, src); + } + return 0; +} + #endif // !defined(WUFFS_CONFIG__MODULES) || // defined(WUFFS_CONFIG__MODULE__BASE) +#ifdef __cplusplus +} // extern "C" +#endif + #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) // ---------------- Status Codes Implementations @@ -3926,7 +4108,7 @@ wuffs_adler32__hasher__update(wuffs_adler32__hasher* self, self->private_impl.f_started = true; self->private_impl.f_state = 1; } - v_s1 = ((self->private_impl.f_state) & ((1 << (16)) - 1)); + v_s1 = ((self->private_impl.f_state) & 0xFFFF); v_s2 = ((self->private_impl.f_state) >> (32 - (16))); while (((uint64_t)(a_x.len)) > 0) { v_remaining = ((wuffs_base__slice_u8){}); @@ -4916,11 +5098,11 @@ static const uint8_t wuffs_deflate__reverse8[256] = { }; static const uint32_t wuffs_deflate__lcode_magic_numbers[32] = { - 1073742592, 1073742848, 1073743104, 1073743360, 1073743616, 1073743872, - 1073744128, 1073744384, 1073744656, 1073745168, 1073745680, 1073746192, - 1073746720, 1073747744, 1073748768, 1073749792, 1073750832, 1073752880, - 1073754928, 1073756976, 1073759040, 1073763136, 1073767232, 1073771328, - 1073775440, 1073783632, 1073791824, 1073800016, 1073807872, 134217728, + 1073741824, 1073742080, 1073742336, 1073742592, 1073742848, 1073743104, + 1073743360, 1073743616, 1073743888, 1073744400, 1073744912, 1073745424, + 1073745952, 1073746976, 1073748000, 1073749024, 1073750064, 1073752112, + 1073754160, 1073756208, 1073758272, 1073762368, 1073766464, 1073770560, + 1073774672, 1073782864, 1073791056, 1073799248, 1073807104, 134217728, 134217728, 134217728, }; @@ -5044,10 +5226,10 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; if (coro_susp_point) { - v_z = self->private_impl.c_decode[0].v_z; + v_z = NULL; v_written = ((wuffs_base__slice_u8){}); - v_n_copied = self->private_impl.c_decode[0].v_n_copied; - v_already_full = self->private_impl.c_decode[0].v_already_full; + v_n_copied = 0; + v_already_full = 0; } else { v_written = ((wuffs_base__slice_u8){}); } @@ -5134,9 +5316,6 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, goto suspend; suspend: self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode[0].v_z = v_z; - self->private_impl.c_decode[0].v_n_copied = v_n_copied; - self->private_impl.c_decode[0].v_already_full = v_already_full; goto exit; exit: @@ -5160,6 +5339,7 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, wuffs_base__status status = NULL; uint32_t v_final; + uint32_t v_b0; uint32_t v_type; uint8_t* iop_a_src = NULL; @@ -5183,7 +5363,8 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, self->private_impl.c_decode_blocks[0].coro_susp_point; if (coro_susp_point) { v_final = self->private_impl.c_decode_blocks[0].v_final; - v_type = self->private_impl.c_decode_blocks[0].v_type; + v_b0 = 0; + v_type = 0; } else { } switch (coro_susp_point) { @@ -5199,10 +5380,10 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_0 = *iop_a_src++; - self->private_impl.f_bits |= - (((uint32_t)(t_0)) << self->private_impl.f_n_bits); + uint32_t t_0 = *iop_a_src++; + v_b0 = t_0; } + self->private_impl.f_bits |= (v_b0 << self->private_impl.f_n_bits); self->private_impl.f_n_bits += 8; } v_final = (self->private_impl.f_bits & 1); @@ -5226,13 +5407,12 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, } goto label_0_continue; } else if (v_type == 1) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); status = wuffs_deflate__decoder__init_fixed_huffman(self); if (status) { - goto suspend; + goto exit; } } else if (v_type == 2) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -5250,7 +5430,6 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, goto exit; } self->private_impl.f_end_of_block = false; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -5261,12 +5440,12 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } if (status) { - goto suspend; + goto exit; } if (self->private_impl.f_end_of_block) { goto label_0_continue; } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -5297,7 +5476,6 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, suspend: self->private_impl.c_decode_blocks[0].coro_susp_point = coro_susp_point; self->private_impl.c_decode_blocks[0].v_final = v_final; - self->private_impl.c_decode_blocks[0].v_type = v_type; goto exit; exit: @@ -5360,7 +5538,7 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, self->private_impl.c_decode_uncompressed[0].coro_susp_point; if (coro_susp_point) { v_length = self->private_impl.c_decode_uncompressed[0].v_length; - v_n_copied = self->private_impl.c_decode_uncompressed[0].v_n_copied; + v_n_copied = 0; } else { } switch (coro_susp_point) { @@ -5375,9 +5553,9 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, self->private_impl.f_bits = 0; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - uint32_t t_1; + uint32_t t_0; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { - t_1 = wuffs_base__load_u32le(iop_a_src); + t_0 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { self->private_impl.c_decode_uncompressed[0].scratch = 0; @@ -5389,26 +5567,25 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, } uint64_t* scratch = &self->private_impl.c_decode_uncompressed[0].scratch; - uint32_t t_0 = *scratch >> 56; + uint32_t num_bits_0 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_0; - if (t_0 == 24) { - t_1 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0; + if (num_bits_0 == 24) { + t_0 = *scratch; break; } - t_0 += 8; - *scratch |= ((uint64_t)(t_0)) << 56; + num_bits_0 += 8; + *scratch |= ((uint64_t)(num_bits_0)) << 56; } } - v_length = t_1; + v_length = t_0; } - if ((((v_length) & ((1 << (16)) - 1)) + ((v_length) >> (32 - (16)))) != - 65535) { + if ((((v_length)&0xFFFF) + ((v_length) >> (32 - (16)))) != 65535) { status = wuffs_deflate__error__inconsistent_stored_block_length; goto exit; } - v_length = ((v_length) & ((1 << (16)) - 1)); + v_length = ((v_length)&0xFFFF); while (true) { v_n_copied = wuffs_base__io_writer__copy_n_from_reader( &iop_a_dst, io1_a_dst, v_length, &iop_a_src, io1_a_src); @@ -5436,7 +5613,6 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, suspend: self->private_impl.c_decode_uncompressed[0].coro_susp_point = coro_susp_point; self->private_impl.c_decode_uncompressed[0].v_length = v_length; - self->private_impl.c_decode_uncompressed[0].v_n_copied = v_n_copied; goto exit; exit: @@ -5460,58 +5636,35 @@ wuffs_deflate__decoder__init_fixed_huffman(wuffs_deflate__decoder* self) { uint32_t v_i; - uint32_t coro_susp_point = - self->private_impl.c_init_fixed_huffman[0].coro_susp_point; - if (coro_susp_point) { - v_i = self->private_impl.c_init_fixed_huffman[0].v_i; - } else { + v_i = 0; + while (v_i < 144) { + self->private_impl.f_code_lengths[v_i] = 8; + v_i += 1; } - switch (coro_susp_point) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - - v_i = 0; - while (v_i < 144) { - self->private_impl.f_code_lengths[v_i] = 8; - v_i += 1; - } - while (v_i < 256) { - self->private_impl.f_code_lengths[v_i] = 9; - v_i += 1; - } - while (v_i < 280) { - self->private_impl.f_code_lengths[v_i] = 7; - v_i += 1; - } - while (v_i < 288) { - self->private_impl.f_code_lengths[v_i] = 8; - v_i += 1; - } - while (v_i < 320) { - self->private_impl.f_code_lengths[v_i] = 5; - v_i += 1; - } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - status = wuffs_deflate__decoder__init_huff(self, 0, 0, 288, 257); - if (status) { - goto suspend; - } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - status = wuffs_deflate__decoder__init_huff(self, 1, 288, 320, 0); - if (status) { - goto suspend; - } - - goto ok; - ok: - self->private_impl.c_init_fixed_huffman[0].coro_susp_point = 0; + while (v_i < 256) { + self->private_impl.f_code_lengths[v_i] = 9; + v_i += 1; + } + while (v_i < 280) { + self->private_impl.f_code_lengths[v_i] = 7; + v_i += 1; + } + while (v_i < 288) { + self->private_impl.f_code_lengths[v_i] = 8; + v_i += 1; + } + while (v_i < 320) { + self->private_impl.f_code_lengths[v_i] = 5; + v_i += 1; + } + status = wuffs_deflate__decoder__init_huff(self, 0, 0, 288, 257); + if (status) { + goto exit; + } + status = wuffs_deflate__decoder__init_huff(self, 1, 288, 320, 0); + if (status) { goto exit; } - - goto suspend; -suspend: - self->private_impl.c_init_fixed_huffman[0].coro_susp_point = coro_susp_point; - self->private_impl.c_init_fixed_huffman[0].v_i = v_i; - goto exit; exit: return status; @@ -5526,16 +5679,20 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, uint32_t v_bits; uint32_t v_n_bits; + uint32_t v_b0; uint32_t v_n_lit; uint32_t v_n_dist; uint32_t v_n_clen; uint32_t v_i; + uint32_t v_b1; uint32_t v_mask; uint32_t v_table_entry; uint32_t v_table_entry_n_bits; + uint32_t v_b2; uint32_t v_n_extra_bits; uint8_t v_rep_symbol; uint32_t v_rep_count; + uint32_t v_b3; uint8_t* iop_a_src = NULL; uint8_t* io0_a_src = NULL; @@ -5559,18 +5716,21 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, if (coro_susp_point) { v_bits = self->private_impl.c_init_dynamic_huffman[0].v_bits; v_n_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_bits; + v_b0 = 0; v_n_lit = self->private_impl.c_init_dynamic_huffman[0].v_n_lit; v_n_dist = self->private_impl.c_init_dynamic_huffman[0].v_n_dist; v_n_clen = self->private_impl.c_init_dynamic_huffman[0].v_n_clen; v_i = self->private_impl.c_init_dynamic_huffman[0].v_i; + v_b1 = 0; v_mask = self->private_impl.c_init_dynamic_huffman[0].v_mask; v_table_entry = self->private_impl.c_init_dynamic_huffman[0].v_table_entry; - v_table_entry_n_bits = - self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits; + v_table_entry_n_bits = 0; + v_b2 = 0; v_n_extra_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits; v_rep_symbol = self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol; v_rep_count = self->private_impl.c_init_dynamic_huffman[0].v_rep_count; + v_b3 = 0; } else { } switch (coro_susp_point) { @@ -5585,24 +5745,25 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_0 = *iop_a_src++; - v_bits |= (((uint32_t)(t_0)) << v_n_bits); + uint32_t t_0 = *iop_a_src++; + v_b0 = t_0; } + v_bits |= (v_b0 << v_n_bits); v_n_bits += 8; } - v_n_lit = (((v_bits) & ((1 << (5)) - 1)) + 257); + v_n_lit = (((v_bits)&0x1F) + 257); if (v_n_lit > 286) { status = wuffs_deflate__error__bad_literal_length_code_count; goto exit; } v_bits >>= 5; - v_n_dist = (((v_bits) & ((1 << (5)) - 1)) + 1); + v_n_dist = (((v_bits)&0x1F) + 1); if (v_n_dist > 30) { status = wuffs_deflate__error__bad_distance_code_count; goto exit; } v_bits >>= 5; - v_n_clen = (((v_bits) & ((1 << (4)) - 1)) + 4); + v_n_clen = (((v_bits)&0xF) + 4); v_bits >>= 4; v_n_bits -= 14; v_i = 0; @@ -5614,9 +5775,10 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_1 = *iop_a_src++; - v_bits |= (((uint32_t)(t_1)) << v_n_bits); + uint32_t t_1 = *iop_a_src++; + v_b1 = t_1; } + v_bits |= (v_b1 << v_n_bits); v_n_bits += 8; } self->private_impl.f_code_lengths[wuffs_deflate__code_order[v_i]] = @@ -5629,10 +5791,9 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, self->private_impl.f_code_lengths[wuffs_deflate__code_order[v_i]] = 0; v_i += 1; } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); status = wuffs_deflate__decoder__init_huff(self, 0, 0, 19, 4095); if (status) { - goto suspend; + goto exit; } v_mask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1); v_i = 0; @@ -5648,14 +5809,15 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, goto label_1_break; } { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_2 = *iop_a_src++; - v_bits |= (((uint32_t)(t_2)) << v_n_bits); + uint32_t t_2 = *iop_a_src++; + v_b2 = t_2; } + v_bits |= (v_b2 << v_n_bits); v_n_bits += 8; } label_1_break:; @@ -5696,17 +5858,18 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, } while (v_n_bits < v_n_extra_bits) { { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_3 = *iop_a_src++; - v_bits |= (((uint32_t)(t_3)) << v_n_bits); + uint32_t t_3 = *iop_a_src++; + v_b3 = t_3; } + v_bits |= (v_b3 << v_n_bits); v_n_bits += 8; } - v_rep_count += ((v_bits) & ((1 << (v_n_extra_bits)) - 1)); + v_rep_count += ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_n_extra_bits)); v_bits >>= v_n_extra_bits; v_n_bits -= v_n_extra_bits; while (v_rep_count > 0) { @@ -5727,16 +5890,14 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, status = wuffs_deflate__error__missing_end_of_block_code; goto exit; } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); status = wuffs_deflate__decoder__init_huff(self, 0, 0, v_n_lit, 257); if (status) { - goto suspend; + goto exit; } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); status = wuffs_deflate__decoder__init_huff(self, 1, v_n_lit, (v_n_lit + v_n_dist), 0); if (status) { - goto suspend; + goto exit; } self->private_impl.f_bits = v_bits; self->private_impl.f_n_bits = v_n_bits; @@ -5759,8 +5920,6 @@ suspend: self->private_impl.c_init_dynamic_huffman[0].v_i = v_i; self->private_impl.c_init_dynamic_huffman[0].v_mask = v_mask; self->private_impl.c_init_dynamic_huffman[0].v_table_entry = v_table_entry; - self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits = - v_table_entry_n_bits; self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits = v_n_extra_bits; self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol = v_rep_symbol; self->private_impl.c_init_dynamic_huffman[0].v_rep_count = v_rep_count; @@ -5960,7 +6119,7 @@ label_1_break:; v_tmp = (v_cl - 9); v_cl = v_tmp; v_redirect_key = ((v_key >> v_tmp) & 511); - v_key = ((v_key) & ((1 << (v_tmp)) - 1)); + v_key = ((v_key)&WUFFS_BASE__LOW_BITS_MASK__U32(v_tmp)); if (v_prev_redirect_key != v_redirect_key) { v_prev_redirect_key = v_redirect_key; v_remaining = (((uint32_t)(1)) << v_cl); @@ -6201,7 +6360,7 @@ label_0_continue:; wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; goto exit; } - v_length = ((v_table_entry >> 8) & 32767); + v_length = (((v_table_entry >> 8) & 255) + 3); v_table_entry_n_bits = ((v_table_entry >> 4) & 15); if (v_table_entry_n_bits > 0) { if (v_n_bits < 15) { @@ -6214,17 +6373,14 @@ label_0_continue:; } else { } v_length = - ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & - 32767); + (((v_length + 253 + + ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & + 255) + + 3); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; } else { } - if (v_length > 258) { - status = - wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; - goto exit; - } if (v_n_bits < 15) { v_bits |= (((uint32_t)(wuffs_base__load_u8be(iop_a_src))) << v_n_bits); (iop_a_src += 1, wuffs_base__return_empty_struct()); @@ -6282,7 +6438,8 @@ label_0_continue:; v_n_bits += 8; } v_dist_minus_1 = - ((v_dist_minus_1 + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & + ((v_dist_minus_1 + + ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 32767); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; @@ -6306,11 +6463,6 @@ label_0_continue:; if (v_length > v_hdist) { v_length -= v_hdist; v_hlen = v_hdist; - if (v_length > 258) { - status = - wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; - goto exit; - } } else { v_hlen = v_length; v_length = 0; @@ -6408,10 +6560,16 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, uint32_t v_table_entry_n_bits; uint32_t v_lmask; uint32_t v_dmask; + uint32_t v_b0; uint32_t v_redir_top; uint32_t v_redir_mask; + uint32_t v_b1; uint32_t v_length; + uint32_t v_b2; + uint32_t v_b3; + uint32_t v_b4; uint32_t v_dist_minus_1; + uint32_t v_b5; uint32_t v_n_copied; uint32_t v_hlen; uint32_t v_hdist; @@ -6462,11 +6620,17 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, self->private_impl.c_decode_huffman_slow[0].v_table_entry_n_bits; v_lmask = self->private_impl.c_decode_huffman_slow[0].v_lmask; v_dmask = self->private_impl.c_decode_huffman_slow[0].v_dmask; + v_b0 = 0; v_redir_top = self->private_impl.c_decode_huffman_slow[0].v_redir_top; v_redir_mask = self->private_impl.c_decode_huffman_slow[0].v_redir_mask; + v_b1 = 0; v_length = self->private_impl.c_decode_huffman_slow[0].v_length; + v_b2 = 0; + v_b3 = 0; + v_b4 = 0; v_dist_minus_1 = self->private_impl.c_decode_huffman_slow[0].v_dist_minus_1; - v_n_copied = self->private_impl.c_decode_huffman_slow[0].v_n_copied; + v_b5 = 0; + v_n_copied = 0; v_hlen = self->private_impl.c_decode_huffman_slow[0].v_hlen; v_hdist = self->private_impl.c_decode_huffman_slow[0].v_hdist; } else { @@ -6501,9 +6665,10 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_0 = *iop_a_src++; - v_bits |= (((uint32_t)(t_0)) << v_n_bits); + uint32_t t_0 = *iop_a_src++; + v_b0 = t_0; } + v_bits |= (v_b0 << v_n_bits); v_n_bits += 8; } label_1_break:; @@ -6543,9 +6708,10 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_1 = *iop_a_src++; - v_bits |= (((uint32_t)(t_1)) << v_n_bits); + uint32_t t_1 = *iop_a_src++; + v_b1 = t_1; } + v_bits |= (v_b1 << v_n_bits); v_n_bits += 8; } label_2_break:; @@ -6581,7 +6747,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; goto exit; } - v_length = ((v_table_entry >> 8) & 32767); + v_length = (((v_table_entry >> 8) & 255) + 3); v_table_entry_n_bits = ((v_table_entry >> 4) & 15); if (v_table_entry_n_bits > 0) { while (v_n_bits < v_table_entry_n_bits) { @@ -6591,14 +6757,17 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_2 = *iop_a_src++; - v_bits |= (((uint32_t)(t_2)) << v_n_bits); + uint32_t t_2 = *iop_a_src++; + v_b2 = t_2; } + v_bits |= (v_b2 << v_n_bits); v_n_bits += 8; } - v_length = - ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & - 32767); + v_length = (((v_length + 253 + + ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32( + v_table_entry_n_bits))) & + 255) + + 3); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; } @@ -6616,9 +6785,10 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_3 = *iop_a_src++; - v_bits |= (((uint32_t)(t_3)) << v_n_bits); + uint32_t t_3 = *iop_a_src++; + v_b3 = t_3; } + v_bits |= (v_b3 << v_n_bits); v_n_bits += 8; } label_3_break:; @@ -6646,9 +6816,10 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_4 = *iop_a_src++; - v_bits |= (((uint32_t)(t_4)) << v_n_bits); + uint32_t t_4 = *iop_a_src++; + v_b4 = t_4; } + v_bits |= (v_b4 << v_n_bits); v_n_bits += 8; } label_4_break:; @@ -6672,14 +6843,16 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_5 = *iop_a_src++; - v_bits |= (((uint32_t)(t_5)) << v_n_bits); + uint32_t t_5 = *iop_a_src++; + v_b5 = t_5; } + v_bits |= (v_b5 << v_n_bits); v_n_bits += 8; } - v_dist_minus_1 = ((v_dist_minus_1 + - ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & - 32767); + v_dist_minus_1 = + ((v_dist_minus_1 + + ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & + 32767); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; } @@ -6804,7 +6977,6 @@ suspend: self->private_impl.c_decode_huffman_slow[0].v_redir_mask = v_redir_mask; self->private_impl.c_decode_huffman_slow[0].v_length = v_length; self->private_impl.c_decode_huffman_slow[0].v_dist_minus_1 = v_dist_minus_1; - self->private_impl.c_decode_huffman_slow[0].v_n_copied = v_n_copied; self->private_impl.c_decode_huffman_slow[0].v_hlen = v_hlen; self->private_impl.c_decode_huffman_slow[0].v_hdist = v_hdist; @@ -6825,6 +6997,449 @@ exit: #endif // !defined(WUFFS_CONFIG__MODULES) || // defined(WUFFS_CONFIG__MODULE__DEFLATE) +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) + +// ---------------- Status Codes Implementations + +const char* wuffs_lzw__error__bad_code = "?lzw: bad code"; +const char* wuffs_lzw__error__internal_error_inconsistent_i_o = + "?lzw: internal error: inconsistent I/O"; + +// ---------------- Private Consts + +// ---------------- Private Initializer Prototypes + +// ---------------- Private Function Prototypes + +static wuffs_base__status // +wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self, + wuffs_base__io_writer a_dst); + +// ---------------- Initializer Implementations + +wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // +wuffs_lzw__decoder__check_wuffs_version(wuffs_lzw__decoder* self, + size_t sizeof_star_self, + uint64_t wuffs_version) { + if (!self) { + return wuffs_base__error__bad_receiver; + } + if (sizeof(*self) != sizeof_star_self) { + return wuffs_base__error__bad_sizeof_receiver; + } + if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || + (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) { + return wuffs_base__error__bad_wuffs_version; + } + if (self->private_impl.magic != 0) { + return wuffs_base__error__check_wuffs_version_not_applicable; + } + self->private_impl.magic = WUFFS_BASE__MAGIC; + return NULL; +} + +size_t // +sizeof__wuffs_lzw__decoder() { + return sizeof((wuffs_lzw__decoder){}); +} + +// ---------------- Function Implementations + +// -------- func lzw.decoder.set_literal_width + +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // +wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { + if (!self) { + return ((wuffs_base__empty_struct){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return ((wuffs_base__empty_struct){}); + } + if (a_lw < 2 || a_lw > 8) { + self->private_impl.magic = WUFFS_BASE__DISABLED; + return ((wuffs_base__empty_struct){}); + } + + self->private_impl.f_literal_width = a_lw; + return ((wuffs_base__empty_struct){}); +} + +// -------- func lzw.decoder.decode + +WUFFS_BASE__MAYBE_STATIC wuffs_base__status // +wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, + wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src) { + if (!self) { + return wuffs_base__error__bad_receiver; + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return (self->private_impl.magic == WUFFS_BASE__DISABLED) + ? wuffs_base__error__disabled_by_previous_error + : wuffs_base__error__check_wuffs_version_missing; + } + wuffs_base__status status = NULL; + + uint32_t v_literal_width; + uint32_t v_clear_code; + uint32_t v_end_code; + uint32_t v_save_code; + uint32_t v_prev_code; + uint32_t v_width; + uint32_t v_j; + uint32_t v_bits; + uint32_t v_n_bits; + uint32_t v_code; + uint32_t v_c; + uint32_t v_o; + uint32_t v_steps; + uint8_t v_first_byte; + uint16_t v_lm1_b; + uint16_t v_lm1_a; + + uint8_t* iop_a_src = NULL; + uint8_t* io0_a_src = NULL; + uint8_t* io1_a_src = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); + if (a_src.private_impl.buf) { + iop_a_src = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; + if (!a_src.private_impl.mark) { + a_src.private_impl.mark = iop_a_src; + a_src.private_impl.limit = + a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; + } + io0_a_src = a_src.private_impl.mark; + io1_a_src = a_src.private_impl.limit; + } + + uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; + if (coro_susp_point) { + v_literal_width = self->private_impl.c_decode[0].v_literal_width; + v_clear_code = self->private_impl.c_decode[0].v_clear_code; + v_end_code = self->private_impl.c_decode[0].v_end_code; + v_save_code = self->private_impl.c_decode[0].v_save_code; + v_prev_code = self->private_impl.c_decode[0].v_prev_code; + v_width = self->private_impl.c_decode[0].v_width; + v_j = self->private_impl.c_decode[0].v_j; + v_bits = self->private_impl.c_decode[0].v_bits; + v_n_bits = self->private_impl.c_decode[0].v_n_bits; + v_code = 0; + v_c = 0; + v_o = 0; + v_steps = 0; + v_first_byte = 0; + v_lm1_b = 0; + v_lm1_a = 0; + } else { + } + switch (coro_susp_point) { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; + + v_literal_width = 8; + if (self->private_impl.f_literal_width >= 2) { + v_literal_width = self->private_impl.f_literal_width; + } + v_clear_code = (((uint32_t)(1)) << v_literal_width); + v_end_code = (v_clear_code + 1); + v_save_code = v_end_code; + v_prev_code = v_end_code; + v_width = (v_literal_width + 1); + v_j = 0; + while (v_j < v_clear_code) { + self->private_impl.f_lm1s[v_j] = 0; + self->private_impl.f_suffixes[v_j][0] = ((uint8_t)(v_j)); + v_j += 1; + } + v_j = 0; + v_bits = 0; + v_n_bits = 0; + while (true) { + if (v_n_bits < v_width) { + if (((uint64_t)(io1_a_src - iop_a_src)) >= 4) { + v_bits |= + (((uint32_t)(wuffs_base__load_u32le(iop_a_src))) << v_n_bits); + (iop_a_src += ((31 - v_n_bits) >> 3), + wuffs_base__return_empty_struct()); + v_n_bits |= 24; + } else { + while (true) { + while (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + if (v_j > 0) { + self->private_impl.f_flush_j = v_j; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); + status = wuffs_lzw__decoder__flush(self, a_dst); + if (status) { + goto suspend; + } + v_j = 0; + } + status = wuffs_base__suspension__short_read; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); + } + v_bits |= + (((uint32_t)(wuffs_base__load_u8be(iop_a_src))) << v_n_bits); + (iop_a_src += 1, wuffs_base__return_empty_struct()); + v_n_bits += 8; + if (v_n_bits >= v_width) { + goto label_0_break; + } + } + label_0_break:; + } + } + v_code = ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_width)); + v_bits >>= v_width; + v_n_bits -= v_width; + if (v_code < v_clear_code) { + self->private_impl.f_output[v_j] = ((uint8_t)(v_code)); + v_j = ((v_j + 1) & 8191); + if (v_save_code <= 4095) { + v_lm1_a = ((self->private_impl.f_lm1s[v_prev_code] + 1) & 4095); + self->private_impl.f_lm1s[v_save_code] = v_lm1_a; + if ((v_lm1_a % 8) != 0) { + self->private_impl.f_prefixes[v_save_code] = + self->private_impl.f_prefixes[v_prev_code]; + memcpy(self->private_impl.f_suffixes[v_save_code], + self->private_impl.f_suffixes[v_prev_code], + sizeof(self->private_impl.f_suffixes[v_save_code])); + self->private_impl.f_suffixes[v_save_code][(v_lm1_a % 8)] = + ((uint8_t)(v_code)); + } else { + self->private_impl.f_prefixes[v_save_code] = + ((uint16_t)(v_prev_code)); + self->private_impl.f_suffixes[v_save_code][0] = ((uint8_t)(v_code)); + } + v_save_code += 1; + if ((v_save_code == (((uint32_t)(1)) << v_width)) && (v_width < 12)) { + v_width += 1; + } + v_prev_code = v_code; + } + } else if (v_code <= v_end_code) { + if (v_code == v_end_code) { + goto label_1_break; + } + v_save_code = v_end_code; + v_prev_code = v_end_code; + v_width = (v_literal_width + 1); + } else if (v_code <= v_save_code) { + v_c = v_code; + if (v_code == v_save_code) { + v_c = v_prev_code; + } + v_o = ((v_j + + (((uint32_t)(self->private_impl.f_lm1s[v_c])) & 4294967288)) & + 8191); + v_j = ((v_j + 1 + ((uint32_t)(self->private_impl.f_lm1s[v_c]))) & 8191); + v_steps = (((uint32_t)(self->private_impl.f_lm1s[v_c])) >> 3); + while (true) { + memcpy((self->private_impl.f_output) + (v_o), + (self->private_impl.f_suffixes[v_c]), 8); + if (v_steps <= 0) { + goto label_2_break; + } + v_steps -= 1; + v_o = ((v_o - 8) & 8191); + v_c = ((uint32_t)(self->private_impl.f_prefixes[v_c])); + } + label_2_break:; + v_first_byte = self->private_impl.f_suffixes[v_c][0]; + if (v_code == v_save_code) { + self->private_impl.f_output[v_j] = v_first_byte; + v_j = ((v_j + 1) & 8191); + } + if (v_save_code <= 4095) { + v_lm1_b = ((self->private_impl.f_lm1s[v_prev_code] + 1) & 4095); + self->private_impl.f_lm1s[v_save_code] = v_lm1_b; + if ((v_lm1_b % 8) != 0) { + self->private_impl.f_prefixes[v_save_code] = + self->private_impl.f_prefixes[v_prev_code]; + memcpy(self->private_impl.f_suffixes[v_save_code], + self->private_impl.f_suffixes[v_prev_code], + sizeof(self->private_impl.f_suffixes[v_save_code])); + self->private_impl.f_suffixes[v_save_code][(v_lm1_b % 8)] = + v_first_byte; + } else { + self->private_impl.f_prefixes[v_save_code] = + ((uint16_t)(v_prev_code)); + self->private_impl.f_suffixes[v_save_code][0] = + ((uint8_t)(v_first_byte)); + } + v_save_code += 1; + if ((v_save_code == (((uint32_t)(1)) << v_width)) && (v_width < 12)) { + v_width += 1; + } + v_prev_code = v_code; + } + } else { + status = wuffs_lzw__error__bad_code; + goto exit; + } + if (v_j > 4095) { + while (v_n_bits >= 8) { + v_n_bits -= 8; + if (iop_a_src > io0_a_src) { + (iop_a_src--, wuffs_base__return_empty_struct()); + } else { + status = wuffs_lzw__error__internal_error_inconsistent_i_o; + goto exit; + } + } + v_bits = ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_n_bits)); + self->private_impl.f_flush_j = v_j; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + status = wuffs_lzw__decoder__flush(self, a_dst); + if (status) { + goto suspend; + } + v_j = 0; + } + } + label_1_break:; + if (v_j > 0) { + while (v_n_bits >= 8) { + v_n_bits -= 8; + if (iop_a_src > io0_a_src) { + (iop_a_src--, wuffs_base__return_empty_struct()); + } else { + status = wuffs_lzw__error__internal_error_inconsistent_i_o; + goto exit; + } + } + v_bits = ((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_n_bits)); + self->private_impl.f_flush_j = v_j; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + status = wuffs_lzw__decoder__flush(self, a_dst); + if (status) { + goto suspend; + } + } + + goto ok; + ok: + self->private_impl.c_decode[0].coro_susp_point = 0; + goto exit; + } + + goto suspend; +suspend: + self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; + self->private_impl.c_decode[0].v_literal_width = v_literal_width; + self->private_impl.c_decode[0].v_clear_code = v_clear_code; + self->private_impl.c_decode[0].v_end_code = v_end_code; + self->private_impl.c_decode[0].v_save_code = v_save_code; + self->private_impl.c_decode[0].v_prev_code = v_prev_code; + self->private_impl.c_decode[0].v_width = v_width; + self->private_impl.c_decode[0].v_j = v_j; + self->private_impl.c_decode[0].v_bits = v_bits; + self->private_impl.c_decode[0].v_n_bits = v_n_bits; + + goto exit; +exit: + if (a_src.private_impl.buf) { + a_src.private_impl.buf->meta.ri = + iop_a_src - a_src.private_impl.buf->data.ptr; + } + + if (wuffs_base__status__is_error(status)) { + self->private_impl.magic = WUFFS_BASE__DISABLED; + } + return status; +} + +// -------- func lzw.decoder.flush + +static wuffs_base__status // +wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self, + wuffs_base__io_writer a_dst) { + wuffs_base__status status = NULL; + + uint32_t v_i; + uint32_t v_j; + wuffs_base__slice_u8 v_s; + uint64_t v_n; + + uint8_t* iop_a_dst = NULL; + uint8_t* io0_a_dst = NULL; + uint8_t* io1_a_dst = NULL; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); + if (a_dst.private_impl.buf) { + iop_a_dst = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; + if (!a_dst.private_impl.mark) { + a_dst.private_impl.mark = iop_a_dst; + a_dst.private_impl.limit = + a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; + } + if (a_dst.private_impl.buf->meta.closed) { + a_dst.private_impl.limit = iop_a_dst; + } + io0_a_dst = a_dst.private_impl.mark; + io1_a_dst = a_dst.private_impl.limit; + } + + uint32_t coro_susp_point = self->private_impl.c_flush[0].coro_susp_point; + if (coro_susp_point) { + v_i = self->private_impl.c_flush[0].v_i; + v_j = self->private_impl.c_flush[0].v_j; + v_s = ((wuffs_base__slice_u8){}); + v_n = 0; + } else { + v_s = ((wuffs_base__slice_u8){}); + } + switch (coro_susp_point) { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; + + v_i = 0; + v_j = self->private_impl.f_flush_j; + while (true) { + if (v_i > v_j) { + status = wuffs_lzw__error__internal_error_inconsistent_i_o; + goto exit; + } + v_s = wuffs_base__slice_u8__subslice_ij( + ((wuffs_base__slice_u8){ + .ptr = self->private_impl.f_output, + .len = 8199, + }), + v_i, v_j); + v_n = wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io1_a_dst, v_s); + if (v_n == ((uint64_t)(v_s.len))) { + status = NULL; + goto ok; + } + v_i = ((v_i + ((uint32_t)((v_n & 8191)))) & 8191); + status = wuffs_base__suspension__short_write; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); + } + + goto ok; + ok: + self->private_impl.c_flush[0].coro_susp_point = 0; + goto exit; + } + + goto suspend; +suspend: + self->private_impl.c_flush[0].coro_susp_point = coro_susp_point; + self->private_impl.c_flush[0].v_i = v_i; + self->private_impl.c_flush[0].v_j = v_j; + + goto exit; +exit: + if (a_dst.private_impl.buf) { + a_dst.private_impl.buf->meta.wi = + iop_a_dst - a_dst.private_impl.buf->data.ptr; + } + + return status; +} + +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) + #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF) // ---------------- Status Codes Implementations @@ -6866,7 +7481,7 @@ static wuffs_base__status // wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, wuffs_base__io_reader a_src); -static void // +static wuffs_base__empty_struct // wuffs_gif__decoder__reset_gc(wuffs_gif__decoder* self); static wuffs_base__status // @@ -6969,7 +7584,7 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_image_config[0].coro_susp_point; if (coro_susp_point) { - v_ffio = self->private_impl.c_decode_image_config[0].v_ffio; + v_ffio = false; } else { v_ffio = false; } @@ -6980,6 +7595,9 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, status = wuffs_base__error__bad_call_sequence; goto exit; } + (memset(&self->private_impl.f_dirty_y, 0, + sizeof((wuffs_base__range_ie_u32){})), + wuffs_base__return_empty_struct()); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); status = wuffs_gif__decoder__decode_header(self, a_src); if (status) { @@ -7003,7 +7621,7 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, (self->private_impl.f_frame_rect_y1 == self->private_impl.f_height)); if (a_dst != NULL) { wuffs_base__image_config__initialize( - a_dst, 570687496, 0, self->private_impl.f_width, + a_dst, 1107558408, 0, self->private_impl.f_width, self->private_impl.f_height, ((uint64_t)(self->private_impl.f_width)), ((uint64_t)(self->private_impl.f_width)), self->private_impl.f_frame_config_io_position, v_ffio); @@ -7019,7 +7637,6 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_decode_image_config[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_image_config[0].v_ffio = v_ffio; goto exit; exit: @@ -7032,7 +7649,7 @@ exit: // -------- func gif.decoder.num_animation_loops WUFFS_BASE__MAYBE_STATIC uint32_t // -wuffs_gif__decoder__num_animation_loops(wuffs_gif__decoder* self) { +wuffs_gif__decoder__num_animation_loops(const wuffs_gif__decoder* self) { if (!self) { return 0; } @@ -7049,7 +7666,7 @@ wuffs_gif__decoder__num_animation_loops(wuffs_gif__decoder* self) { // -------- func gif.decoder.num_decoded_frame_configs WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self) { +wuffs_gif__decoder__num_decoded_frame_configs(const wuffs_gif__decoder* self) { if (!self) { return 0; } @@ -7063,7 +7680,7 @@ wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self) { // -------- func gif.decoder.num_decoded_frames WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self) { +wuffs_gif__decoder__num_decoded_frames(const wuffs_gif__decoder* self) { if (!self) { return 0; } @@ -7074,10 +7691,28 @@ wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self) { return self->private_impl.f_num_decoded_frames_value; } +// -------- func gif.decoder.frame_dirty_rect + +WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32 // +wuffs_gif__decoder__frame_dirty_rect(const wuffs_gif__decoder* self) { + if (!self) { + return ((wuffs_base__rect_ie_u32){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return ((wuffs_base__rect_ie_u32){}); + } + + return wuffs_base__utility__make_rect_ie_u32( + &self->private_impl.f_util, self->private_impl.f_frame_rect_x0, + wuffs_base__range_ie_u32__get_min_incl(&self->private_impl.f_dirty_y), + self->private_impl.f_frame_rect_x1, + wuffs_base__range_ie_u32__get_max_excl(&self->private_impl.f_dirty_y)); +} + // -------- func gif.decoder.workbuf_len WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // -wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self) { +wuffs_gif__decoder__workbuf_len(const wuffs_gif__decoder* self) { if (!self) { return ((wuffs_base__range_ii_u64){}); } @@ -7085,8 +7720,9 @@ wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self) { return ((wuffs_base__range_ii_u64){}); } - return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, 0, - 0); + return wuffs_base__utility__make_range_ii_u64( + &self->private_impl.f_util, ((uint64_t)(self->private_impl.f_width)), + ((uint64_t)(self->private_impl.f_width))); } // -------- func gif.decoder.restart_frame @@ -7144,7 +7780,7 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_frame_config[0].coro_susp_point; if (coro_susp_point) { - v_blend = self->private_impl.c_decode_frame_config[0].v_blend; + v_blend = 0; } else { } switch (coro_susp_point) { @@ -7211,7 +7847,6 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_decode_frame_config[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_frame_config[0].v_blend = v_blend; goto exit; exit: @@ -7229,7 +7864,6 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, wuffs_base__status status = NULL; uint8_t v_flags; - uint8_t v_lw; uint8_t* iop_a_src = NULL; uint8_t* io0_a_src = NULL; @@ -7250,8 +7884,7 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_skip_frame[0].coro_susp_point; if (coro_susp_point) { - v_flags = self->private_impl.c_skip_frame[0].v_flags; - v_lw = self->private_impl.c_skip_frame[0].v_lw; + v_flags = 0; } else { } switch (coro_susp_point) { @@ -7280,15 +7913,12 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, } iop_a_src += self->private_impl.c_skip_frame[0].scratch; } - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { - status = wuffs_base__suspension__short_read; - goto suspend; - } - uint8_t t_1 = *iop_a_src++; - v_lw = t_1; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + status = wuffs_base__suspension__short_read; + goto suspend; } + iop_a_src++; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = @@ -7315,8 +7945,6 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_skip_frame[0].coro_susp_point = coro_susp_point; - self->private_impl.c_skip_frame[0].v_flags = v_flags; - self->private_impl.c_skip_frame[0].v_lw = v_lw; goto exit; exit: @@ -7358,7 +7986,7 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - if (((uint64_t)(a_workbuf.len)) != + if (((uint64_t)(a_workbuf.len)) < ((uint64_t)(self->private_impl.f_width))) { status = wuffs_base__error__bad_workbuf_length; goto exit; @@ -7399,7 +8027,7 @@ exit: // -------- func gif.decoder.reset_gc -static void // +static wuffs_base__empty_struct // wuffs_gif__decoder__reset_gc(wuffs_gif__decoder* self) { self->private_impl.f_call_sequence = 3; self->private_impl.f_seen_graphic_control = false; @@ -7407,6 +8035,7 @@ wuffs_gif__decoder__reset_gc(wuffs_gif__decoder* self) { self->private_impl.f_gc_transparent_index = 0; self->private_impl.f_gc_disposal = 0; self->private_impl.f_gc_duration = 0; + return ((wuffs_base__empty_struct){}); } // -------- func gif.decoder.decode_up_to_id_part1 @@ -7438,7 +8067,7 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_up_to_id_part1[0].coro_susp_point; if (coro_susp_point) { - v_block_type = self->private_impl.c_decode_up_to_id_part1[0].v_block_type; + v_block_type = 0; } else { } switch (coro_susp_point) { @@ -7521,7 +8150,6 @@ wuffs_gif__decoder__decode_up_to_id_part1(wuffs_gif__decoder* self, suspend: self->private_impl.c_decode_up_to_id_part1[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_up_to_id_part1[0].v_block_type = v_block_type; goto exit; exit: @@ -7647,7 +8275,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, v_num_palette_entries = self->private_impl.c_decode_lsd[0].v_num_palette_entries; v_i = self->private_impl.c_decode_lsd[0].v_i; - v_argb = self->private_impl.c_decode_lsd[0].v_argb; + v_argb = 0; } else { } switch (coro_susp_point) { @@ -7655,9 +8283,9 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - uint16_t t_1; + uint32_t t_0; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_1 = wuffs_base__load_u16le(iop_a_src); + t_0 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_lsd[0].scratch = 0; @@ -7668,25 +8296,25 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_lsd[0].scratch; - uint32_t t_0 = *scratch >> 56; + uint32_t num_bits_0 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_0; - if (t_0 == 8) { - t_1 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0; + if (num_bits_0 == 8) { + t_0 = *scratch; break; } - t_0 += 8; - *scratch |= ((uint64_t)(t_0)) << 56; + num_bits_0 += 8; + *scratch |= ((uint64_t)(num_bits_0)) << 56; } } - self->private_impl.f_width = ((uint32_t)(t_1)); + self->private_impl.f_width = t_0; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - uint16_t t_3; + uint32_t t_1; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_3 = wuffs_base__load_u16le(iop_a_src); + t_1 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_lsd[0].scratch = 0; @@ -7697,19 +8325,19 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_lsd[0].scratch; - uint32_t t_2 = *scratch >> 56; + uint32_t num_bits_1 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_2; - if (t_2 == 8) { - t_3 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1; + if (num_bits_1 == 8) { + t_1 = *scratch; break; } - t_2 += 8; - *scratch |= ((uint64_t)(t_2)) << 56; + num_bits_1 += 8; + *scratch |= ((uint64_t)(num_bits_1)) << 56; } } - self->private_impl.f_height = ((uint32_t)(t_3)); + self->private_impl.f_height = t_1; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); @@ -7717,8 +8345,8 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_4 = *iop_a_src++; - v_flags = t_4; + uint8_t t_2 = *iop_a_src++; + v_flags = t_2; } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); self->private_impl.c_decode_lsd[0].scratch = 2; @@ -7737,9 +8365,9 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, while (v_i < v_num_palette_entries) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); - uint32_t t_6; + uint32_t t_3; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 3)) { - t_6 = wuffs_base__load_u24be(iop_a_src); + t_3 = wuffs_base__load_u24be(iop_a_src); iop_a_src += 3; } else { self->private_impl.c_decode_lsd[0].scratch = 0; @@ -7750,20 +8378,21 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_lsd[0].scratch; - uint32_t t_5 = *scratch & 0xFF; + uint32_t num_bits_3 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - t_5); - if (t_5 == 16) { - t_6 = *scratch >> (64 - 24); + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3); + if (num_bits_3 == 16) { + t_3 = *scratch >> (64 - 24); break; } - t_5 += 8; - *scratch |= ((uint64_t)(t_5)); + num_bits_3 += 8; + *scratch |= ((uint64_t)(num_bits_3)); } } - v_argb = (t_6 | 4278190080); + v_argb = t_3; } + v_argb |= 4278190080; self->private_impl.f_palettes[0][((4 * v_i) + 0)] = ((uint8_t)(((v_argb >> 0) & 255))); self->private_impl.f_palettes[0][((4 * v_i) + 1)] = @@ -7796,7 +8425,6 @@ suspend: self->private_impl.c_decode_lsd[0].v_num_palette_entries = v_num_palette_entries; self->private_impl.c_decode_lsd[0].v_i = v_i; - self->private_impl.c_decode_lsd[0].v_argb = v_argb; goto exit; exit: @@ -7837,7 +8465,7 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_extension[0].coro_susp_point; if (coro_susp_point) { - v_label = self->private_impl.c_decode_extension[0].v_label; + v_label = 0; } else { } switch (coro_susp_point) { @@ -7908,7 +8536,6 @@ wuffs_gif__decoder__decode_extension(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_decode_extension[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_extension[0].v_label = v_label; goto exit; exit: @@ -7949,7 +8576,7 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_skip_blocks[0].coro_susp_point; if (coro_susp_point) { - v_block_size = self->private_impl.c_skip_blocks[0].v_block_size; + v_block_size = 0; } else { } switch (coro_susp_point) { @@ -7991,7 +8618,6 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_skip_blocks[0].coro_susp_point = coro_susp_point; - self->private_impl.c_skip_blocks[0].v_block_size = v_block_size; goto exit; exit: @@ -8034,7 +8660,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_ae[0].coro_susp_point; if (coro_susp_point) { - v_c = self->private_impl.c_decode_ae[0].v_c; + v_c = 0; v_block_size = self->private_impl.c_decode_ae[0].v_block_size; v_not_animexts = self->private_impl.c_decode_ae[0].v_not_animexts; v_not_netscape = self->private_impl.c_decode_ae[0].v_not_netscape; @@ -8144,9 +8770,9 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); - uint16_t t_5; + uint32_t t_4; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_5 = wuffs_base__load_u16le(iop_a_src); + t_4 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_ae[0].scratch = 0; @@ -8157,19 +8783,19 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_ae[0].scratch; - uint32_t t_4 = *scratch >> 56; + uint32_t num_bits_4 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_4; - if (t_4 == 8) { - t_5 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4; + if (num_bits_4 == 8) { + t_4 = *scratch; break; } - t_4 += 8; - *scratch |= ((uint64_t)(t_4)) << 56; + num_bits_4 += 8; + *scratch |= ((uint64_t)(num_bits_4)) << 56; } } - self->private_impl.f_num_loops = ((uint32_t)(t_5)); + self->private_impl.f_num_loops = t_4; } self->private_impl.f_seen_num_loops = true; if ((0 < self->private_impl.f_num_loops) && @@ -8202,7 +8828,6 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_decode_ae[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_ae[0].v_c = v_c; self->private_impl.c_decode_ae[0].v_block_size = v_block_size; self->private_impl.c_decode_ae[0].v_not_animexts = v_not_animexts; self->private_impl.c_decode_ae[0].v_not_netscape = v_not_netscape; @@ -8226,6 +8851,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, uint8_t v_c; uint8_t v_flags; + uint16_t v_gc_duration_centiseconds; uint8_t* iop_a_src = NULL; uint8_t* io0_a_src = NULL; @@ -8246,8 +8872,9 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_gc[0].coro_susp_point; if (coro_susp_point) { - v_c = self->private_impl.c_decode_gc[0].v_c; - v_flags = self->private_impl.c_decode_gc[0].v_flags; + v_c = 0; + v_flags = 0; + v_gc_duration_centiseconds = 0; } else { } switch (coro_susp_point) { @@ -8290,9 +8917,9 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - uint16_t t_3; + uint16_t t_2; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_3 = wuffs_base__load_u16le(iop_a_src); + t_2 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_gc[0].scratch = 0; @@ -8303,28 +8930,30 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_gc[0].scratch; - uint32_t t_2 = *scratch >> 56; + uint32_t num_bits_2 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_2; - if (t_2 == 8) { - t_3 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2; + if (num_bits_2 == 8) { + t_2 = *scratch; break; } - t_2 += 8; - *scratch |= ((uint64_t)(t_2)) << 56; + num_bits_2 += 8; + *scratch |= ((uint64_t)(num_bits_2)) << 56; } } - self->private_impl.f_gc_duration = (((uint64_t)(t_3)) * 7056000); + v_gc_duration_centiseconds = t_2; } + self->private_impl.f_gc_duration = + (((uint64_t)(v_gc_duration_centiseconds)) * 7056000); { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_4 = *iop_a_src++; - self->private_impl.f_gc_transparent_index = t_4; + uint8_t t_3 = *iop_a_src++; + self->private_impl.f_gc_transparent_index = t_3; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); @@ -8332,8 +8961,8 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_5 = *iop_a_src++; - v_c = t_5; + uint8_t t_4 = *iop_a_src++; + v_c = t_4; } if (v_c != 0) { status = wuffs_gif__error__bad_graphic_control; @@ -8350,8 +8979,6 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.c_decode_gc[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_gc[0].v_c = v_c; - self->private_impl.c_decode_gc[0].v_flags = v_flags; goto exit; exit: @@ -8397,9 +9024,9 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - uint16_t t_1; + uint32_t t_0; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_1 = wuffs_base__load_u16le(iop_a_src); + t_0 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -8410,25 +9037,25 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_id_part0[0].scratch; - uint32_t t_0 = *scratch >> 56; + uint32_t num_bits_0 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_0; - if (t_0 == 8) { - t_1 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0; + if (num_bits_0 == 8) { + t_0 = *scratch; break; } - t_0 += 8; - *scratch |= ((uint64_t)(t_0)) << 56; + num_bits_0 += 8; + *scratch |= ((uint64_t)(num_bits_0)) << 56; } } - self->private_impl.f_frame_rect_x0 = ((uint32_t)(t_1)); + self->private_impl.f_frame_rect_x0 = t_0; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - uint16_t t_3; + uint32_t t_1; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_3 = wuffs_base__load_u16le(iop_a_src); + t_1 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -8439,25 +9066,25 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_id_part0[0].scratch; - uint32_t t_2 = *scratch >> 56; + uint32_t num_bits_1 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_2; - if (t_2 == 8) { - t_3 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1; + if (num_bits_1 == 8) { + t_1 = *scratch; break; } - t_2 += 8; - *scratch |= ((uint64_t)(t_2)) << 56; + num_bits_1 += 8; + *scratch |= ((uint64_t)(num_bits_1)) << 56; } } - self->private_impl.f_frame_rect_y0 = ((uint32_t)(t_3)); + self->private_impl.f_frame_rect_y0 = t_1; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - uint16_t t_5; + uint32_t t_2; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_5 = wuffs_base__load_u16le(iop_a_src); + t_2 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -8468,26 +9095,26 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_id_part0[0].scratch; - uint32_t t_4 = *scratch >> 56; + uint32_t num_bits_2 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_4; - if (t_4 == 8) { - t_5 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2; + if (num_bits_2 == 8) { + t_2 = *scratch; break; } - t_4 += 8; - *scratch |= ((uint64_t)(t_4)) << 56; + num_bits_2 += 8; + *scratch |= ((uint64_t)(num_bits_2)) << 56; } } - self->private_impl.f_frame_rect_x1 = - (self->private_impl.f_frame_rect_x0 + ((uint32_t)(t_5))); + self->private_impl.f_frame_rect_x1 = t_2; } + self->private_impl.f_frame_rect_x1 += self->private_impl.f_frame_rect_x0; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - uint16_t t_7; + uint32_t t_3; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_7 = wuffs_base__load_u16le(iop_a_src); + t_3 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -8498,21 +9125,21 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode_id_part0[0].scratch; - uint32_t t_6 = *scratch >> 56; + uint32_t num_bits_3 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_6; - if (t_6 == 8) { - t_7 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3; + if (num_bits_3 == 8) { + t_3 = *scratch; break; } - t_6 += 8; - *scratch |= ((uint64_t)(t_6)) << 56; + num_bits_3 += 8; + *scratch |= ((uint64_t)(num_bits_3)) << 56; } } - self->private_impl.f_frame_rect_y1 = - (self->private_impl.f_frame_rect_y0 + ((uint32_t)(t_7))); + self->private_impl.f_frame_rect_y1 = t_3; } + self->private_impl.f_frame_rect_y1 += self->private_impl.f_frame_rect_y0; self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0; self->private_impl.f_dst_y = self->private_impl.f_frame_rect_y0; if (self->private_impl.f_call_sequence == 0) { @@ -8554,6 +9181,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint32_t v_num_palette_entries; uint32_t v_i; uint32_t v_argb; + wuffs_base__slice_u8 v_dst_palette; uint8_t v_lw; uint64_t v_block_size; wuffs_base__io_writer v_w; @@ -8585,16 +9213,18 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint32_t coro_susp_point = 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_flags = 0; 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_argb = self->private_impl.c_decode_id_part1[0].v_argb; - v_lw = self->private_impl.c_decode_id_part1[0].v_lw; + v_argb = 0; + v_dst_palette = ((wuffs_base__slice_u8){}); + v_lw = 0; v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; v_w = ((wuffs_base__io_writer){}); - v_z = self->private_impl.c_decode_id_part1[0].v_z; + v_z = NULL; } else { + v_dst_palette = ((wuffs_base__slice_u8){}); v_w = ((wuffs_base__io_writer){}); } switch (coro_susp_point) { @@ -8621,9 +9251,9 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, while (v_i < v_num_palette_entries) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - uint32_t t_2; + uint32_t t_1; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 3)) { - t_2 = wuffs_base__load_u24be(iop_a_src); + t_1 = wuffs_base__load_u24be(iop_a_src); iop_a_src += 3; } else { self->private_impl.c_decode_id_part1[0].scratch = 0; @@ -8635,20 +9265,21 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } uint64_t* scratch = &self->private_impl.c_decode_id_part1[0].scratch; - uint32_t t_1 = *scratch & 0xFF; + uint32_t num_bits_1 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - t_1); - if (t_1 == 16) { - t_2 = *scratch >> (64 - 24); + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1); + if (num_bits_1 == 16) { + t_1 = *scratch >> (64 - 24); break; } - t_1 += 8; - *scratch |= ((uint64_t)(t_1)); + num_bits_1 += 8; + *scratch |= ((uint64_t)(num_bits_1)); } } - v_argb = (t_2 | 4278190080); + v_argb = t_1; } + v_argb |= 4278190080; self->private_impl.f_palettes[1][((4 * v_i) + 0)] = ((uint8_t)(((v_argb >> 0) & 255))); self->private_impl.f_palettes[1][((4 * v_i) + 1)] = @@ -8693,8 +9324,17 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, (4 * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 3)] = 0; } - wuffs_base__slice_u8__copy_from_slice( - wuffs_base__pixel_buffer__palette(a_dst), + v_dst_palette = wuffs_base__pixel_buffer__palette(a_dst); + if (((uint64_t)(v_dst_palette.len)) == 0) { + v_dst_palette = ((wuffs_base__slice_u8){ + .ptr = self->private_impl.f_dst_palette, + .len = 1024, + }); + } + wuffs_base__pixel_swizzler__initialize( + &self->private_impl.f_swizzler, + wuffs_base__pixel_buffer__pixel_format(a_dst), v_dst_palette, + 1107558408, ((wuffs_base__slice_u8){ .ptr = self->private_impl .f_palettes[self->private_impl.f_which_palette], @@ -8714,8 +9354,8 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_3 = *iop_a_src++; - v_lw = t_3; + uint8_t t_2 = *iop_a_src++; + v_lw = t_2; } if ((v_lw < 2) || (8 < v_lw)) { status = wuffs_gif__error__bad_literal_width; @@ -8725,14 +9365,23 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, ((uint32_t)(v_lw))); self->private_impl.f_previous_lzw_decode_ended_abruptly = true; while (true) { + if (((uint64_t)(io1_a_src - iop_a_src)) == 0) { + if (self->private_impl.f_uncompressed_ri != + self->private_impl.f_uncompressed_wi) { + status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); + if (status) { + goto exit; + } + } + } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_4 = *iop_a_src++; - v_block_size = ((uint64_t)(t_4)); + uint64_t t_3 = *iop_a_src++; + v_block_size = t_3; } if (v_block_size == 0) { goto label_0_break; @@ -8762,14 +9411,14 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; } - wuffs_base__status t_5 = wuffs_lzw__decoder__decode( + wuffs_base__status t_4 = wuffs_lzw__decoder__decode( &self->private_impl.f_lzw, v_w, a_src); iop_v_w = u_w.data.ptr + u_w.meta.wi; if (a_src.private_impl.buf) { iop_a_src = a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } - v_z = t_5; + v_z = t_4; } self->private_impl.f_uncompressed_wi = (4096 - ((uint32_t)(wuffs_base__u64__min( @@ -8787,35 +9436,35 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, io1_v_w = o_0_io1_v_w; a_src = o_0_a_src; } - if (wuffs_base__status__is_ok(v_z) || - (v_z == wuffs_base__suspension__short_write)) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); - status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); - if (status) { - goto suspend; - } - if (v_z == wuffs_base__suspension__short_write) { - goto label_1_continue; - } - self->private_impl.f_previous_lzw_decode_ended_abruptly = false; - goto label_1_break; - } if ((v_block_size == 0) && (v_z == wuffs_base__suspension__short_read)) { goto label_1_break; } + if (self->private_impl.f_uncompressed_ri != + self->private_impl.f_uncompressed_wi) { + status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); + if (status) { + goto exit; + } + } + if (wuffs_base__status__is_ok(v_z)) { + self->private_impl.f_previous_lzw_decode_ended_abruptly = false; + goto label_1_break; + } + if (v_z == wuffs_base__suspension__short_write) { + goto label_1_continue; + } status = v_z; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); } label_1_break:; } label_0_break:; if (self->private_impl.f_uncompressed_ri != self->private_impl.f_uncompressed_wi) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst); if (status) { - goto suspend; + goto exit; } } @@ -8828,14 +9477,10 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto suspend; 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_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_argb = v_argb; - 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; - self->private_impl.c_decode_id_part1[0].v_z = v_z; goto exit; exit: @@ -8858,12 +9503,22 @@ wuffs_gif__decoder__copy_to_image_buffer(wuffs_gif__decoder* self, wuffs_base__slice_u8 v_src; uint32_t v_n; uint32_t v_new_ri; + uint32_t v_bytes_per_pixel; + uint32_t v_pixfmt; wuffs_base__table_u8 v_tab; + uint64_t v_i; + uint64_t v_j; + uint64_t v_n64; v_dst = ((wuffs_base__slice_u8){}); v_src = ((wuffs_base__slice_u8){}); v_n = 0; v_new_ri = 0; + v_bytes_per_pixel = 1; + v_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_pb); + if ((v_pixfmt == 1107331208) || (v_pixfmt == 1375766664)) { + v_bytes_per_pixel = 4; + } v_tab = wuffs_base__pixel_buffer__plane(a_pb, 0); label_0_continue:; while (self->private_impl.f_uncompressed_wi > @@ -8880,25 +9535,34 @@ label_0_continue:; goto exit; } v_dst = wuffs_base__table_u8__row(v_tab, self->private_impl.f_dst_y); - if (((uint64_t)(self->private_impl.f_dst_x)) < ((uint64_t)(v_dst.len))) { - if ((((uint64_t)(self->private_impl.f_dst_x)) <= - ((uint64_t)(self->private_impl.f_frame_rect_x1))) && - (((uint64_t)(self->private_impl.f_frame_rect_x1)) <= - ((uint64_t)(v_dst.len)))) { - v_dst = wuffs_base__slice_u8__subslice_ij( - v_dst, ((uint64_t)(self->private_impl.f_dst_x)), - ((uint64_t)(self->private_impl.f_frame_rect_x1))); + v_i = (((uint64_t)(self->private_impl.f_dst_x)) * + ((uint64_t)(v_bytes_per_pixel))); + if (v_i < ((uint64_t)(v_dst.len))) { + v_j = (((uint64_t)(self->private_impl.f_frame_rect_x1)) * + ((uint64_t)(v_bytes_per_pixel))); + if ((v_i <= v_j) && (v_j <= ((uint64_t)(v_dst.len)))) { + v_dst = wuffs_base__slice_u8__subslice_ij(v_dst, v_i, v_j); } else { - v_dst = wuffs_base__slice_u8__subslice_i( - v_dst, ((uint64_t)(self->private_impl.f_dst_x))); + v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_i); } - v_n = ((uint32_t)( - (wuffs_base__slice_u8__copy_from_slice(v_dst, v_src) & 4294967295))); + v_n64 = wuffs_base__pixel_swizzler__swizzle_packed( + &self->private_impl.f_swizzler, v_dst, + ((wuffs_base__slice_u8){ + .ptr = self->private_impl.f_dst_palette, + .len = 1024, + }), + v_src); + v_n = ((uint32_t)((v_n64 & 4294967295))); v_new_ri = wuffs_base__u32__sat_add(self->private_impl.f_uncompressed_ri, v_n); self->private_impl.f_uncompressed_ri = wuffs_base__u32__min(v_new_ri, 4096); wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, v_n); + self->private_impl.f_dirty_y = wuffs_base__range_ie_u32__unite( + &self->private_impl.f_dirty_y, + wuffs_base__utility__make_range_ie_u32( + &self->private_impl.f_util, self->private_impl.f_dst_y, + wuffs_base__u32__sat_add(self->private_impl.f_dst_y, 1))); } if (self->private_impl.f_frame_rect_x1 <= self->private_impl.f_dst_x) { self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0; @@ -9028,16 +9692,17 @@ sizeof__wuffs_gzip__decoder() { // -------- func gzip.decoder.set_ignore_checksum -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic) { if (!self) { - return; + return ((wuffs_base__empty_struct){}); } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return; + return ((wuffs_base__empty_struct){}); } self->private_impl.f_ignore_checksum = a_ic; + return ((wuffs_base__empty_struct){}); } // -------- func gzip.decoder.decode @@ -9103,15 +9768,14 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; if (coro_susp_point) { - v_c = self->private_impl.c_decode[0].v_c; + v_c = 0; v_flags = self->private_impl.c_decode[0].v_flags; - v_xlen = self->private_impl.c_decode[0].v_xlen; + v_xlen = 0; v_checksum_got = self->private_impl.c_decode[0].v_checksum_got; v_decoded_length_got = self->private_impl.c_decode[0].v_decoded_length_got; - v_z = self->private_impl.c_decode[0].v_z; + v_z = NULL; v_checksum_want = self->private_impl.c_decode[0].v_checksum_want; - v_decoded_length_want = - self->private_impl.c_decode[0].v_decoded_length_want; + v_decoded_length_want = 0; } else { } switch (coro_susp_point) { @@ -9179,9 +9843,9 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, if ((v_flags & 4) != 0) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - uint16_t t_5; + uint16_t t_4; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_5 = wuffs_base__load_u16le(iop_a_src); + t_4 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode[0].scratch = 0; @@ -9192,19 +9856,19 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode[0].scratch; - uint32_t t_4 = *scratch >> 56; + uint32_t num_bits_4 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_4; - if (t_4 == 8) { - t_5 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4; + if (num_bits_4 == 8) { + t_4 = *scratch; break; } - t_4 += 8; - *scratch |= ((uint64_t)(t_4)) << 56; + num_bits_4 += 8; + *scratch |= ((uint64_t)(num_bits_4)) << 56; } } - v_xlen = t_5; + v_xlen = t_4; } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); self->private_impl.c_decode[0].scratch = ((uint32_t)(v_xlen)); @@ -9226,8 +9890,8 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_6 = *iop_a_src++; - v_c = t_6; + uint8_t t_5 = *iop_a_src++; + v_c = t_5; } if (v_c == 0) { goto label_0_break; @@ -9243,8 +9907,8 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, status = wuffs_base__suspension__short_read; goto suspend; } - uint8_t t_7 = *iop_a_src++; - v_c = t_7; + uint8_t t_6 = *iop_a_src++; + v_c = t_6; } if (v_c == 0) { goto label_1_break; @@ -9282,7 +9946,7 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; } - wuffs_base__status t_8 = wuffs_deflate__decoder__decode( + wuffs_base__status t_7 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.private_impl.buf) { iop_a_dst = a_dst.private_impl.buf->data.ptr + @@ -9292,7 +9956,7 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, iop_a_src = a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } - v_z = t_8; + v_z = t_7; } if (!self->private_impl.f_ignore_checksum) { v_checksum_got = wuffs_crc32__ieee_hasher__update( @@ -9319,9 +9983,9 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, label_2_break:; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); - uint32_t t_10; + uint32_t t_8; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { - t_10 = wuffs_base__load_u32le(iop_a_src); + t_8 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { self->private_impl.c_decode[0].scratch = 0; @@ -9332,25 +9996,25 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode[0].scratch; - uint32_t t_9 = *scratch >> 56; + uint32_t num_bits_8 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_9; - if (t_9 == 24) { - t_10 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_8; + if (num_bits_8 == 24) { + t_8 = *scratch; break; } - t_9 += 8; - *scratch |= ((uint64_t)(t_9)) << 56; + num_bits_8 += 8; + *scratch |= ((uint64_t)(num_bits_8)) << 56; } } - v_checksum_want = t_10; + v_checksum_want = t_8; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(18); - uint32_t t_12; + uint32_t t_9; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { - t_12 = wuffs_base__load_u32le(iop_a_src); + t_9 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { self->private_impl.c_decode[0].scratch = 0; @@ -9361,19 +10025,19 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode[0].scratch; - uint32_t t_11 = *scratch >> 56; + uint32_t num_bits_9 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << t_11; - if (t_11 == 24) { - t_12 = *scratch; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_9; + if (num_bits_9 == 24) { + t_9 = *scratch; break; } - t_11 += 8; - *scratch |= ((uint64_t)(t_11)) << 56; + num_bits_9 += 8; + *scratch |= ((uint64_t)(num_bits_9)) << 56; } } - v_decoded_length_want = t_12; + v_decoded_length_want = t_9; } if (!self->private_impl.f_ignore_checksum && ((v_checksum_got != v_checksum_want) || @@ -9391,14 +10055,10 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, goto suspend; suspend: self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode[0].v_c = v_c; self->private_impl.c_decode[0].v_flags = v_flags; - self->private_impl.c_decode[0].v_xlen = v_xlen; self->private_impl.c_decode[0].v_checksum_got = v_checksum_got; self->private_impl.c_decode[0].v_decoded_length_got = v_decoded_length_got; - self->private_impl.c_decode[0].v_z = v_z; self->private_impl.c_decode[0].v_checksum_want = v_checksum_want; - self->private_impl.c_decode[0].v_decoded_length_want = v_decoded_length_want; goto exit; exit: @@ -9420,454 +10080,6 @@ exit: #endif // !defined(WUFFS_CONFIG__MODULES) || // defined(WUFFS_CONFIG__MODULE__GZIP) -#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) - -// ---------------- Status Codes Implementations - -const char* wuffs_lzw__error__bad_code = "?lzw: bad code"; -const char* wuffs_lzw__error__internal_error_inconsistent_i_o = - "?lzw: internal error: inconsistent I/O"; - -// ---------------- Private Consts - -// ---------------- Private Initializer Prototypes - -// ---------------- Private Function Prototypes - -static wuffs_base__status // -wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self, - wuffs_base__io_writer a_dst); - -// ---------------- Initializer Implementations - -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_lzw__decoder__check_wuffs_version(wuffs_lzw__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - if (!self) { - return wuffs_base__error__bad_receiver; - } - if (sizeof(*self) != sizeof_star_self) { - return wuffs_base__error__bad_sizeof_receiver; - } - if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || - (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) { - return wuffs_base__error__bad_wuffs_version; - } - if (self->private_impl.magic != 0) { - return wuffs_base__error__check_wuffs_version_not_applicable; - } - self->private_impl.magic = WUFFS_BASE__MAGIC; - return NULL; -} - -size_t // -sizeof__wuffs_lzw__decoder() { - return sizeof((wuffs_lzw__decoder){}); -} - -// ---------------- Function Implementations - -// -------- func lzw.decoder.set_literal_width - -WUFFS_BASE__MAYBE_STATIC void // -wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { - if (!self) { - return; - } - if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return; - } - if (a_lw < 2 || a_lw > 8) { - self->private_impl.magic = WUFFS_BASE__DISABLED; - return; - } - - self->private_impl.f_literal_width = a_lw; -} - -// -------- func lzw.decoder.decode - -WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, - wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { - if (!self) { - return wuffs_base__error__bad_receiver; - } - if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return (self->private_impl.magic == WUFFS_BASE__DISABLED) - ? wuffs_base__error__disabled_by_previous_error - : wuffs_base__error__check_wuffs_version_missing; - } - wuffs_base__status status = NULL; - - uint32_t v_literal_width; - uint32_t v_clear_code; - uint32_t v_end_code; - uint32_t v_save_code; - uint32_t v_prev_code; - uint32_t v_width; - uint32_t v_j; - uint32_t v_bits; - uint32_t v_n_bits; - uint32_t v_code; - uint16_t v_lm1_a; - uint32_t v_c; - uint32_t v_o; - uint32_t v_steps; - uint8_t v_first_byte; - uint16_t v_lm1_b; - - uint8_t* iop_a_src = NULL; - uint8_t* io0_a_src = NULL; - uint8_t* io1_a_src = NULL; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_src); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_src); - if (a_src.private_impl.buf) { - iop_a_src = - a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; - if (!a_src.private_impl.mark) { - a_src.private_impl.mark = iop_a_src; - a_src.private_impl.limit = - a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.wi; - } - io0_a_src = a_src.private_impl.mark; - io1_a_src = a_src.private_impl.limit; - } - - uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; - if (coro_susp_point) { - v_literal_width = self->private_impl.c_decode[0].v_literal_width; - v_clear_code = self->private_impl.c_decode[0].v_clear_code; - v_end_code = self->private_impl.c_decode[0].v_end_code; - v_save_code = self->private_impl.c_decode[0].v_save_code; - v_prev_code = self->private_impl.c_decode[0].v_prev_code; - v_width = self->private_impl.c_decode[0].v_width; - v_j = self->private_impl.c_decode[0].v_j; - v_bits = self->private_impl.c_decode[0].v_bits; - v_n_bits = self->private_impl.c_decode[0].v_n_bits; - v_code = self->private_impl.c_decode[0].v_code; - v_lm1_a = self->private_impl.c_decode[0].v_lm1_a; - v_c = self->private_impl.c_decode[0].v_c; - v_o = self->private_impl.c_decode[0].v_o; - v_steps = self->private_impl.c_decode[0].v_steps; - v_first_byte = self->private_impl.c_decode[0].v_first_byte; - v_lm1_b = self->private_impl.c_decode[0].v_lm1_b; - } else { - } - switch (coro_susp_point) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - - v_literal_width = 8; - if (self->private_impl.f_literal_width >= 2) { - v_literal_width = self->private_impl.f_literal_width; - } - v_clear_code = (((uint32_t)(1)) << v_literal_width); - v_end_code = (v_clear_code + 1); - v_save_code = v_end_code; - v_prev_code = v_end_code; - v_width = (v_literal_width + 1); - v_j = 0; - while (v_j < v_clear_code) { - self->private_impl.f_lm1s[v_j] = 0; - self->private_impl.f_suffixes[v_j][0] = ((uint8_t)(v_j)); - v_j += 1; - } - v_j = 0; - v_bits = 0; - v_n_bits = 0; - while (true) { - if (v_n_bits < v_width) { - if (((uint64_t)(io1_a_src - iop_a_src)) >= 4) { - v_bits |= - (((uint32_t)(wuffs_base__load_u32le(iop_a_src))) << v_n_bits); - (iop_a_src += ((31 - v_n_bits) >> 3), - wuffs_base__return_empty_struct()); - v_n_bits |= 24; - } else { - while (true) { - while (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { - if (v_j > 0) { - self->private_impl.f_flush_j = v_j; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - status = wuffs_lzw__decoder__flush(self, a_dst); - if (status) { - goto suspend; - } - v_j = 0; - } - status = wuffs_base__suspension__short_read; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); - } - v_bits |= - (((uint32_t)(wuffs_base__load_u8be(iop_a_src))) << v_n_bits); - (iop_a_src += 1, wuffs_base__return_empty_struct()); - v_n_bits += 8; - if (v_n_bits >= v_width) { - goto label_0_break; - } - } - label_0_break:; - } - } - v_code = ((v_bits) & ((1 << (v_width)) - 1)); - v_bits >>= v_width; - v_n_bits -= v_width; - if (v_code < v_clear_code) { - self->private_impl.f_output[v_j] = ((uint8_t)(v_code)); - v_j = ((v_j + 1) & 8191); - if (v_save_code <= 4095) { - v_lm1_a = ((self->private_impl.f_lm1s[v_prev_code] + 1) & 4095); - self->private_impl.f_lm1s[v_save_code] = v_lm1_a; - if ((v_lm1_a % 8) != 0) { - self->private_impl.f_prefixes[v_save_code] = - self->private_impl.f_prefixes[v_prev_code]; - memcpy(self->private_impl.f_suffixes[v_save_code], - self->private_impl.f_suffixes[v_prev_code], 8); - self->private_impl.f_suffixes[v_save_code][(v_lm1_a % 8)] = - ((uint8_t)(v_code)); - } else { - self->private_impl.f_prefixes[v_save_code] = - ((uint16_t)(v_prev_code)); - self->private_impl.f_suffixes[v_save_code][0] = ((uint8_t)(v_code)); - } - v_save_code += 1; - if ((v_save_code == (((uint32_t)(1)) << v_width)) && (v_width < 12)) { - v_width += 1; - } - v_prev_code = v_code; - } - } else if (v_code <= v_end_code) { - if (v_code == v_end_code) { - goto label_1_break; - } - v_save_code = v_end_code; - v_prev_code = v_end_code; - v_width = (v_literal_width + 1); - } else if (v_code <= v_save_code) { - v_c = v_code; - if (v_code == v_save_code) { - v_c = v_prev_code; - } - v_o = ((v_j + - (((uint32_t)(self->private_impl.f_lm1s[v_c])) & 4294967288)) & - 8191); - v_j = ((v_j + 1 + ((uint32_t)(self->private_impl.f_lm1s[v_c]))) & 8191); - v_steps = (((uint32_t)(self->private_impl.f_lm1s[v_c])) >> 3); - while (true) { - memcpy((self->private_impl.f_output) + (v_o), - (self->private_impl.f_suffixes[v_c]) + (0), 8); - if (v_steps <= 0) { - goto label_2_break; - } - v_steps -= 1; - v_o = ((v_o - 8) & 8191); - v_c = ((uint32_t)(self->private_impl.f_prefixes[v_c])); - } - label_2_break:; - v_first_byte = self->private_impl.f_suffixes[v_c][0]; - if (v_code == v_save_code) { - self->private_impl.f_output[v_j] = v_first_byte; - v_j = ((v_j + 1) & 8191); - } - if (v_save_code <= 4095) { - v_lm1_b = ((self->private_impl.f_lm1s[v_prev_code] + 1) & 4095); - self->private_impl.f_lm1s[v_save_code] = v_lm1_b; - if ((v_lm1_b % 8) != 0) { - self->private_impl.f_prefixes[v_save_code] = - self->private_impl.f_prefixes[v_prev_code]; - memcpy(self->private_impl.f_suffixes[v_save_code], - self->private_impl.f_suffixes[v_prev_code], 8); - self->private_impl.f_suffixes[v_save_code][(v_lm1_b % 8)] = - v_first_byte; - } else { - self->private_impl.f_prefixes[v_save_code] = - ((uint16_t)(v_prev_code)); - self->private_impl.f_suffixes[v_save_code][0] = - ((uint8_t)(v_first_byte)); - } - v_save_code += 1; - if ((v_save_code == (((uint32_t)(1)) << v_width)) && (v_width < 12)) { - v_width += 1; - } - v_prev_code = v_code; - } - } else { - status = wuffs_lzw__error__bad_code; - goto exit; - } - if (v_j > 4095) { - while (v_n_bits >= 8) { - v_n_bits -= 8; - if (iop_a_src > io0_a_src) { - (iop_a_src--, wuffs_base__return_empty_struct()); - } else { - status = wuffs_lzw__error__internal_error_inconsistent_i_o; - goto exit; - } - } - v_bits = ((v_bits) & ((1 << (v_n_bits)) - 1)); - self->private_impl.f_flush_j = v_j; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - status = wuffs_lzw__decoder__flush(self, a_dst); - if (status) { - goto suspend; - } - v_j = 0; - } - } - label_1_break:; - if (v_j > 0) { - while (v_n_bits >= 8) { - v_n_bits -= 8; - if (iop_a_src > io0_a_src) { - (iop_a_src--, wuffs_base__return_empty_struct()); - } else { - status = wuffs_lzw__error__internal_error_inconsistent_i_o; - goto exit; - } - } - v_bits = ((v_bits) & ((1 << (v_n_bits)) - 1)); - self->private_impl.f_flush_j = v_j; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - status = wuffs_lzw__decoder__flush(self, a_dst); - if (status) { - goto suspend; - } - } - - goto ok; - ok: - self->private_impl.c_decode[0].coro_susp_point = 0; - goto exit; - } - - goto suspend; -suspend: - self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode[0].v_literal_width = v_literal_width; - self->private_impl.c_decode[0].v_clear_code = v_clear_code; - self->private_impl.c_decode[0].v_end_code = v_end_code; - self->private_impl.c_decode[0].v_save_code = v_save_code; - self->private_impl.c_decode[0].v_prev_code = v_prev_code; - self->private_impl.c_decode[0].v_width = v_width; - self->private_impl.c_decode[0].v_j = v_j; - self->private_impl.c_decode[0].v_bits = v_bits; - self->private_impl.c_decode[0].v_n_bits = v_n_bits; - self->private_impl.c_decode[0].v_code = v_code; - self->private_impl.c_decode[0].v_lm1_a = v_lm1_a; - self->private_impl.c_decode[0].v_c = v_c; - self->private_impl.c_decode[0].v_o = v_o; - self->private_impl.c_decode[0].v_steps = v_steps; - self->private_impl.c_decode[0].v_first_byte = v_first_byte; - self->private_impl.c_decode[0].v_lm1_b = v_lm1_b; - - goto exit; -exit: - if (a_src.private_impl.buf) { - a_src.private_impl.buf->meta.ri = - iop_a_src - a_src.private_impl.buf->data.ptr; - } - - if (wuffs_base__status__is_error(status)) { - self->private_impl.magic = WUFFS_BASE__DISABLED; - } - return status; -} - -// -------- func lzw.decoder.flush - -static wuffs_base__status // -wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self, - wuffs_base__io_writer a_dst) { - wuffs_base__status status = NULL; - - uint32_t v_i; - uint32_t v_j; - wuffs_base__slice_u8 v_s; - uint64_t v_n; - - uint8_t* iop_a_dst = NULL; - uint8_t* io0_a_dst = NULL; - uint8_t* io1_a_dst = NULL; - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io0_a_dst); - WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_a_dst); - if (a_dst.private_impl.buf) { - iop_a_dst = - a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; - if (!a_dst.private_impl.mark) { - a_dst.private_impl.mark = iop_a_dst; - a_dst.private_impl.limit = - a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->data.len; - } - if (a_dst.private_impl.buf->meta.closed) { - a_dst.private_impl.limit = iop_a_dst; - } - io0_a_dst = a_dst.private_impl.mark; - io1_a_dst = a_dst.private_impl.limit; - } - - uint32_t coro_susp_point = self->private_impl.c_flush[0].coro_susp_point; - if (coro_susp_point) { - v_i = self->private_impl.c_flush[0].v_i; - v_j = self->private_impl.c_flush[0].v_j; - v_s = ((wuffs_base__slice_u8){}); - v_n = self->private_impl.c_flush[0].v_n; - } else { - v_s = ((wuffs_base__slice_u8){}); - } - switch (coro_susp_point) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - - v_i = 0; - v_j = self->private_impl.f_flush_j; - while (true) { - if (v_i > v_j) { - status = wuffs_lzw__error__internal_error_inconsistent_i_o; - goto exit; - } - v_s = wuffs_base__slice_u8__subslice_ij( - ((wuffs_base__slice_u8){ - .ptr = self->private_impl.f_output, - .len = 8199, - }), - v_i, v_j); - v_n = wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io1_a_dst, v_s); - if (v_n == ((uint64_t)(v_s.len))) { - status = NULL; - goto ok; - } - v_i = ((v_i + ((uint32_t)((v_n & 8191)))) & 8191); - status = wuffs_base__suspension__short_write; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); - } - - goto ok; - ok: - self->private_impl.c_flush[0].coro_susp_point = 0; - goto exit; - } - - goto suspend; -suspend: - self->private_impl.c_flush[0].coro_susp_point = coro_susp_point; - self->private_impl.c_flush[0].v_i = v_i; - self->private_impl.c_flush[0].v_j = v_j; - self->private_impl.c_flush[0].v_n = v_n; - - goto exit; -exit: - if (a_dst.private_impl.buf) { - a_dst.private_impl.buf->meta.wi = - iop_a_dst - a_dst.private_impl.buf->data.ptr; - } - - return status; -} - -#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) - #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB) // ---------------- Status Codes Implementations @@ -9935,16 +10147,17 @@ sizeof__wuffs_zlib__decoder() { // -------- func zlib.decoder.set_ignore_checksum -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic) { if (!self) { - return; + return ((wuffs_base__empty_struct){}); } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return; + return ((wuffs_base__empty_struct){}); } self->private_impl.f_ignore_checksum = a_ic; + return ((wuffs_base__empty_struct){}); } // -------- func zlib.decoder.decode @@ -10006,10 +10219,10 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; if (coro_susp_point) { - v_x = self->private_impl.c_decode[0].v_x; + v_x = 0; v_checksum_got = self->private_impl.c_decode[0].v_checksum_got; - v_z = self->private_impl.c_decode[0].v_z; - v_checksum_want = self->private_impl.c_decode[0].v_checksum_want; + v_z = NULL; + v_checksum_want = 0; } else { } switch (coro_susp_point) { @@ -10017,9 +10230,9 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); - uint16_t t_1; + uint16_t t_0; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_1 = wuffs_base__load_u16be(iop_a_src); + t_0 = wuffs_base__load_u16be(iop_a_src); iop_a_src += 2; } else { self->private_impl.c_decode[0].scratch = 0; @@ -10030,19 +10243,19 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode[0].scratch; - uint32_t t_0 = *scratch & 0xFF; + uint32_t num_bits_0 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - t_0); - if (t_0 == 8) { - t_1 = *scratch >> (64 - 16); + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0); + if (num_bits_0 == 8) { + t_0 = *scratch >> (64 - 16); break; } - t_0 += 8; - *scratch |= ((uint64_t)(t_0)); + num_bits_0 += 8; + *scratch |= ((uint64_t)(num_bits_0)); } } - v_x = t_1; + v_x = t_0; } if (((v_x >> 8) & 15) != 8) { status = wuffs_zlib__error__bad_compression_method; @@ -10072,7 +10285,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; } - wuffs_base__status t_2 = wuffs_deflate__decoder__decode( + wuffs_base__status t_1 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.private_impl.buf) { iop_a_dst = a_dst.private_impl.buf->data.ptr + @@ -10082,7 +10295,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, iop_a_src = a_src.private_impl.buf->data.ptr + a_src.private_impl.buf->meta.ri; } - v_z = t_2; + v_z = t_1; } if (!self->private_impl.f_ignore_checksum) { v_checksum_got = wuffs_adler32__hasher__update( @@ -10101,9 +10314,9 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, label_0_break:; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); - uint32_t t_4; + uint32_t t_2; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 4)) { - t_4 = wuffs_base__load_u32be(iop_a_src); + t_2 = wuffs_base__load_u32be(iop_a_src); iop_a_src += 4; } else { self->private_impl.c_decode[0].scratch = 0; @@ -10114,19 +10327,19 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, goto suspend; } uint64_t* scratch = &self->private_impl.c_decode[0].scratch; - uint32_t t_3 = *scratch & 0xFF; + uint32_t num_bits_2 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; - *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - t_3); - if (t_3 == 24) { - t_4 = *scratch >> (64 - 32); + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2); + if (num_bits_2 == 24) { + t_2 = *scratch >> (64 - 32); break; } - t_3 += 8; - *scratch |= ((uint64_t)(t_3)); + num_bits_2 += 8; + *scratch |= ((uint64_t)(num_bits_2)); } } - v_checksum_want = t_4; + v_checksum_want = t_2; } if (!self->private_impl.f_ignore_checksum && (v_checksum_got != v_checksum_want)) { @@ -10143,10 +10356,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, goto suspend; suspend: self->private_impl.c_decode[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode[0].v_x = v_x; self->private_impl.c_decode[0].v_checksum_got = v_checksum_got; - self->private_impl.c_decode[0].v_z = v_z; - self->private_impl.c_decode[0].v_checksum_want = v_checksum_want; goto exit; exit: