From 36f6a86c8b9753ca6aae760141e7c4ab53ac786a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20M=C3=B6nig?= <jens@moenig.org>
Date: Tue, 19 Jul 2016 14:36:52 +0200
Subject: [PATCH] fixed #1329 - color collision detection for retina mode

---
 objects.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/objects.js b/objects.js
index c5329beb..56a9e1bc 100644
--- a/objects.js
+++ b/objects.js
@@ -82,7 +82,7 @@ SpeechBubbleMorph, RingMorph, isNil, FileReader, TableDialogMorph,
 BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, localize,
 TableMorph, TableFrameMorph, normalizeCanvas, BooleanSlotMorph*/
 
-modules.objects = '2016-July-14';
+modules.objects = '2016-July-19';
 
 var SpriteMorph;
 var StageMorph;
@@ -1592,7 +1592,12 @@ SpriteMorph.prototype.colorFiltered = function (aColor) {
         i,
         dta;
 
-    src = this.image.getContext('2d').getImageData(0, 0, ext.x, ext.y);
+    src = normalizeCanvas(this.image, true).getContext('2d').getImageData(
+        0,
+        0,
+        ext.x,
+        ext.y
+    );
     morph.image = newCanvas(ext, true);
     morph.bounds = this.bounds.copy();
     ctx = morph.image.getContext('2d');
@@ -3611,6 +3616,9 @@ SpriteMorph.prototype.drawLine = function (start, dest) {
 };
 
 SpriteMorph.prototype.floodFill = function () {
+    if (!this.parent.bounds.containsPoint(this.rotationCenter())) {
+        return;
+    }
     var layer = normalizeCanvas(this.parent.penTrails()),
         width = layer.width,
         height = layer.height,
@@ -5309,7 +5317,12 @@ StageMorph.prototype.colorFiltered = function (aColor, excludedSprite) {
         i,
         dta;
 
-    src = img.getContext('2d').getImageData(0, 0, ext.x, ext.y);
+    src = normalizeCanvas(img, true).getContext('2d').getImageData(
+        0,
+        0,
+        ext.x,
+        ext.y
+    );
     morph.bounds = this.bounds.copy();
     morph.image = newCanvas(ext, true);
     ctx = morph.image.getContext('2d');