diff options
author | B Stack <bgstack15@gmail.com> | 2019-07-28 22:11:18 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2019-07-28 22:11:18 +0000 |
commit | d55d83514b81127e53ebcaaaf261c40c6bd265b1 (patch) | |
tree | 3e1ab2d39bea9777796470da1ee22d8a8591feef /xBRZ/src | |
parent | Merge branch '10.13' into 'master' (diff) | |
parent | Add open_ssl.cpp to CPP_FILES in Makefile (diff) | |
download | FreeFileSync-d55d83514b81127e53ebcaaaf261c40c6bd265b1.tar.gz FreeFileSync-d55d83514b81127e53ebcaaaf261c40c6bd265b1.tar.bz2 FreeFileSync-d55d83514b81127e53ebcaaaf261c40c6bd265b1.zip |
Merge branch '10.14' into 'master'10.14
10.14
See merge request opensource-tracking/FreeFileSync!11
Diffstat (limited to 'xBRZ/src')
-rw-r--r-- | xBRZ/src/xbrz.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xBRZ/src/xbrz.cpp b/xBRZ/src/xbrz.cpp index 4c47575f..71c0ec8f 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) @@ -444,7 +444,7 @@ void blendPixel(const Kernel_3x3& ker, Scaler::blendCorner(px, out); } -//#undef a + //#undef a #undef b #undef c #undef d |