Fix "-Werror=conversion" build failure re BGR_565

This commit is contained in:
Nigel Tao committed 2020-01-28 10:52:45 +11:00
1 parent 7527103ec4
commit 67b8c79ce8
3 files changed
+6 -6

No files matched your search

+2 -2
View File
@@ -190,8 +190,8 @@ wuffs_base__pixel_buffer__set_color_u32_at(
uint32_t b5 = 0x1F & (color >> (8 - 5));
uint32_t g6 = 0x3F & (color >> (16 - 6));
uint32_t r5 = 0x1F & (color >> (24 - 5));
wuffs_base__store_u16le(row + (2 * ((size_t)x)),
(b5 << 0) | (g6 << 5) | (r5 << 11));
uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);
wuffs_base__store_u16le(row + (2 * ((size_t)x)), (uint16_t)bgr565);
break;
}
case WUFFS_BASE__PIXEL_FORMAT__BGR:
+2 -2
View File
@@ -32,8 +32,8 @@ const baseImageImplC = "" +
"t32_t)(row[x])));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {\n uint8_t* palette = b->private_impl.planes[3].ptr;\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le(palette + (4 * ((size_t)row[x]))));\n }\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint16_t bgr = wuffs_base__load_u16le(row + (2 * ((size_t)x)));\n uint32_t b5 = 0x1F & (bgr >> 0);\n uint32_t b = (b5 << 3) | (b5 >> 2);\n uint32_t g6 = 0x3F & (bgr >> 5);\n uint32_t g = (g6 << 2) | (g6 >> 4);\n uint32_t r5 = 0x1F & (bgr >> 11);\n uint32_t r = (r5 << 3) | (r5 >> 2);\n return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n return 0xFF000000 | wuffs_base__load_u24le(row + (3 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n return 0xFF000000 | wuffs_base__load_u32le(row + (4 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n return wuffs_base__premul_u32_axxx(\n wuffs_base" +
"__load_u32le(row + (4 * ((size_t)x))));\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 | wuffs_base__load_u24le(row + (3 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 | wuffs_base__load_u32le(row + (4 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le(row + (4 * ((size_t)x)))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuffs_base__swap_u32_argb_abgr(\n wuffs_base__load_u32le(row + (4 * ((size_t)x))));\n\n default:\n // TODO: support more formats.\n break;\n }\n\n return 0;\n}\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__pixel_buffer* b,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_pr" +
"emul color) {\n if (!b) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n if ((x >= b->pixcfg.private_impl.width) ||\n (y >= b->pixcfg.private_impl.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n if (wuffs_base__pixel_format__is_planar(&b->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n size_t stride = b->private_impl.planes[0].stride;\n uint8_t* row = b->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (b->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)), color);\n break;\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint32_t b5 = 0x1F & (color >> (8 - 5));\n uint32_t g6 = 0x3F & (color >> (16 - 6));\n " +
" uint32_t r5 = 0x1F & (color >> (24 - 5));\n wuffs_base__store_u16le(row + (2 * ((size_t)x)),\n (b5 << 0) | (g6 << 5) | (r5 << 11));\n break;\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n wuffs_base__store_u24le(row + (3 * ((size_t)x)), color);\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)),\n wuffs_base__nonpremul_u32_axxx(color));\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n wuffs_base__store_u24le(row + (3 * ((size_t)x)),\n wuffs_base__swap_u32_argb_abgr(color));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)),\n wuffs_base__nonpremul_u32_axxx(\n wuffs_base__swap_u32_argb_abgr(color)));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BA" +
"SE__PIXEL_FORMAT__RGBX:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)),\n wuffs_base__swap_u32_argb_abgr(color));\n break;\n\n default:\n // TODO: support more formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n return wuffs_base__make_status(NULL);\n}\n\n" +
" uint32_t r5 = 0x1F & (color >> (24 - 5));\n uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);\n wuffs_base__store_u16le(row + (2 * ((size_t)x)), (uint16_t)bgr565);\n break;\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n wuffs_base__store_u24le(row + (3 * ((size_t)x)), color);\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)),\n wuffs_base__nonpremul_u32_axxx(color));\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n wuffs_base__store_u24le(row + (3 * ((size_t)x)),\n wuffs_base__swap_u32_argb_abgr(color));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)),\n wuffs_base__nonpremul_u32_axxx(\n wuffs_base__swap_u32_argb_abgr(color)));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n c" +
"ase WUFFS_BASE__PIXEL_FORMAT__RGBX:\n wuffs_base__store_u32le(row + (4 * ((size_t)x)),\n wuffs_base__swap_u32_argb_abgr(color));\n break;\n\n default:\n // TODO: support more formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n return wuffs_base__make_status(NULL);\n}\n\n" +
"" +
"// --------\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n return wuffs_base__slice_u8__copy_from_slice(dst, src);\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__xx__index__src(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (dst_palette.len != 1024) {\n return 0;\n }\n size_t dst_len2 = dst.len / 2;\n size_t len = dst_len2 < src.len ? dst_len2 : src.len;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n size_t n = len;\n\n const size_t loop_unroll_count = 4;\n\n while (n >= loop_unroll_count) {\n wuffs_base__store_u16le(\n d + (0 * 2),\n wuffs_base__load_u16le(dst_palette.ptr + ((size_t)s[0] * 4)));\n wuffs_base__store_u16le(\n d + (1 * 2),\n wuffs_base__load_u16le(dst_palette" +
".ptr + ((size_t)s[1] * 4)));\n wuffs_base__store_u16le(\n d + (2 * 2),\n wuffs_base__load_u16le(dst_palette.ptr + ((size_t)s[2] * 4)));\n wuffs_base__store_u16le(\n d + (3 * 2),\n wuffs_base__load_u16le(dst_palette.ptr + ((size_t)s[3] * 4)));\n\n s += 1 * loop_unroll_count;\n d += 2 * loop_unroll_count;\n n -= loop_unroll_count;\n }\n\n while (n >= 1) {\n wuffs_base__store_u16le(\n d + (0 * 2),\n wuffs_base__load_u16le(dst_palette.ptr + ((size_t)s[0] * 4)));\n\n s += 1 * 1;\n d += 2 * 1;\n n -= 1;\n }\n\n return len;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__xxx__index__src(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (dst_palette.len != 1024) {\n return 0;\n }\n size_t dst_len3 = dst.len / 3;\n size_t len = dst_len3 < src.len ? dst_len3 : src.len;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n size_t n = len;\n\n " +
+2 -2
View File
@@ -6018,8 +6018,8 @@ wuffs_base__pixel_buffer__set_color_u32_at(
uint32_t b5 = 0x1F & (color >> (8 - 5));
uint32_t g6 = 0x3F & (color >> (16 - 6));
uint32_t r5 = 0x1F & (color >> (24 - 5));
wuffs_base__store_u16le(row + (2 * ((size_t)x)),
(b5 << 0) | (g6 << 5) | (r5 << 11));
uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);
wuffs_base__store_u16le(row + (2 * ((size_t)x)), (uint16_t)bgr565);
break;
}
case WUFFS_BASE__PIXEL_FORMAT__BGR: