Fix deprecation warnings
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1896579 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/FontContainer.java b/src/java/org/apache/fop/render/pdf/pdfbox/FontContainer.java
index fb98c0e..26dc0a3 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/FontContainer.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/FontContainer.java
@@ -74,7 +74,7 @@
// embedded CMap
InputStream input = null;
try {
- input = ((COSStream)base).getUnfilteredStream();
+ input = ((COSStream)base).createInputStream();
CMapParser parser = new CMapParser();
return parser.parse(input);
} finally {
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterUtil.java b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterUtil.java
index f3f625d..fdeffc6 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterUtil.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterUtil.java
@@ -71,7 +71,7 @@
}
sb.append("}");
if (base instanceof COSStream) {
- InputStream stream = ((COSStream)base).getFilteredStream();
+ InputStream stream = ((COSStream)base).createRawInputStream();
byte[] b = IOUtils.toByteArray(stream);
sb.append("COSStream{").append(Arrays.hashCode(b)).append("}");
}
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java b/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java
index 7d48472..c518dcb 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PDFCloner.java
@@ -178,15 +178,15 @@
PDFStream stream = new PDFStream();
if (adapter.pdfDoc.isEncryptionActive() && originalStream.getItem(COSName.FILTER) == COSName.DCT_DECODE) {
stream.getFilterList().addFilter(new DCTFilter());
- in = originalStream.getFilteredStream();
+ in = originalStream.createRawInputStream();
filter = Collections.EMPTY_SET;
} else if (adapter.pdfDoc.isEncryptionActive()
|| (originalStream.containsKey(COSName.DECODE_PARMS) && !originalStream.containsKey(COSName.FILTER))) {
- in = originalStream.getUnfilteredStream();
+ in = originalStream.createInputStream();
filter = adapter.FILTER_FILTER;
} else {
//transfer encoded data (don't reencode)
- in = originalStream.getFilteredStream();
+ in = originalStream.createRawInputStream();
filter = Collections.EMPTY_SET;
}
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2D.java b/src/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2D.java
index ef2f6b2..ba6b455 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2D.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2D.java
@@ -235,7 +235,7 @@
int bits = ((COSInteger)s.getDictionaryObject(COSName.BITS_PER_SAMPLE)).intValue();
COSArray size = (COSArray) s.getDictionaryObject(COSName.SIZE);
COSArray encode = getEncode(s);
- byte[] x = IOUtils.toByteArray(stream.getUnfilteredStream());
+ byte[] x = IOUtils.toByteArray(stream.createInputStream());
for (byte y : x) {
if (y != 0) {
return new Function(floatArrayToDoubleList(domain.toFloatArray()),
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java b/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java
index 871bd1f..0cb4588 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java
@@ -37,6 +37,7 @@
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.AbstractImagePreloader;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.io.XmlSourceUtil;
import org.apache.xmlgraphics.util.io.SubInputStream;
import org.apache.fop.datatypes.URISpecification;
@@ -172,12 +173,12 @@
}
public PDDocument make() throws Exception {
- final InputStream in = ImageUtil.needInputStream(src);
+ final InputStream in = XmlSourceUtil.needInputStream(src);
try {
PDDocument pddoc = PDDocument.load(new SubInputStream(in, Integer.MAX_VALUE));
return Interceptors.getInstance().interceptOnLoad(pddoc, docURI);
} finally {
- ImageUtil.closeQuietly(src);
+ XmlSourceUtil.closeQuietly(src);
}
}
};
