Merge branch '11.22' into 'master'11.22

add upstream 11.22

See merge request opensource-tracking/FreeFileSync!45

1 files changed, 2 insertions, 2 deletions

diff --git a/xBRZ/src/xbrz.cpp b/xBRZ/src/xbrz.cpp
index 629a1ce5..65dfc47e 100644
--- a/xBRZ/src/xbrz.cpp
+++ b/xBRZ/src/xbrz.cpp
@@ -705,7 +705,7 @@ void scaleImage(const uint32_t* src, uint32_t* trg, int srcWidth, int srcHeight,
             //blend all four corners of current pixel
             if (blendingNeeded(blend_xy))
             {
-                const Kernel_3x3& ker3 = ker4; //"The Things We Do for Perf"
+                const Kernel_3x3& ker3 = ker4; //"The Things We Do for [Perf]"
                 blendPixel<Scaler, ColorDistance, ROT_0  >(ker3, out, trgWidth, blend_xy, cfg);
                 blendPixel<Scaler, ColorDistance, ROT_90 >(ker3, out, trgWidth, blend_xy, cfg);
                 blendPixel<Scaler, ColorDistance, ROT_180>(ker3, out, trgWidth, blend_xy, cfg);
@@ -1224,7 +1224,7 @@ void xbrz::bilinearScale(const uint32_t* src, int srcWidth, int srcHeight,
 {
     const auto pixReader = [src, srcWidth](int x, int y, BytePixel& pix)
     {
-        static_assert(sizeof(pix) == sizeof(uint32_t));
+        static_assert(sizeof(pix) == sizeof(*src));
         const uint32_t pixSrc = src[y * srcWidth + x];
 
         const unsigned char a = getAlpha(pixSrc);