Merge remote-tracking branch 'origin/master'

imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java

@@ -74,7 +74,7 @@ import java.util.Map;
  * @see <A href="http://www.mail-archive.com/batik-dev@xml.apache.org/msg00992.html">batik-dev</A>
  */
 public class SVGImageReader extends ImageReaderBase {
-    private Rasterizer rasterizer = new Rasterizer();
+    private Rasterizer rasterizer = null;
 
     /**
      * Creates an {@code SVGImageReader}.
@@ -100,6 +100,7 @@ public class SVGImageReader extends ImageReaderBase {
 
         if (imageInput != null) {
             TranscoderInput input = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
+            rasterizer = new Rasterizer();
             rasterizer.setInput(input);
         }
     }

imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java

@@ -31,9 +31,13 @@ package com.twelvemonkeys.imageio.plugins.svg;
 import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
 import org.junit.Ignore;
 import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
 import javax.imageio.spi.ImageReaderSpi;
 import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.awt.image.ImagingOpException;
 import java.io.IOException;
 import java.util.Arrays;
@@ -110,4 +114,22 @@ public class SVGImageReaderTestCase extends ImageReaderAbstractTestCase<SVGImage
     public void testReadWithSourceRegionParamEqualImage() throws IOException {
         super.testReadWithSourceRegionParamEqualImage();
     }
+    
+    @Test
+    public void testRepeatedRead() throws IOException {
+    	Dimension dim = new Dimension(100, 100);
+    	ImageReader reader = createReader();
+    	ImageReadParam param = reader.getDefaultReadParam();
+        param.setSourceRenderSize(dim);
+    	
+    	TestData redSquare = new TestData(getClassLoaderResource("/svg/red-square.svg"), dim);
+        reader.setInput(redSquare.getInputStream());
+        BufferedImage imageRed = reader.read(0, param);
+        assertEquals(0xFF0000, imageRed.getRGB(50, 50) & 0xFFFFFF);
+        
+        TestData blueSquare = new TestData(getClassLoaderResource("/svg/blue-square.svg"), dim);
+        reader.setInput(blueSquare.getInputStream());
+        BufferedImage imageBlue = reader.read(0, param);
+        assertEquals(0x0000FF, imageBlue.getRGB(50, 50) & 0xFFFFFF);
+    }
 }

imageio/imageio-batik/src/test/resources/svg/blue-square.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" id="blue-square" version="1.1">
+  <g id="layer1">
+    <rect id="rect2985" width="100" height="100" x="0" y="0"
+	   style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>

imageio/imageio-batik/src/test/resources/svg/red-square.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" id="red-square" version="1.1">
+  <g id="layer1">
+    <rect id="rect2985" width="100" height="100" x="0" y="0"
+       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>