Fixed pixmap crash

Anuken · Oct 12, 2024 · dd60085 · dd60085
1 parent a39155a
commit dd60085
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/arc-core/src/arc/graphics/Pixmap.java b/arc-core/src/arc/graphics/Pixmap.java
@@ -395,9 +395,9 @@ public void draw(Pixmap pixmap, int srcx, int srcy, int srcWidth, int srcHeight,
                 ByteBuffer pixels = this.pixels, otherPixels = pixmap.pixels;
                 int
                 startY = Math.max(dsty, 0),
-                endY = Math.min(dsty + Math.min(dstHeight, oheight), height),
+                endY = Math.min(Math.min(dsty + Math.min(dstHeight, oheight), height), dsty - srcy + oheight),
                 startX = Math.max(dstx, 0),
-                endX = Math.min(dstx + Math.min(dstWidth, owidth), width),
+                endX = Math.min(Math.min(dstx + Math.min(dstWidth, owidth), width), dstx - srcx + owidth),
                 offsetY = dsty - srcy,
                 scanX = Math.max(Math.max(srcx, -dstx), 0),
                 scanWidth = (endX - startX) * 4;

diff --git a/arc-core/test/PixmapTest.java b/arc-core/test/PixmapTest.java
@@ -29,6 +29,16 @@ public void pixmapCreate(){
         assertEquals(0, pix.get(0, 0));
     }
 
+    @Test
+    public void pixmapBounds(){
+        int x = 176;
+
+        Pixmap base = new Pixmap(176, 269);
+        Pixmap crop = new Pixmap(176, 176);
+
+        crop.draw(base, 0, 176, x, x, 0, 0, x, x, true);
+    }
+
     static  Rect rect = new Rect();
     static Vec2 v1 = new Vec2(), v2 = new Vec2();