diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 449ecc29..6bf955f8 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -243,6 +243,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index be90a433..48c043cb 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -99,7 +99,7 @@ const baseImpl = "" + "// ---------------- Slices and Tables\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i(\n wuffs_base__slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_j(\n wuffs_base__slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_ij(\n wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.\nstatic inline wuffs_base__slice_u" + "8 wuffs_base__slice_u8__prefix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr,\n// length) where length is the minimum of dst.len and src.len.\n//\n// Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t wuffs_base__slice_u8__copy_from_slice(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\n" + "" + - "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize(\n wuffs_base__table_u8 t) {\n if (t.width == t.stride) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr,\n .len = t.width * t.height,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" + + "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize(\n wuffs_base__table_u8 t) {\n if (t.width == t.stride) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr,\n .len = t.width * t.height,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__row(\n wuffs_base__table_u8 t,\n uint32_t y) {\n if (y < t.height) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr + (t.stride * y),\n .len = t.width,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" + "" + "// ---------------- Ranges and Rects\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r,\n uint32_t x) {\n r->min_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r,\n uint32_t y) {\n r->min_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r,\n uint32_t x) {\n r->max_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r,\n uint32_t y) {\n r->max_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\n" + "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 882c82a7..97157a92 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1500,6 +1500,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index f20a240c..bbd0477b 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1499,6 +1499,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index f92a9712..006349ac 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1591,6 +1591,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index f8913467..ff75538c 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1636,6 +1636,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 3901a88f..0118ba3f 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1794,6 +1794,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 279c15fb..7b70b81a 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1794,6 +1794,18 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( return ((wuffs_base__slice_u8){}); } +static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( + wuffs_base__table_u8 t, + uint32_t y) { + if (y < t.height) { + return ((wuffs_base__slice_u8){ + .ptr = t.ptr + (t.stride * y), + .len = t.width, + }); + } + return ((wuffs_base__slice_u8){}); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct