Merge pull request #311 from guzba/master

3.0.2 bugfix

pixie.nimble

@@ -1,4 +1,4 @@
-version     = "3.0.1"
+version     = "3.0.2"
 author      = "Andre von Houck and Ryan Oldenburg"
 description = "Full-featured 2d graphics library for Nim."
 license     = "MIT"

src/pixie/images.nim

@@ -337,15 +337,13 @@ proc minifyBy2*(image: Image, power = 1): Image {.raises: [PixieError].} =
         result.setRgbaUnsafe(result.width - 1, y, rgbx)
 
     if srcHeightIsOdd:
-      let y = result.height - 1
-
       for x in 0 ..< resultEvenWidth:
         let rgbx = mix(
-          src.getRgbaUnsafe(x * 2 + 0, y),
+          src.getRgbaUnsafe(x * 2 + 0, src.height - 1),
-          src.getRgbaUnsafe(x * 2 + 1, y),
+          src.getRgbaUnsafe(x * 2 + 1, src.height - 1),
           0.5
         ) * 0.5
-        result.setRgbaUnsafe(x, y, rgbx)
+        result.setRgbaUnsafe(x, result.height - 1, rgbx)
 
       if srcWidthIsOdd:
         result.setRgbaUnsafe(

tests/test_images_draw.nim

@@ -258,3 +258,15 @@ block:
   b.fill(rgba(0, 0, 0, 255))
   a.draw(b, scale(vec2(0.5, 0.5)))
   doDiff(a, "minify_odd")
+
+block:
+  let
+    rock = readImage("tests/images/rock.png")
+    minified = rock.minifyBy2()
+  doDiff(minified, "rock_minified")
+
+block:
+  let
+    rock = readImage("tests/images/rock.png")
+    minified = rock.minifyBy2(2)
+  doDiff(minified, "rock_minified2")