pixconv: tweak "if (triangle_filter_for_2to1)"

This commit is contained in:
Nigel Tao committed 2023-07-31 16:05:10 +10:00
1 parent 836a878861
commit fd5ab5f7b3
2 files changed
+12 -16

No files matched your search

+6 -8
View File
@@ -936,7 +936,12 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
memcpy(&upfuncs, &wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs,
sizeof upfuncs);
if (triangle_filter_for_2to1) {
if (triangle_filter_for_2to1 &&
(wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) {
func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter;
upfuncs[0][1] =
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle;
upfuncs[1][0] =
@@ -966,13 +971,6 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
#endif
}
if (triangle_filter_for_2to1 &&
(wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) {
func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter;
}
(*func)(dst, width, height, //
src0.ptr, src1.ptr, src2.ptr, //
stride0, stride1, stride2, //
+6 -8
View File
@@ -24488,7 +24488,12 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
memcpy(&upfuncs, &wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs,
sizeof upfuncs);
if (triangle_filter_for_2to1) {
if (triangle_filter_for_2to1 &&
(wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) {
func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter;
upfuncs[0][1] =
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle;
upfuncs[1][0] =
@@ -24518,13 +24523,6 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
#endif
}
if (triangle_filter_for_2to1 &&
(wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) ||
wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) {
func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter;
}
(*func)(dst, width, height, //
src0.ptr, src1.ptr, src2.ptr, //
stride0, stride1, stride2, //