From 86a2a6231384084691b83ef01dbb603670d51bd0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 24 Jan 2020 12:01:51 +1100 Subject: [PATCH] Add "#unsupported pixel swizzler option" error --- internal/cgen/base/image-impl.c | 4 ++-- internal/cgen/data.go | 4 ++-- lang/builtin/builtin.go | 1 + release/c/wuffs-unsupported-snapshot.c | 7 +++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/cgen/base/image-impl.c b/internal/cgen/base/image-impl.c index e7dcb865..7ccb0c06 100644 --- a/internal/cgen/base/image-impl.c +++ b/internal/cgen/base/image-impl.c @@ -443,8 +443,8 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, } p->private_impl.func = func; - return wuffs_base__make_status(func ? NULL - : wuffs_base__error__unsupported_option); + return wuffs_base__make_status( + func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option); } uint64_t // diff --git a/internal/cgen/data.go b/internal/cgen/data.go index ca4090c5..84519771 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -39,8 +39,8 @@ const baseImageImplC = "" + "_BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n func = wuffs_base__pixel_swizzler__xxxx__y;\n break;\n\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__copy_1_1;\n break;\n " + " default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n " + " func = wuffs_base__pixel_swizzler__xxxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n " + - " case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n return wuffs_base__make_status(func ? NULL\n : wuffs_base__error__unsupported_option);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_interleaved(\n const wuffs_base__pix" + - "el_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*(p->private_impl.func))(dst, dst_palette, src);\n }\n return 0;\n}\n" + + " case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n return wuffs_base__make_status(\n func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_interleaved(\n const wuffs_base__pixel_swizzler* p,\n" + + " wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*(p->private_impl.func))(dst, dst_palette, src);\n }\n return 0;\n}\n" + "" const baseCorePrivateH = "" + diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 890ef10e..247a61be 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -57,6 +57,7 @@ var Statuses = [...]string{ `"#interleaved coroutine calls"`, `"#not enough data"`, `"#unsupported option"`, + `"#unsupported pixel swizzler option"`, `"#too much data"`, } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index eba6b835..885a04bb 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -201,6 +201,7 @@ extern const char* wuffs_base__error__initialize_not_called; extern const char* wuffs_base__error__interleaved_coroutine_calls; extern const char* wuffs_base__error__not_enough_data; extern const char* wuffs_base__error__unsupported_option; +extern const char* wuffs_base__error__unsupported_pixel_swizzler_option; extern const char* wuffs_base__error__too_much_data; static inline wuffs_base__status // @@ -5334,6 +5335,8 @@ const char* wuffs_base__error__interleaved_coroutine_calls = "#base: interleaved coroutine calls"; const char* wuffs_base__error__not_enough_data = "#base: not enough data"; const char* wuffs_base__error__unsupported_option = "#base: unsupported option"; +const char* wuffs_base__error__unsupported_pixel_swizzler_option = + "#base: unsupported pixel swizzler option"; const char* wuffs_base__error__too_much_data = "#base: too much data"; // ---------------- Interface Definitions. @@ -6233,8 +6236,8 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, } p->private_impl.func = func; - return wuffs_base__make_status(func ? NULL - : wuffs_base__error__unsupported_option); + return wuffs_base__make_status( + func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option); } uint64_t //