aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/scaler/hq2x.cpp88
-rw-r--r--graphics/scaler/hq3x.cpp72
2 files changed, 80 insertions, 80 deletions
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp
index 8f9221a297..3d9112e5c6 100644
--- a/graphics/scaler/hq2x.cpp
+++ b/graphics/scaler/hq2x.cpp
@@ -45,56 +45,56 @@ void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
#else
#define PIXEL00_0 *(q) = w5;
-#define PIXEL00_10 *(q) = interpolate16_3_1<ColorMask>(w5, w1);
-#define PIXEL00_11 *(q) = interpolate16_3_1<ColorMask>(w5, w4);
-#define PIXEL00_12 *(q) = interpolate16_3_1<ColorMask>(w5, w2);
-#define PIXEL00_20 *(q) = interpolate16_2_1_1<ColorMask>(w5, w4, w2);
-#define PIXEL00_21 *(q) = interpolate16_2_1_1<ColorMask>(w5, w1, w2);
-#define PIXEL00_22 *(q) = interpolate16_2_1_1<ColorMask>(w5, w1, w4);
-#define PIXEL00_60 *(q) = interpolate16_5_2_1<ColorMask>(w5, w2, w4);
-#define PIXEL00_61 *(q) = interpolate16_5_2_1<ColorMask>(w5, w4, w2);
-#define PIXEL00_70 *(q) = interpolate16_6_1_1<ColorMask>(w5, w4, w2);
-#define PIXEL00_90 *(q) = interpolate16_2_3_3<ColorMask>(w5, w4, w2);
-#define PIXEL00_100 *(q) = interpolate16_14_1_1<ColorMask>(w5, w4, w2);
+#define PIXEL00_10 *(q) = interpolate16_3_1<ColorMask >(w5, w1);
+#define PIXEL00_11 *(q) = interpolate16_3_1<ColorMask >(w5, w4);
+#define PIXEL00_12 *(q) = interpolate16_3_1<ColorMask >(w5, w2);
+#define PIXEL00_20 *(q) = interpolate16_2_1_1<ColorMask >(w5, w4, w2);
+#define PIXEL00_21 *(q) = interpolate16_2_1_1<ColorMask >(w5, w1, w2);
+#define PIXEL00_22 *(q) = interpolate16_2_1_1<ColorMask >(w5, w1, w4);
+#define PIXEL00_60 *(q) = interpolate16_5_2_1<ColorMask >(w5, w2, w4);
+#define PIXEL00_61 *(q) = interpolate16_5_2_1<ColorMask >(w5, w4, w2);
+#define PIXEL00_70 *(q) = interpolate16_6_1_1<ColorMask >(w5, w4, w2);
+#define PIXEL00_90 *(q) = interpolate16_2_3_3<ColorMask >(w5, w4, w2);
+#define PIXEL00_100 *(q) = interpolate16_14_1_1<ColorMask >(w5, w4, w2);
#define PIXEL01_0 *(q+1) = w5;
-#define PIXEL01_10 *(q+1) = interpolate16_3_1<ColorMask>(w5, w3);
-#define PIXEL01_11 *(q+1) = interpolate16_3_1<ColorMask>(w5, w2);
-#define PIXEL01_12 *(q+1) = interpolate16_3_1<ColorMask>(w5, w6);
-#define PIXEL01_20 *(q+1) = interpolate16_2_1_1<ColorMask>(w5, w2, w6);
-#define PIXEL01_21 *(q+1) = interpolate16_2_1_1<ColorMask>(w5, w3, w6);
-#define PIXEL01_22 *(q+1) = interpolate16_2_1_1<ColorMask>(w5, w3, w2);
-#define PIXEL01_60 *(q+1) = interpolate16_5_2_1<ColorMask>(w5, w6, w2);
-#define PIXEL01_61 *(q+1) = interpolate16_5_2_1<ColorMask>(w5, w2, w6);
-#define PIXEL01_70 *(q+1) = interpolate16_6_1_1<ColorMask>(w5, w2, w6);
-#define PIXEL01_90 *(q+1) = interpolate16_2_3_3<ColorMask>(w5, w2, w6);
-#define PIXEL01_100 *(q+1) = interpolate16_14_1_1<ColorMask>(w5, w2, w6);
+#define PIXEL01_10 *(q+1) = interpolate16_3_1<ColorMask >(w5, w3);
+#define PIXEL01_11 *(q+1) = interpolate16_3_1<ColorMask >(w5, w2);
+#define PIXEL01_12 *(q+1) = interpolate16_3_1<ColorMask >(w5, w6);
+#define PIXEL01_20 *(q+1) = interpolate16_2_1_1<ColorMask >(w5, w2, w6);
+#define PIXEL01_21 *(q+1) = interpolate16_2_1_1<ColorMask >(w5, w3, w6);
+#define PIXEL01_22 *(q+1) = interpolate16_2_1_1<ColorMask >(w5, w3, w2);
+#define PIXEL01_60 *(q+1) = interpolate16_5_2_1<ColorMask >(w5, w6, w2);
+#define PIXEL01_61 *(q+1) = interpolate16_5_2_1<ColorMask >(w5, w2, w6);
+#define PIXEL01_70 *(q+1) = interpolate16_6_1_1<ColorMask >(w5, w2, w6);
+#define PIXEL01_90 *(q+1) = interpolate16_2_3_3<ColorMask >(w5, w2, w6);
+#define PIXEL01_100 *(q+1) = interpolate16_14_1_1<ColorMask >(w5, w2, w6);
#define PIXEL10_0 *(q+nextlineDst) = w5;
-#define PIXEL10_10 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w7);
-#define PIXEL10_11 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w8);
-#define PIXEL10_12 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w4);
-#define PIXEL10_20 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w8, w4);
-#define PIXEL10_21 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w7, w4);
-#define PIXEL10_22 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w7, w8);
-#define PIXEL10_60 *(q+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w4, w8);
-#define PIXEL10_61 *(q+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w8, w4);
-#define PIXEL10_70 *(q+nextlineDst) = interpolate16_6_1_1<ColorMask>(w5, w8, w4);
-#define PIXEL10_90 *(q+nextlineDst) = interpolate16_2_3_3<ColorMask>(w5, w8, w4);
-#define PIXEL10_100 *(q+nextlineDst) = interpolate16_14_1_1<ColorMask>(w5, w8, w4);
+#define PIXEL10_10 *(q+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w7);
+#define PIXEL10_11 *(q+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w8);
+#define PIXEL10_12 *(q+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w4);
+#define PIXEL10_20 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask >(w5, w8, w4);
+#define PIXEL10_21 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask >(w5, w7, w4);
+#define PIXEL10_22 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask >(w5, w7, w8);
+#define PIXEL10_60 *(q+nextlineDst) = interpolate16_5_2_1<ColorMask >(w5, w4, w8);
+#define PIXEL10_61 *(q+nextlineDst) = interpolate16_5_2_1<ColorMask >(w5, w8, w4);
+#define PIXEL10_70 *(q+nextlineDst) = interpolate16_6_1_1<ColorMask >(w5, w8, w4);
+#define PIXEL10_90 *(q+nextlineDst) = interpolate16_2_3_3<ColorMask >(w5, w8, w4);
+#define PIXEL10_100 *(q+nextlineDst) = interpolate16_14_1_1<ColorMask >(w5, w8, w4);
#define PIXEL11_0 *(q+1+nextlineDst) = w5;
-#define PIXEL11_10 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w9);
-#define PIXEL11_11 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w6);
-#define PIXEL11_12 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w8);
-#define PIXEL11_20 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w6, w8);
-#define PIXEL11_21 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w9, w8);
-#define PIXEL11_22 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w9, w6);
-#define PIXEL11_60 *(q+1+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w8, w6);
-#define PIXEL11_61 *(q+1+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w6, w8);
-#define PIXEL11_70 *(q+1+nextlineDst) = interpolate16_6_1_1<ColorMask>(w5, w6, w8);
-#define PIXEL11_90 *(q+1+nextlineDst) = interpolate16_2_3_3<ColorMask>(w5, w6, w8);
-#define PIXEL11_100 *(q+1+nextlineDst) = interpolate16_14_1_1<ColorMask>(w5, w6, w8);
+#define PIXEL11_10 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w9);
+#define PIXEL11_11 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w6);
+#define PIXEL11_12 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w8);
+#define PIXEL11_20 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask >(w5, w6, w8);
+#define PIXEL11_21 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask >(w5, w9, w8);
+#define PIXEL11_22 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask >(w5, w9, w6);
+#define PIXEL11_60 *(q+1+nextlineDst) = interpolate16_5_2_1<ColorMask >(w5, w8, w6);
+#define PIXEL11_61 *(q+1+nextlineDst) = interpolate16_5_2_1<ColorMask >(w5, w6, w8);
+#define PIXEL11_70 *(q+1+nextlineDst) = interpolate16_6_1_1<ColorMask >(w5, w6, w8);
+#define PIXEL11_90 *(q+1+nextlineDst) = interpolate16_2_3_3<ColorMask >(w5, w6, w8);
+#define PIXEL11_100 *(q+1+nextlineDst) = interpolate16_14_1_1<ColorMask >(w5, w6, w8);
#define YUV(x) RGBtoYUV[w ## x]
diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
index ef17a467fc..727f06ff0b 100644
--- a/graphics/scaler/hq3x.cpp
+++ b/graphics/scaler/hq3x.cpp
@@ -45,58 +45,58 @@ void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
#else
-#define PIXEL00_1M *(q) = interpolate16_3_1<ColorMask>(w5, w1);
-#define PIXEL00_1U *(q) = interpolate16_3_1<ColorMask>(w5, w2);
-#define PIXEL00_1L *(q) = interpolate16_3_1<ColorMask>(w5, w4);
-#define PIXEL00_2 *(q) = interpolate16_2_1_1<ColorMask>(w5, w4, w2);
-#define PIXEL00_4 *(q) = interpolate16_2_7_7<ColorMask>(w5, w4, w2);
-#define PIXEL00_5 *(q) = interpolate16_1_1<ColorMask>(w4, w2);
+#define PIXEL00_1M *(q) = interpolate16_3_1<ColorMask >(w5, w1);
+#define PIXEL00_1U *(q) = interpolate16_3_1<ColorMask >(w5, w2);
+#define PIXEL00_1L *(q) = interpolate16_3_1<ColorMask >(w5, w4);
+#define PIXEL00_2 *(q) = interpolate16_2_1_1<ColorMask >(w5, w4, w2);
+#define PIXEL00_4 *(q) = interpolate16_2_7_7<ColorMask >(w5, w4, w2);
+#define PIXEL00_5 *(q) = interpolate16_1_1<ColorMask >(w4, w2);
#define PIXEL00_C *(q) = w5;
-#define PIXEL01_1 *(q+1) = interpolate16_3_1<ColorMask>(w5, w2);
-#define PIXEL01_3 *(q+1) = interpolate16_7_1<ColorMask>(w5, w2);
-#define PIXEL01_6 *(q+1) = interpolate16_3_1<ColorMask>(w2, w5);
+#define PIXEL01_1 *(q+1) = interpolate16_3_1<ColorMask >(w5, w2);
+#define PIXEL01_3 *(q+1) = interpolate16_7_1<ColorMask >(w5, w2);
+#define PIXEL01_6 *(q+1) = interpolate16_3_1<ColorMask >(w2, w5);
#define PIXEL01_C *(q+1) = w5;
-#define PIXEL02_1M *(q+2) = interpolate16_3_1<ColorMask>(w5, w3);
-#define PIXEL02_1U *(q+2) = interpolate16_3_1<ColorMask>(w5, w2);
-#define PIXEL02_1R *(q+2) = interpolate16_3_1<ColorMask>(w5, w6);
-#define PIXEL02_2 *(q+2) = interpolate16_2_1_1<ColorMask>(w5, w2, w6);
-#define PIXEL02_4 *(q+2) = interpolate16_2_7_7<ColorMask>(w5, w2, w6);
-#define PIXEL02_5 *(q+2) = interpolate16_1_1<ColorMask>(w2, w6);
+#define PIXEL02_1M *(q+2) = interpolate16_3_1<ColorMask >(w5, w3);
+#define PIXEL02_1U *(q+2) = interpolate16_3_1<ColorMask >(w5, w2);
+#define PIXEL02_1R *(q+2) = interpolate16_3_1<ColorMask >(w5, w6);
+#define PIXEL02_2 *(q+2) = interpolate16_2_1_1<ColorMask >(w5, w2, w6);
+#define PIXEL02_4 *(q+2) = interpolate16_2_7_7<ColorMask >(w5, w2, w6);
+#define PIXEL02_5 *(q+2) = interpolate16_1_1<ColorMask >(w2, w6);
#define PIXEL02_C *(q+2) = w5;
-#define PIXEL10_1 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w4);
-#define PIXEL10_3 *(q+nextlineDst) = interpolate16_7_1<ColorMask>(w5, w4);
-#define PIXEL10_6 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w4, w5);
+#define PIXEL10_1 *(q+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w4);
+#define PIXEL10_3 *(q+nextlineDst) = interpolate16_7_1<ColorMask >(w5, w4);
+#define PIXEL10_6 *(q+nextlineDst) = interpolate16_3_1<ColorMask >(w4, w5);
#define PIXEL10_C *(q+nextlineDst) = w5;
#define PIXEL11 *(q+1+nextlineDst) = w5;
-#define PIXEL12_1 *(q+2+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w6);
-#define PIXEL12_3 *(q+2+nextlineDst) = interpolate16_7_1<ColorMask>(w5, w6);
-#define PIXEL12_6 *(q+2+nextlineDst) = interpolate16_3_1<ColorMask>(w6, w5);
+#define PIXEL12_1 *(q+2+nextlineDst) = interpolate16_3_1<ColorMask >(w5, w6);
+#define PIXEL12_3 *(q+2+nextlineDst) = interpolate16_7_1<ColorMask >(w5, w6);
+#define PIXEL12_6 *(q+2+nextlineDst) = interpolate16_3_1<ColorMask >(w6, w5);
#define PIXEL12_C *(q+2+nextlineDst) = w5;
-#define PIXEL20_1M *(q+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w7);
-#define PIXEL20_1D *(q+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w8);
-#define PIXEL20_1L *(q+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w4);
-#define PIXEL20_2 *(q+nextlineDst2) = interpolate16_2_1_1<ColorMask>(w5, w8, w4);
-#define PIXEL20_4 *(q+nextlineDst2) = interpolate16_2_7_7<ColorMask>(w5, w8, w4);
-#define PIXEL20_5 *(q+nextlineDst2) = interpolate16_1_1<ColorMask>(w8, w4);
+#define PIXEL20_1M *(q+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w7);
+#define PIXEL20_1D *(q+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w8);
+#define PIXEL20_1L *(q+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w4);
+#define PIXEL20_2 *(q+nextlineDst2) = interpolate16_2_1_1<ColorMask >(w5, w8, w4);
+#define PIXEL20_4 *(q+nextlineDst2) = interpolate16_2_7_7<ColorMask >(w5, w8, w4);
+#define PIXEL20_5 *(q+nextlineDst2) = interpolate16_1_1<ColorMask >(w8, w4);
#define PIXEL20_C *(q+nextlineDst2) = w5;
-#define PIXEL21_1 *(q+1+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w8);
-#define PIXEL21_3 *(q+1+nextlineDst2) = interpolate16_7_1<ColorMask>(w5, w8);
-#define PIXEL21_6 *(q+1+nextlineDst2) = interpolate16_3_1<ColorMask>(w8, w5);
+#define PIXEL21_1 *(q+1+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w8);
+#define PIXEL21_3 *(q+1+nextlineDst2) = interpolate16_7_1<ColorMask >(w5, w8);
+#define PIXEL21_6 *(q+1+nextlineDst2) = interpolate16_3_1<ColorMask >(w8, w5);
#define PIXEL21_C *(q+1+nextlineDst2) = w5;
-#define PIXEL22_1M *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w9);
-#define PIXEL22_1D *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w8);
-#define PIXEL22_1R *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w6);
-#define PIXEL22_2 *(q+2+nextlineDst2) = interpolate16_2_1_1<ColorMask>(w5, w6, w8);
-#define PIXEL22_4 *(q+2+nextlineDst2) = interpolate16_2_7_7<ColorMask>(w5, w6, w8);
-#define PIXEL22_5 *(q+2+nextlineDst2) = interpolate16_1_1<ColorMask>(w6, w8);
+#define PIXEL22_1M *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w9);
+#define PIXEL22_1D *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w8);
+#define PIXEL22_1R *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask >(w5, w6);
+#define PIXEL22_2 *(q+2+nextlineDst2) = interpolate16_2_1_1<ColorMask >(w5, w6, w8);
+#define PIXEL22_4 *(q+2+nextlineDst2) = interpolate16_2_7_7<ColorMask >(w5, w6, w8);
+#define PIXEL22_5 *(q+2+nextlineDst2) = interpolate16_1_1<ColorMask >(w6, w8);
#define PIXEL22_C *(q+2+nextlineDst2) = w5;
#define YUV(x) RGBtoYUV[w ## x]
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 22:01:23 +0000