You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/05/29 19:41:51 UTC
svn commit: r1598341 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image:
LosslessFactoryTest.java ValidateXImage.java
Author: tilman
Date: Thu May 29 17:41:48 2014
New Revision: 1598341
URL: http://svn.apache.org/r1598341
Log:
PDFBOX-2057: use the correct method to get opaque image
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java?rev=1598341&r1=1598340&r2=1598341&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java Thu May 29 17:41:48 2014
@@ -26,6 +26,8 @@ import java.io.IOException;
import java.util.Random;
import javax.imageio.ImageIO;
import junit.framework.TestCase;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
@@ -135,7 +137,7 @@ public class LosslessFactoryTest extends
PDImageXObject ximage = LosslessFactory.createFromImage(document, argbImage);
validate(ximage, 8, 344, 287, "png", PDDeviceRGB.INSTANCE.getName());
checkIdent(argbImage, ximage.getImage());
- checkIdentRGB(argbImage, SampledImageReader.getRGBImage(ximage, null));
+ checkIdentRGB(argbImage, ximage.getOpaqueImage());
assertNotNull(ximage.getSoftMask());
validate(ximage.getSoftMask(), 8, 344, 287, "png", PDDeviceGray.INSTANCE.getName());
@@ -197,7 +199,7 @@ public class LosslessFactoryTest extends
validate(ximage, 8, w, h, "png", PDDeviceRGB.INSTANCE.getName());
checkIdent(argbImage, ximage.getImage());
- checkIdentRGB(argbImage, SampledImageReader.getRGBImage(ximage, null));
+ checkIdentRGB(argbImage, ximage.getOpaqueImage());
assertNotNull(ximage.getSoftMask());
validate(ximage.getSoftMask(), 8, w, h, "png", PDDeviceGray.INSTANCE.getName());
@@ -316,7 +318,7 @@ public class LosslessFactoryTest extends
PDImageXObject ximage = LosslessFactory.createFromImage(document, argbImage);
validate(ximage, 8, width, height, "png", PDDeviceRGB.INSTANCE.getName());
checkIdent(argbImage, ximage.getImage());
- checkIdentRGB(argbImage, SampledImageReader.getRGBImage(ximage, null));
+ checkIdentRGB(argbImage, ximage.getOpaqueImage());
assertNotNull(ximage.getSoftMask());
validate(ximage.getSoftMask(), 1, width, height, "png", PDDeviceGray.INSTANCE.getName());
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java?rev=1598341&r1=1598340&r2=1598341&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java Thu May 29 17:41:48 2014
@@ -61,7 +61,7 @@ public class ValidateXImage
boolean writeOk = ImageIOUtil.writeImage(ximage.getImage(),
format, new NullOutputStream());
assertTrue(writeOk);
- writeOk = ImageIOUtil.writeImage(SampledImageReader.getRGBImage(ximage, null),
+ writeOk = ImageIOUtil.writeImage(ximage.getOpaqueImage(),
format, new NullOutputStream());
assertTrue(writeOk);
}