From 226ac347c51e21440d1740d85b5e9912d1ce08e5 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 6 Dec 2021 07:57:52 -0500 Subject: add upstream 11.15 --- xBRZ/src/xbrz.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'xBRZ') diff --git a/xBRZ/src/xbrz.cpp b/xBRZ/src/xbrz.cpp index 659614fd..9cf4b8e9 100644 --- a/xBRZ/src/xbrz.cpp +++ b/xBRZ/src/xbrz.cpp @@ -475,10 +475,7 @@ public: void readPonm(Kernel_4x4& ker, int x) const //(x, y) is at kernel position E { -#if __has_cpp_attribute(likely) - [[likely]] -#endif - if (const int x_p2 = x + 2; 0 <= x_p2 && x_p2 < srcWidth_) + [[likely]] if (const int x_p2 = x + 2; 0 <= x_p2 && x_p2 < srcWidth_) { ker.p = s_m1 ? s_m1[x_p2] : 0; ker.o = s_0 ? s_0 [x_p2] : 0; @@ -691,10 +688,7 @@ void scaleImage(const uint32_t* src, uint32_t* trg, int srcWidth, int srcHeight, addTopR(blend_xy1, res.blend_h); //set 2nd known corner for (x, y + 1) preProcBuf[x] = blend_xy1; //store on current buffer position for use on next row -#if __has_cpp_attribute(likely) - [[likely]] -#endif - if (x + 1 < srcWidth) + [[likely]] if (x + 1 < srcWidth) { //blend_xy1 -> blend_x1y1 clearAddTopL(blend_xy1, res.blend_i); //set 1st known corner for (x + 1, y + 1) and buffer for use on next column -- cgit