svn commit: r1565548 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Author: tilman
Date: Fri Feb 7 06:19:54 2014
New Revision: 1565548
URL: http://svn.apache.org/r1565548
Log:
PDFBOX-1880: Type 1 Shading must not ignore current transformation matrix
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1565548&r1=1565547&r2=1565548&view=diff
==
---
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
(original)
+++
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Fri Feb 7 06:19:54 2014
@@ -121,9 +121,11 @@ class Type1ShadingContext implements Pai
try
{
-// get inverse transform to be independent of current user /
device space
+// get inverse transform to be independent of
+// shading matrix and current user / device space
// when handling actual pixels in getRaster()
rat = matrix.createAffineTransform().createInverse();
+
rat.concatenate(currentTransformationMatrix.createAffineTransform().createInverse());
rat.concatenate(xform.createInverse());
}
catch (NoninvertibleTransformException ex)
svn commit: r1565545 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Author: tilman
Date: Fri Feb 7 06:14:06 2014
New Revision: 1565545
URL: http://svn.apache.org/r1565545
Log:
PDFBOX-1880: Type 1 Shading must not ignore current transformation matrix
Task #PDFBOX-1880 - [PATCH] Type 1 Shading must not ignore current
transformation matrix
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1565545&r1=1565544&r2=1565545&view=diff
==
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Fri Feb 7 06:14:06 2014
@@ -121,9 +121,11 @@ class Type1ShadingContext implements Pai
try
{
-// get inverse transform to be independent of current user /
device space
+// get inverse transform to be independent of
+// shading matrix and current user / device space
// when handling actual pixels in getRaster()
rat = matrix.createAffineTransform().createInverse();
+
rat.concatenate(currentTransformationMatrix.createAffineTransform().createInverse());
rat.concatenate(xform.createInverse());
}
catch (NoninvertibleTransformException ex)
svn commit: r1565412 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Author: tilman
Date: Thu Feb 6 19:15:16 2014
New Revision: 1565412
URL: http://svn.apache.org/r1565412
Log:
PDFBOX-1888: close ImageInputStream as suggested by Tim Cameron
Task #PDFBOX-1888 - JBIG2Filter is creating an ImageInputStream (with temp
file) and not closing it
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java?rev=1565412&r1=1565411&r2=1565412&view=diff
==
---
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
(original)
+++
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Thu Feb 6 19:15:16 2014
@@ -28,6 +28,7 @@ import java.util.Iterator;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -76,15 +77,15 @@ public class JBIG2Filter implements Filt
{
st = (COSStream)
decodeP.getDictionaryObject(COSName.JBIG2_GLOBALS);
}
-if(st != null)
+if (st != null)
{
-reader.setInput(ImageIO.createImageInputStream(new
SequenceInputStream(st.getFilteredStream(),compressedData)));
-}
-else
-{
-reader.setInput(ImageIO.createImageInputStream(compressedData));
+compressedData = new SequenceInputStream(st.getFilteredStream(),
+compressedData);
}
+ImageInputStream iis = ImageIO.createImageInputStream(compressedData);
+reader.setInput(iis);
BufferedImage bi = reader.read(0);
+iis.close();
reader.dispose();
if ( bi != null )
{
svn commit: r1565392 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Author: tilman
Date: Thu Feb 6 18:51:50 2014
New Revision: 1565392
URL: http://svn.apache.org/r1565392
Log:
PDFBOX-1888 close ImageInputStream as suggested by Tim Cameron
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java?rev=1565392&r1=1565391&r2=1565392&view=diff
==
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Thu Feb 6 18:51:50 2014
@@ -28,6 +28,7 @@ import java.util.Iterator;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -79,14 +80,13 @@ public class JBIG2Filter implements Filt
}
if (st != null)
{
-reader.setInput(ImageIO.createImageInputStream(new
SequenceInputStream(st.getFilteredStream(),
-compressedData)));
-}
-else
-{
-reader.setInput(ImageIO.createImageInputStream(compressedData));
+compressedData = new SequenceInputStream(st.getFilteredStream(),
+compressedData);
}
+ImageInputStream iis = ImageIO.createImageInputStream(compressedData);
+reader.setInput(iis);
BufferedImage bi = reader.read(0);
+iis.close();
reader.dispose();
if (bi != null)
{
