Merge pull request #495 from IDgis/manual-merge-481-428

Manual merge #481 #428
deegree · Feb 7, 2015 · 19d23c8 · 19d23c8
2 parents 631a582 + 9552fc0
commit 19d23c8
Show file tree

Hide file tree

Showing 6 changed files with 1,039 additions and 3 deletions.
diff --git a/...core-rendering-2d/src/main/java/org/deegree/rendering/r2d/context/ImageRenderContext.java b/...core-rendering-2d/src/main/java/org/deegree/rendering/r2d/context/ImageRenderContext.java
@@ -57,6 +57,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.deegree.style.utils.ColorQuantizer;
 import org.deegree.style.utils.ImageUtils;
 
 /**
@@ -95,11 +96,13 @@ public boolean close() throws IOException {
         try {
             graphics.dispose();
             if ( outputStream != null ) {
+                BufferedImage image = this.image;
                 String format = this.format.substring( this.format.indexOf( "/" ) + 1 );
                 if ( format.equals( "x-ms-bmp" ) ) {
                     format = "bmp";
                 }
                 if ( format.equals( "png; subtype=8bit" ) || format.equals( "png; mode=8bit" ) ) {
+                    image = ColorQuantizer.quantizeImage( image, 256, false, false );
                     format = "png";
                 }
                 return write( image, format, outputStream );