diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-12-06 13:37:35 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-12-06 13:37:35 +0000 |
| commit | f142f32c8d2b53f305cb72cb5953e3394d6a6243 (patch) | |
| tree | 2999df8f80b28d0f7f60a84b7f75d613e280bba1 /xBRZ | |
| parent | Merge branch 'b11.14' into 'master' (diff) | |
| parent | add upstream 11.15 (diff) | |
| download | FreeFileSync-f142f32c8d2b53f305cb72cb5953e3394d6a6243.tar.gz FreeFileSync-f142f32c8d2b53f305cb72cb5953e3394d6a6243.tar.bz2 FreeFileSync-f142f32c8d2b53f305cb72cb5953e3394d6a6243.zip | |
Merge branch 'b11.15' into 'master'11.15
add upstream 11.15
See merge request opensource-tracking/FreeFileSync!39
Diffstat (limited to 'xBRZ')
| -rw-r--r-- | xBRZ/src/xbrz.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
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 |