Skip to content

Commit

Permalink
Add dependency on Sanselan (Apache Commons Imaging). Remove old custo…
Browse files Browse the repository at this point in the history
…m BMP, GIF, PNG, TIF and JBIG image codecs.
  • Loading branch information
andreasrosdal committed Aug 4, 2018
1 parent 9519b6e commit 44f32ae
Show file tree
Hide file tree
Showing 11 changed files with 189 additions and 3,630 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ https://groups.google.com/d/forum/openpdf
- Apache Commons IO
- Apache Commons Compress
- Apache Commons Text
- Sanselan (Apache Commons Imaging)
- RxJava
- PDFRenderer
- DOM4j
Expand Down
6 changes: 6 additions & 0 deletions openpdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@
<commons-text.version>1.4</commons-text.version>
<commons-compress.version>1.17</commons-compress.version>
<commons-io.version>2.6</commons-io.version>
<sanselan.version>0.97-incubator</sanselan.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.sanselan</groupId>
<artifactId>sanselan</artifactId>
<version>${sanselan.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
75 changes: 18 additions & 57 deletions openpdf/src/main/java/com/lowagie/text/Image.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@
import com.lowagie.text.pdf.PdfStream;
import com.lowagie.text.pdf.PdfTemplate;
import com.lowagie.text.pdf.PdfWriter;
import com.lowagie.text.pdf.RandomAccessFileOrArray;
import com.lowagie.text.pdf.codec.BmpImage;
import com.lowagie.text.pdf.codec.CCITTG4Encoder;
import com.lowagie.text.pdf.codec.GifImage;
import com.lowagie.text.pdf.codec.JBIG2Image;
import com.lowagie.text.pdf.codec.PngImage;
import io.reactivex.internal.util.ExceptionHelper;

/**
Expand Down Expand Up @@ -217,6 +212,9 @@ public abstract class Image extends Rectangle {
/** an iText attributed unique id for this image. */
protected Long mySerialId = getSerialId();

public static final int[] PNGID = {137, 80, 78, 71, 13, 10, 26, 10};


// image from file or URL

/**
Expand Down Expand Up @@ -260,9 +258,7 @@ public static Image getInstance(URL url) throws BadElementException,

is = null;
if (c1 == 'G' && c2 == 'I' && c3 == 'F') {
GifImage gif = new GifImage(url);
Image img = gif.getImage(1);
return img;
return ImageLoader.getGifImage(url);
}
if (c1 == 0xFF && c2 == 0xD8) {
return new Jpeg(url);
Expand All @@ -273,38 +269,24 @@ public static Image getInstance(URL url) throws BadElementException,
if (c1 == 0xff && c2 == 0x4f && c3 == 0xff && c4 == 0x51) {
return new Jpeg2000(url);
}
if (c1 == PngImage.PNGID[0] && c2 == PngImage.PNGID[1]
&& c3 == PngImage.PNGID[2] && c4 == PngImage.PNGID[3]) {
return PngImage.getImage(url);
if (c1 == PNGID[0] && c2 == PNGID[1]
&& c3 == PNGID[2] && c4 == PNGID[3]) {
return ImageLoader.getPngImage(url);
}
if (c1 == 0xD7 && c2 == 0xCD) {
return new ImgWMF(url);
}
if (c1 == 'B' && c2 == 'M') {
return BmpImage.getImage(url);
return ImageLoader.getBmpImage(url);
}
if ((c1 == 'M' && c2 == 'M' && c3 == 0 && c4 == 42)
|| (c1 == 'I' && c2 == 'I' && c3 == 42 && c4 == 0)) {
throw new IOException(url.toString()
+ " is not a recognized imageformat. TIFF support has been removed.");
return ImageLoader.getTiffImage(url);
}
if ( c1 == 0x97 && c2 == 'J' && c3 == 'B' && c4 == '2' &&
c5 == '\r' && c6 == '\n' && c7 == 0x1a && c8 == '\n' ) {
RandomAccessFileOrArray ra = null;
try {
if (url.getProtocol().equals("file")) {
String file = url.getFile();
file = Utilities.unEscapeURL(file);
ra = new RandomAccessFileOrArray(file);
} else
ra = new RandomAccessFileOrArray(url);
Image img = JBIG2Image.getJbig2Image(ra, 1);
img.url = url;
return img;
} finally {
if (ra != null)
ra.close();
}
throw new IOException(url.toString()
+ " is not a recognized imageformat. JBIG2 support has been removed.");
}
throw new IOException(url.toString()
+ " is not a recognized imageformat.");
Expand Down Expand Up @@ -354,8 +336,7 @@ public static Image getInstance(byte imgb[]) throws BadElementException,

is = null;
if (c1 == 'G' && c2 == 'I' && c3 == 'F') {
GifImage gif = new GifImage(imgb);
return gif.getImage(1);
return ImageLoader.getGifImage(imgb);
}
if (c1 == 0xFF && c2 == 0xD8) {
return new Jpeg(imgb);
Expand All @@ -366,20 +347,19 @@ public static Image getInstance(byte imgb[]) throws BadElementException,
if (c1 == 0xff && c2 == 0x4f && c3 == 0xff && c4 == 0x51) {
return new Jpeg2000(imgb);
}
if (c1 == PngImage.PNGID[0] && c2 == PngImage.PNGID[1]
&& c3 == PngImage.PNGID[2] && c4 == PngImage.PNGID[3]) {
return PngImage.getImage(imgb);
if (c1 == PNGID[0] && c2 == PNGID[1]
&& c3 == PNGID[2] && c4 == PNGID[3]) {
return ImageLoader.getPngImage(imgb);
}
if (c1 == 0xD7 && c2 == 0xCD) {
return new ImgWMF(imgb);
}
if (c1 == 'B' && c2 == 'M') {
return BmpImage.getImage(imgb);
return ImageLoader.getBmpImage(imgb);
}
if ((c1 == 'M' && c2 == 'M' && c3 == 0 && c4 == 42)
|| (c1 == 'I' && c2 == 'I' && c3 == 42 && c4 == 0)) {
// TIFF support has been removed.
throw new IOException(MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat"));
return ImageLoader.getTiffImage(imgb);
}
if ( c1 == 0x97 && c2 == 'J' && c3 == 'B' && c4 == '2' ) {
is = new java.io.ByteArrayInputStream(imgb);
Expand All @@ -389,26 +369,7 @@ public static Image getInstance(byte imgb[]) throws BadElementException,
int c7 = is.read();
int c8 = is.read();
if ( c5 == '\r' && c6 == '\n' && c7 == 0x1a && c8 == '\n' ) {
int file_header_flags = is.read();
int number_of_pages = -1;
if ( (file_header_flags & 0x2) == 0x2 ) {
number_of_pages = (is.read() << 24) | (is.read() << 16) | (is.read() << 8) | is.read();
}
is.close();
// a jbig2 file with a file header. the header is the only way we know here.
// embedded jbig2s don't have a header, have to create them by explicit use of Jbig2Image?
// nkerr, 2008-12-05 see also the getInstance(URL)
RandomAccessFileOrArray ra = null;
try {
ra = new RandomAccessFileOrArray(imgb);
Image img = JBIG2Image.getJbig2Image(ra, 1);
if (img.getOriginalData() == null)
img.setOriginalData(imgb);
return img;
} finally {
if (ra != null)
ra.close();
}
throw new IOException(MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat"));
}
}
throw new IOException(MessageLocalization.getComposedMessage("the.byte.array.is.not.a.recognized.imageformat"));
Expand Down
162 changes: 162 additions & 0 deletions openpdf/src/main/java/com/lowagie/text/ImageLoader.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
/*
*
* Copyright 2018 Andreas Rosdal
*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* (the "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the License.
*
* The Original Code is 'iText, a free JAVA-PDF library'.
*
* The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
* the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie.
* All Rights Reserved.
* Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
* are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
*
* Contributor(s): all the names of the contributors are added in the source code
* where applicable.
*
* Alternatively, the contents of this file may be used under the terms of the
* LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
* provisions of LGPL are applicable instead of those above. If you wish to
* allow use of your version of this file only under the terms of the LGPL
* License and not to allow others to use your version of this file under
* the MPL, indicate your decision by deleting the provisions above and
* replace them with the notice and other provisions required by the LGPL.
* If you do not delete the provisions above, a recipient may use your version
* of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the MPL as stated above or under the terms of the GNU
* Library General Public License as published by the Free Software Foundation;
* either version 2 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
* details.
*
*/

package com.lowagie.text;

import io.reactivex.internal.util.ExceptionHelper;
import org.apache.commons.io.IOUtils;
import org.apache.sanselan.common.byteSources.ByteSourceArray;
import org.apache.sanselan.formats.bmp.BmpImageParser;
import org.apache.sanselan.formats.gif.GifImageParser;
import org.apache.sanselan.formats.png.PngImageParser;
import org.apache.sanselan.formats.tiff.TiffImageParser;

import java.awt.image.BufferedImage;
import java.net.URL;
import java.util.HashMap;

/**
* Loads image files such as PNG, GIF, TIFF and BMP.
*
* @author Andreas Rosdal
*/
public class ImageLoader {

public static Image getGifImage(URL url) {
try {
byte[] imageBytes = IOUtils.toByteArray(url.openStream());
GifImageParser parser = new GifImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageBytes), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}

public static Image getTiffImage(URL url) {
try {
byte[] imageBytes = IOUtils.toByteArray(url.openStream());
TiffImageParser parser = new TiffImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageBytes), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}

public static Image getPngImage(URL url) {
try {
byte[] imageBytes = IOUtils.toByteArray(url.openStream());
PngImageParser parser = new PngImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageBytes), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}


public static Image getBmpImage(URL url) {
try {
byte[] imageBytes = IOUtils.toByteArray(url.openStream());
BmpImageParser parser = new BmpImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageBytes), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}


public static Image getGifImage(byte imageData[]) {
try {
GifImageParser parser = new GifImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageData), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}

public static Image getPngImage(byte imageData[]) {
try {
PngImageParser parser = new PngImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageData), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}

public static Image getBmpImage(byte imageData[]) {
try {
BmpImageParser parser = new BmpImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageData), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}

public static Image getTiffImage(byte imageData[]) {
try {
TiffImageParser parser = new TiffImageParser();
BufferedImage bufferedImage = parser.getBufferedImage(new ByteSourceArray(imageData), new HashMap());
return Image.getInstance(bufferedImage, null, false);

} catch (Exception e) {
throw ExceptionHelper.wrapOrThrow(e);
}
}


}

0 comments on commit 44f32ae

Please sign in to comment.