Skip to content

Commit f08badf

Browse files
THausherrTHausherr
committed
PDFBOX-6164: add fillorder 2, as suggested by Alexander Pinske
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1931674 13f79535-47bb-0310-9956-ffa450edef68
1 parent 205b190 commit f08badf

2 files changed

Lines changed: 83 additions & 2 deletions

File tree

‎pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ private static void extractFromTiff(RandomAccessRead reader,
297297

298298
int dataoffset = 0;
299299
int datalength = 0;
300+
int fillorder = 1;
300301

301302
for (int i = 0; i < numtags; i++)
302303
{
@@ -358,10 +359,12 @@ private static void extractFromTiff(RandomAccessRead reader,
358359
}
359360
case 266:
360361
{
361-
if (val != 1)
362+
// http://www.awaresystems.be/imaging/tiff/tifftags/fillorder.html
363+
if (val != 1 && val != 2)
362364
{
363365
throw new IOException("FillOrder " + val + " is not supported");
364366
}
367+
fillorder = val;
365368
break;
366369
}
367370
case 273:
@@ -448,9 +451,15 @@ private static void extractFromTiff(RandomAccessRead reader,
448451
while ((amountRead = reader.read(buf, 0, Math.min(8192, datalength))) > 0)
449452
{
450453
datalength -= amountRead;
454+
if (fillorder == 2)
455+
{
456+
for (int x = 0; x < amountRead; x++)
457+
{
458+
buf[x] = fliptable[buf[x] & 0xFF];
459+
}
460+
}
451461
os.write(buf, 0, amountRead);
452462
}
453-
454463
}
455464
}
456465

@@ -471,4 +480,40 @@ private static int readlong(char endianess, RandomAccessRead raf) throws IOExcep
471480
}
472481
return (raf.read() << 24) | (raf.read() << 16) | (raf.read() << 8) | raf.read();
473482
}
483+
484+
private static final byte[] fliptable = new byte[]
485+
{
486+
(byte) 0x00, (byte) 0x80, (byte) 0x40, (byte) 0xc0, (byte) 0x20, (byte) 0xa0, (byte) 0x60, (byte) 0xe0,
487+
(byte) 0x10, (byte) 0x90, (byte) 0x50, (byte) 0xd0, (byte) 0x30, (byte) 0xb0, (byte) 0x70, (byte) 0xf0,
488+
(byte) 0x08, (byte) 0x88, (byte) 0x48, (byte) 0xc8, (byte) 0x28, (byte) 0xa8, (byte) 0x68, (byte) 0xe8,
489+
(byte) 0x18, (byte) 0x98, (byte) 0x58, (byte) 0xd8, (byte) 0x38, (byte) 0xb8, (byte) 0x78, (byte) 0xf8,
490+
(byte) 0x04, (byte) 0x84, (byte) 0x44, (byte) 0xc4, (byte) 0x24, (byte) 0xa4, (byte) 0x64, (byte) 0xe4,
491+
(byte) 0x14, (byte) 0x94, (byte) 0x54, (byte) 0xd4, (byte) 0x34, (byte) 0xb4, (byte) 0x74, (byte) 0xf4,
492+
(byte) 0x0c, (byte) 0x8c, (byte) 0x4c, (byte) 0xcc, (byte) 0x2c, (byte) 0xac, (byte) 0x6c, (byte) 0xec,
493+
(byte) 0x1c, (byte) 0x9c, (byte) 0x5c, (byte) 0xdc, (byte) 0x3c, (byte) 0xbc, (byte) 0x7c, (byte) 0xfc,
494+
(byte) 0x02, (byte) 0x82, (byte) 0x42, (byte) 0xc2, (byte) 0x22, (byte) 0xa2, (byte) 0x62, (byte) 0xe2,
495+
(byte) 0x12, (byte) 0x92, (byte) 0x52, (byte) 0xd2, (byte) 0x32, (byte) 0xb2, (byte) 0x72, (byte) 0xf2,
496+
(byte) 0x0a, (byte) 0x8a, (byte) 0x4a, (byte) 0xca, (byte) 0x2a, (byte) 0xaa, (byte) 0x6a, (byte) 0xea,
497+
(byte) 0x1a, (byte) 0x9a, (byte) 0x5a, (byte) 0xda, (byte) 0x3a, (byte) 0xba, (byte) 0x7a, (byte) 0xfa,
498+
(byte) 0x06, (byte) 0x86, (byte) 0x46, (byte) 0xc6, (byte) 0x26, (byte) 0xa6, (byte) 0x66, (byte) 0xe6,
499+
(byte) 0x16, (byte) 0x96, (byte) 0x56, (byte) 0xd6, (byte) 0x36, (byte) 0xb6, (byte) 0x76, (byte) 0xf6,
500+
(byte) 0x0e, (byte) 0x8e, (byte) 0x4e, (byte) 0xce, (byte) 0x2e, (byte) 0xae, (byte) 0x6e, (byte) 0xee,
501+
(byte) 0x1e, (byte) 0x9e, (byte) 0x5e, (byte) 0xde, (byte) 0x3e, (byte) 0xbe, (byte) 0x7e, (byte) 0xfe,
502+
(byte) 0x01, (byte) 0x81, (byte) 0x41, (byte) 0xc1, (byte) 0x21, (byte) 0xa1, (byte) 0x61, (byte) 0xe1,
503+
(byte) 0x11, (byte) 0x91, (byte) 0x51, (byte) 0xd1, (byte) 0x31, (byte) 0xb1, (byte) 0x71, (byte) 0xf1,
504+
(byte) 0x09, (byte) 0x89, (byte) 0x49, (byte) 0xc9, (byte) 0x29, (byte) 0xa9, (byte) 0x69, (byte) 0xe9,
505+
(byte) 0x19, (byte) 0x99, (byte) 0x59, (byte) 0xd9, (byte) 0x39, (byte) 0xb9, (byte) 0x79, (byte) 0xf9,
506+
(byte) 0x05, (byte) 0x85, (byte) 0x45, (byte) 0xc5, (byte) 0x25, (byte) 0xa5, (byte) 0x65, (byte) 0xe5,
507+
(byte) 0x15, (byte) 0x95, (byte) 0x55, (byte) 0xd5, (byte) 0x35, (byte) 0xb5, (byte) 0x75, (byte) 0xf5,
508+
(byte) 0x0d, (byte) 0x8d, (byte) 0x4d, (byte) 0xcd, (byte) 0x2d, (byte) 0xad, (byte) 0x6d, (byte) 0xed,
509+
(byte) 0x1d, (byte) 0x9d, (byte) 0x5d, (byte) 0xdd, (byte) 0x3d, (byte) 0xbd, (byte) 0x7d, (byte) 0xfd,
510+
(byte) 0x03, (byte) 0x83, (byte) 0x43, (byte) 0xc3, (byte) 0x23, (byte) 0xa3, (byte) 0x63, (byte) 0xe3,
511+
(byte) 0x13, (byte) 0x93, (byte) 0x53, (byte) 0xd3, (byte) 0x33, (byte) 0xb3, (byte) 0x73, (byte) 0xf3,
512+
(byte) 0x0b, (byte) 0x8b, (byte) 0x4b, (byte) 0xcb, (byte) 0x2b, (byte) 0xab, (byte) 0x6b, (byte) 0xeb,
513+
(byte) 0x1b, (byte) 0x9b, (byte) 0x5b, (byte) 0xdb, (byte) 0x3b, (byte) 0xbb, (byte) 0x7b, (byte) 0xfb,
514+
(byte) 0x07, (byte) 0x87, (byte) 0x47, (byte) 0xc7, (byte) 0x27, (byte) 0xa7, (byte) 0x67, (byte) 0xe7,
515+
(byte) 0x17, (byte) 0x97, (byte) 0x57, (byte) 0xd7, (byte) 0x37, (byte) 0xb7, (byte) 0x77, (byte) 0xf7,
516+
(byte) 0x0f, (byte) 0x8f, (byte) 0x4f, (byte) 0xcf, (byte) 0x2f, (byte) 0xaf, (byte) 0x6f, (byte) 0xef,
517+
(byte) 0x1f, (byte) 0x9f, (byte) 0x5f, (byte) 0xdf, (byte) 0x3f, (byte) 0xbf, (byte) 0x7f, (byte) 0xff,
518+
};
474519
}

