Changeset 1428 for trunk/src/org/expeditee/gio/swing/SwingImageManager.java

Timestamp:

08/08/19 10:28:52 (5 years ago)

Author:

bln4

Message:

Fixed bug with background color click on images that had been scaled.

File:

• trunk/src/org/expeditee/gio/swing/SwingImageManager.java (modified) (2 diffs)

trunk/src/org/expeditee/gio/swing/SwingImageManager.java

@@ -284 +284 @@
 
         @Override
-        public Colour[] getPixels(org.expeditee.core.Image image, int x, int y, int width, int height)
-        {
+        public Colour[] getPixels(org.expeditee.core.Image image, int x, int y, int width, int height) {
                 // Make sure we have a valid image
                 java.awt.Image swingImage = getInternalImage(image);
@@ -295 +294 @@
                 // Make sure the given coordinate are within the bounds of the image
                 AxisAlignedBoxBounds selectedArea = new AxisAlignedBoxBounds(x, y, width, height);
-                if (!image.getBounds().completelyContains(selectedArea)) return null;
+                AxisAlignedBoxBounds bounds = image.getBounds();
+                if (!bounds.completelyContains(selectedArea)) { 
+                        return null;
+                }
                 
                 // Create an pixel grabber to get the pixel values