kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getColorBoundsRect

Browse Source
This commit is contained in:
Joshua Granick
2015-08-21 10:36:04 -07:00
parent 9e9faf12d0
commit 3b536ec7b5
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lime/graphics/utils/ImageDataUtil.hx
View File

@@ -436,29 +436,31 @@ class ImageDataUtil {
var top = image.height + 1; var top = image.height + 1;
var bottom = 0; var bottom = 0;
var color:RGBA = color; var _color:RGBA, _mask:RGBA;
var mask:RGBA = mask;
switch (format) { switch (format) {
case ARGB32: case ARGB32:
color = (color:ARGB); _color = (color:ARGB);
mask = (mask:ARGB); _mask = (mask:ARGB);
case BGRA32: case BGRA32:
color = (color:BGRA); _color = (color:BGRA);
mask = (mask:BGRA); _mask = (mask:BGRA);
default: default:
_color = color;
_mask = mask;
} }
if (!image.transparent) { if (!image.transparent) {
color.a = 0xFF; _color.a = 0xFF;
mask.a = 0xFF; _mask.a = 0xFF;
} }
@@ -471,7 +473,7 @@ class ImageDataUtil {
for (y in 0...image.height) { for (y in 0...image.height) {
pixel = image.getPixel32 (x, y, RGBA32); pixel = image.getPixel32 (x, y, RGBA32);
hit = findColor ? (pixel & mask) == color : (pixel & mask) != color; hit = findColor ? (pixel & _mask) == _color : (pixel & _mask) != _color;
if (hit) { if (hit) {
@@ -500,7 +502,7 @@ class ImageDataUtil {
for (y in 0...image.height) { for (y in 0...image.height) {
pixel = image.getPixel32 (ix, y, RGBA32); pixel = image.getPixel32 (ix, y, RGBA32);
hit = findColor ? (pixel & mask) == color : (pixel & mask) != color; hit = findColor ? (pixel & _mask) == _color : (pixel & _mask) != _color;
if (hit) { if (hit) {
@@ -526,7 +528,7 @@ class ImageDataUtil {
for (x in 0...image.width) { for (x in 0...image.width) {
pixel = image.getPixel32 (x, y, RGBA32); pixel = image.getPixel32 (x, y, RGBA32);
hit = findColor ? (pixel & mask) == color : (pixel & mask) != color; hit = findColor ? (pixel & _mask) == _color : (pixel & _mask) != _color;
if (hit) { if (hit) {
@@ -555,7 +557,7 @@ class ImageDataUtil {
for (x in 0...image.width) { for (x in 0...image.width) {
pixel = image.getPixel32 (x, iy, RGBA32); pixel = image.getPixel32 (x, iy, RGBA32);
hit = findColor ? (pixel & mask) == color : (pixel & mask) != color; hit = findColor ? (pixel & _mask) == _color : (pixel & _mask) != _color;
if (hit) { if (hit) {