M src/util/window.c → src/util/window.c

@@ -373,9 +373,10 @@ for (size_t i = 0; i < tw * (th - 1) - 1; i++) {
         u_int32_t c1 = data[i];
         u_int32_t c2 = data[i + 1];
         u_int32_t c3 = data[i + tw];
-        u_int32_t b = (6 * (c1 & bmask) + (c2 & bmask) + (c3 & bmask)) / 8;
-        u_int32_t g = (6 * (c1 & gmask) + (c2 & gmask) + (c3 & gmask)) / 8;
-        u_int32_t r = (6 * (c1 & rmask) + (c2 & rmask) + (c3 & rmask)) / 8;
+        u_int32_t c4 = data[i + tw + 1];
+        u_int32_t b = (5 * (c1 & bmask) + 1 * (c2 & bmask) + 1 * (c3 & bmask) + 1 * (c4 & bmask)) / 8;
+        u_int32_t g = (5 * (c1 & gmask) + 1 * (c2 & gmask) + 1 * (c3 & gmask) + 1 * (c4 & bmask)) / 8;
+        u_int32_t r = (5 * (c1 & rmask) + 1 * (c2 & rmask) + 1 * (c3 & rmask) + 1 * (c4 & bmask)) / 8;
         data[i] = (r & rmask) | (g & gmask) | (b & bmask);
     }
 }
@@ -468,26 +469,26 @@ const size_t prec = 1 << 16;
     const size_t xstep = w * prec / fw;
     const size_t ystep = h * prec / th;
 
-    const size_t offset_y6 = 3 * ystep / 16;
-    const size_t offset_x6 = 5 * xstep / 8;
+    const size_t offset_y1 = 0 * ystep / 8;
+    const size_t offset_x1 = 3 * xstep / 8;
 
-    const size_t offset_y1 = ystep / 4;
-    const size_t offset_x1 = xstep / 4;
+    const size_t offset_y2 = 1 * ystep / 8;
+    const size_t offset_x2 = 6 * xstep / 8;
 
-    const size_t offset_y2 = ystep / 4;
-    const size_t offset_x2 = 3 * xstep / 4;
+    const size_t offset_y3 = 4 * ystep / 8;
+    const size_t offset_x3 = 2 * xstep / 8;
 
-    const size_t offset_x5 = xstep / 2;
-    const size_t offset_y5 = ystep / 2;
+    const size_t offset_y4 = 4 * ystep / 8;
+    const size_t offset_x4 = 4 * xstep / 8;
 
-    const size_t offset_y3 = 3 * ystep / 4;
-    const size_t offset_x3 = xstep / 4;
+    const size_t offset_y5 = 4 * ystep / 8;
+    const size_t offset_x5 = 7 * xstep / 8;
 
-    const size_t offset_y4 = 3 * ystep / 4;
-    const size_t offset_x4 = 3 * xstep / 4;
+    const size_t offset_y6 = 6 * ystep / 8;
+    const size_t offset_x6 = 1 * xstep / 8;
 
-    const size_t offset_y7 = 5 * ystep / 8;
-    const size_t offset_x7 = 3 * xstep / 16;
+    const size_t offset_y7 = 7 * ystep / 8;
+    const size_t offset_x7 = 6 * xstep / 8;
 
     const u_int32_t rmask = (u_int32_t)ximg->red_mask;
     const u_int32_t gmask = (u_int32_t)ximg->green_mask;
@@ -495,12 +496,12 @@ const u_int32_t bmask = (u_int32_t)ximg->blue_mask;
     for (size_t yt = 0, y = 0; yt < th; yt++, y += ystep) {
         for (size_t xt = 0, x = 0; xt < fw; xt++, x += xstep) {
             size_t j = yt * tw + ox + xt;
-            u_int32_t c6 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x6) / prec), (int)((y + offset_y6) / prec));
             u_int32_t c1 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x1) / prec), (int)((y + offset_y1) / prec));
             u_int32_t c2 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x2) / prec), (int)((y + offset_y2) / prec));
-            u_int32_t c5 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x5) / prec), (int)((y + offset_y5) / prec));
             u_int32_t c3 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x3) / prec), (int)((y + offset_y3) / prec));
             u_int32_t c4 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x4) / prec), (int)((y + offset_y4) / prec));
+            u_int32_t c5 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x5) / prec), (int)((y + offset_y5) / prec));
+            u_int32_t c6 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x6) / prec), (int)((y + offset_y6) / prec));
             u_int32_t c7 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x7) / prec), (int)((y + offset_y7) / prec));
             u_int32_t b = ((c1 & bmask) + (c2 & bmask) + (c3 & bmask) + (c4 & bmask) + (c5 & bmask) * 2 + (c6 & bmask) +
                            (c7 & bmask)) /