Author: tilman
Date: Mon Sep 7 08:23:09 2026
New Revision: 1937954
Log:
PDFBOX-5876: add test for PDFBOX-5657
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Mon Sep 7 08:23:05 2026 (r1937953)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Mon Sep 7 08:23:09 2026 (r1937954)
@@ -1075,4 +1075,14 @@ public final class PDImageXObject extend
{
getCOSObject().setItem(COSName.OC, oc);
}
+
+ /**
+ * Use for tests only.
+ *
+ * @return
+ */
+ BufferedImage getJpxSMask()
+ {
+ return jpxSMask;
+ }
}
Modified:
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java
Mon Sep 7 08:23:05 2026 (r1937953)
+++
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java
Mon Sep 7 08:23:09 2026 (r1937954)
@@ -24,6 +24,8 @@ import java.awt.image.ColorModel;
import java.awt.image.WritableRaster;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -32,8 +34,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.pdmodel.PDDocument;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -144,6 +150,28 @@ class PDImageXObjectTest
testCompareCreatedFromByteArrayWithCreatedByCustomFactory("lzw.tif");
}
+ /**
+ * PDFBOX-5657: test SMaskInData feature.
+ *
+ * @throws IOException
+ */
+ @Test
+ void testJPXSMaskInData() throws IOException
+ {
+ try (PDDocument doc = Loader.loadPDF(new
File("target/pdfs","PDFBOX-5657-PDFJS-16782-SMaskInData.pdf")))
+ {
+ PDImageXObject img = (PDImageXObject)
doc.getPage(0).getResources().getXObject(COSName.getPDFName("image"));
+ assertTrue(img.getCOSObject().getInt(COSName.SMASK_IN_DATA) > 0);
+ assertNull(img.getMask());
+ assertNull(img.getSoftMask());
+ assertEquals(3,
img.getOpaqueImage().getColorModel().getNumComponents());
+ assertEquals(4, img.getImage().getColorModel().getNumComponents());
+ BufferedImage jpxSMask = img.getJpxSMask();
+ assertEquals(1258, jpxSMask.getWidth());
+ assertEquals(711, jpxSMask.getHeight());
+ }
+ }
+
private void
testCompareCreatedFileByExtensionWithCreatedByLosslessFactory(String filename)
throws IOException, URISyntaxException
{