From 178fa9db35184b00d72c2badbf51b3cd45c32a41 Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Wed, 15 Sep 2010 01:13:22 +0000 Subject: [PATCH] Let's not just arbitrarily ignore colorizations in this image provider. It's making the artists using test tiles in the editor sad. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1013 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../threerings/media/tile/SimpleCachingImageProvider.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java b/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java index 6ececc54..bf1516bb 100644 --- a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java +++ b/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java @@ -32,6 +32,7 @@ import com.samskivert.util.LRUHashMap; import com.threerings.media.image.BufferedMirage; import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageUtil; import com.threerings.media.image.Mirage; import static com.threerings.media.Log.log; @@ -54,7 +55,12 @@ public abstract class SimpleCachingImageProvider implements ImageProvider log.warning("Failed to load image [path=" + path + ", ioe=" + ioe + "]."); } } - return image; + + if (zations == null || image == null) { + return image; + } else { + return ImageUtil.recolorImage(image, zations); + } } // documentation inherited from interface