From eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 9 Sep 2018 18:53:23 -0400 Subject: pull in latest 10.4 from upstream --- xBRZ/src/xbrz.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xBRZ/src') 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(unsigned char b) { ret template <> inline unsigned char rotateBlendInfo(unsigned char b) { return ((b << 6) | (b >> 2)) & 0xff; } - - /* input kernel area naming convention: ------------- -- cgit