diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
| commit | 728d32e6da9ce66968f8eef47a59505d613e2c1b (patch) | |
| tree | 0f0441755ff0e6d65e12222d4502c648bffd6a7c /xBRZ/src/xbrz.cpp | |
| parent | 10.3 (diff) | |
| parent | pull in latest 10.4 from upstream (diff) | |
| download | FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.gz FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.bz2 FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.zip | |
Merge branch '10.4' into 'master'10.4
pull in latest 10.4 from upstream
See merge request opensource-tracking/FreeFileSync!1
Diffstat (limited to 'xBRZ/src/xbrz.cpp')
| -rwxr-xr-x | 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 b8065f5d..f37d1a01 100755 --- a/xBRZ/src/xbrz.cpp +++ b/xBRZ/src/xbrz.cpp @@ -228,6 +228,8 @@ double distYCbCrBuffered(uint32_t pix1, uint32_t pix2) } + + enum BlendType { BLEND_NONE = 0, @@ -358,8 +360,6 @@ template <> inline unsigned char rotateBlendInfo<ROT_180>(unsigned char b) { ret template <> inline unsigned char rotateBlendInfo<ROT_270>(unsigned char b) { return ((b << 6) | (b >> 2)) & 0xff; } - - /* input kernel area naming convention: ------------- |