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/08 19:06:56 UTC
svn commit: r1593333 -
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java
Author: tilman
Date: Thu May 8 17:06:56 2014
New Revision: 1593333
URL: http://svn.apache.org/r1593333
Log:
PDFBOX-2067: added test for TYPE_4BYTE_ABGR
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java?rev=1593333&r1=1593332&r2=1593333&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java Thu May 8 17:06:56 2014
@@ -107,7 +107,7 @@ public class JPEGFactoryTest extends Tes
* Tests ARGB JPEGFactory#createFromImage(PDDocument document, BufferedImage
* image)
*/
- public void testCreateFromImageARGB() throws IOException
+ public void testCreateFromImageINT_ARGB() throws IOException
{
PDDocument document = new PDDocument();
BufferedImage image = ImageIO.read(JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"));
@@ -149,4 +149,49 @@ public class JPEGFactoryTest extends Tes
document.close();
}
+ /**
+ * Tests ARGB JPEGFactory#createFromImage(PDDocument document, BufferedImage
+ * image)
+ */
+ public void testCreateFromImage4BYTE_ABGR() throws IOException
+ {
+ PDDocument document = new PDDocument();
+ BufferedImage image = ImageIO.read(JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"));
+
+ // create an ARGB image
+ int width = image.getWidth();
+ int height = image.getHeight();
+ BufferedImage argbImage = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR);
+ Graphics ag = argbImage.getGraphics();
+ ag.drawImage(image, 0, 0, null);
+ ag.dispose();
+
+ for (int x = 0; x < argbImage.getWidth(); ++x)
+ {
+ for (int y = 0; y < argbImage.getHeight(); ++y)
+ {
+ argbImage.setRGB(x, y, (argbImage.getRGB(x, y) & 0xFFFFFF) | ((y / 10 * 10) << 24));
+ }
+ }
+
+ PDImageXObject ximage = JPEGFactory.createFromImage(document, argbImage);
+ validate(ximage, 8, width, height, "jpg", PDDeviceRGB.INSTANCE.getName());
+ assertNotNull(ximage.getSoftMask());
+ validate(ximage.getSoftMask(), 8, width, height, "jpg", PDDeviceGray.INSTANCE.getName());
+
+ // This part isn't really needed because this test doesn't break
+ // if the mask has the wrong colorspace (PDFBOX-2057), but it is still useful
+ // if something goes wrong in the future and we want to have a PDF to open.
+ PDPage page = new PDPage();
+ document.addPage(page);
+ PDPageContentStream contentStream = new PDPageContentStream(document, page, true, false);
+ contentStream.drawXObject(ximage, 150, 300, ximage.getWidth(), ximage.getHeight());
+ contentStream.drawXObject(ximage, 200, 350, ximage.getWidth(), ximage.getHeight());
+ contentStream.close();
+ File pdfFile = new File(testResultsDir, "jpeg-4bargb.pdf");
+ document.save(pdfFile);
+ document.close();
+ document = PDDocument.loadNonSeq(pdfFile, null);
+ document.close();
+ }
}