‎pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616
package org.apache.pdfbox.pdmodel.graphics.image;
1717

1818
import java.awt.image.BufferedImage;
19+
import java.io.ByteArrayInputStream;
1920

2021
import java.io.File;
2122
import java.io.IOException;
23+
import java.net.MalformedURLException;
24+
import java.net.URI;
25+
import java.net.URISyntaxException;
2226

2327
import java.nio.file.Files;
2428
import java.nio.file.StandardCopyOption;
@@ -273,4 +277,36 @@ void testByteShortPaddedWithGarbage() throws IOException
273277
}
274278
}
275279
}
280+
281+
/**
282+
* PDFBOX-6164: test support of TIFF-files with FillOrder=2
283+
*
284+
* @throws MalformedURLException
285+
* @throws IOException
286+
* @throws URISyntaxException
287+
*/
288+
@Test
289+
void testFillOrder2() throws MalformedURLException, IOException, URISyntaxException
290+
{
291+
byte[] ba = new URI("https://issues.apache.org/jira/secure/attachment/12558110/Wing.tif").
292+
toURL().openStream().readAllBytes();
293+
PDDocument document = new PDDocument();
294+
PDImageXObject ximg = CCITTFactory.createFromByteArray(document, ba);
295+
296+
validate(ximg, 1, 4575, 2232, "tiff", PDDeviceGray.INSTANCE.getName());
297+
BufferedImage bim = ImageIO.read(new ByteArrayInputStream(ba));
298+
checkIdent(bim, ximg.getOpaqueImage(null, 1));
299+
PDPage page = new PDPage(PDRectangle.A4);
300+
document.addPage(page);
301+
try (PDPageContentStream contentStream = new PDPageContentStream(document, page, AppendMode.APPEND, false))
302+
{
303+
contentStream.drawImage(ximg, 0, 0, ximg.getWidth() / 8, ximg.getHeight() / 8);
304+
}
305+
document.save(TESTRESULTSDIR + "/Wing.pdf");
306+
document.close();
307+
308+
document = Loader.loadPDF(new File(TESTRESULTSDIR, "Wing.pdf"));
309+
assertEquals(1, document.getNumberOfPages());
310+
document.close();
311+
}
276312
}

0 commit comments

Comments
 (0)