summaryrefslogtreecommitdiff
path: root/xBRZ
diff options
context:
space:
mode:
authorDaniel Wilhelm <shieldwed@outlook.com>2019-05-12 22:44:22 +0000
committerDaniel Wilhelm <shieldwed@outlook.com>2019-05-12 22:44:22 +0000
commit2cb4599782d970f386a67dfd4f4dab0d531d4348 (patch)
treeb873b15f50a981aacf8bb49fd646bfded2e7a73b /xBRZ
parentMerge branch '10.11' into 'master' (diff)
parent10.12 (diff)
downloadFreeFileSync-2cb4599782d970f386a67dfd4f4dab0d531d4348.tar.gz
FreeFileSync-2cb4599782d970f386a67dfd4f4dab0d531d4348.tar.bz2
FreeFileSync-2cb4599782d970f386a67dfd4f4dab0d531d4348.zip
Merge branch '10.12' into 'master'10.12
10.12 See merge request opensource-tracking/FreeFileSync!9
Diffstat (limited to 'xBRZ')
-rw-r--r--xBRZ/src/xbrz.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/xBRZ/src/xbrz.cpp b/xBRZ/src/xbrz.cpp
index f37d1a01..4c47575f 100644
--- a/xBRZ/src/xbrz.cpp
+++ b/xBRZ/src/xbrz.cpp
@@ -377,7 +377,7 @@ void blendPixel(const Kernel_3x3& ker,
unsigned char blendInfo, //result of preprocessing all four corners of pixel "e"
const xbrz::ScalerCfg& cfg)
{
-#define a get_a<rotDeg>(ker)
+//#define a get_a<rotDeg>(ker)
#define b get_b<rotDeg>(ker)
#define c get_c<rotDeg>(ker)
#define d get_d<rotDeg>(ker)
@@ -388,8 +388,6 @@ void blendPixel(const Kernel_3x3& ker,
#define i get_i<rotDeg>(ker)
- (void)a; //silence Clang's -Wunused-function
-
const unsigned char blend = rotateBlendInfo<rotDeg>(blendInfo);
if (getBottomR(blend) >= BLEND_NORMAL)
@@ -446,7 +444,7 @@ void blendPixel(const Kernel_3x3& ker,
Scaler::blendCorner(px, out);
}
-#undef a
+//#undef a
#undef b
#undef c
#undef d
bgstack15