[Geotools-commits] svn - r38450 - in branches/2.7.x/modules/library/coverage/src: main/java/org/geotools/image test/java/org/geotools/image

[<svn...@os...>]

Author: aaime
Date: 2011-12-26 08:19:17 -0800 (Mon, 26 Dec 2011)
New Revision: 38450

Modified:
   branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java
   branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
Log:
[GEOT-3991] ImageWorker writePNG forces component color model for images that can be encoded as-is

Modified: branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java
===================================================================
--- branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java	2011-12-26 16:16:58 UTC (rev 38449)
+++ branches/2.7.x/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java	2011-12-26 16:19:17 UTC (rev 38450)
@@ -2410,10 +2410,12 @@
             throws IOException
     {
         // Reformatting this image for PNG.
-        if (!paletted) {
+        if (paletted && !(image.getColorModel() instanceof IndexColorModel)) {
+            // we have to reduce colors
+        	forceIndexColorModelForGIF(true);
+        } else if(!(image.getColorModel() instanceof ComponentColorModel) && !(image.getColorModel() instanceof IndexColorModel)) {
+            // png supports gray, rgb, rgba and paletted, but not, for example, double and float values
             forceComponentColorModel();
-        }else{
-        	forceIndexColorModelForGIF(true);
         }
         if(LOGGER.isLoggable(Level.FINER))
 			LOGGER.finer("Encoded input image for png writer");

Modified: branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
===================================================================
--- branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2011-12-26 16:16:58 UTC (rev 38449)
+++ branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2011-12-26 16:19:17 UTC (rev 38450)
@@ -387,6 +387,13 @@
         readWorker.setImage(ImageIO.read(outFile));
         show(readWorker, "Pure  PNG8");
         outFile.delete();
+        
+        // Check we are not expanding to RGB a paletted image
+        worker.setImage(sstImage);
+        assertTrue(sstImage.getColorModel() instanceof IndexColorModel);
+        worker.writePNG(outFile, "FILTERED", 0.75f, false, false);
+        readWorker.setImage(ImageIO.read(outFile));
+        assertTrue(readWorker.getRenderedImage().getColorModel() instanceof IndexColorModel);
     }
 
     /**