You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2018/03/29 10:35:42 UTC
svn commit: r1827970 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
multipdf/PDFMergerUtility.java pdmodel/interactive/form/PDAcroForm.java
Author: msahyoun
Date: Thu Mar 29 10:35:42 2018
New Revision: 1827970
URL: http://svn.apache.org/viewvc?rev=1827970&view=rev
Log:
PDFBOX-4157, PDFBOX-4172: adjust resolveNeedsTranslation to only resolve to false if PDFormXObject already has translation
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1827970&r1=1827969&r2=1827970&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Thu Mar 29 10:35:42 2018
@@ -288,7 +288,16 @@ public class PDFMergerUtility
{
for (InputStream sourceInputStream : sources)
{
- PDDocument sourceDoc = PDDocument.load(sourceInputStream, partitionedMemSetting);
+ PDDocument sourceDoc = null;
+ try
+ {
+ sourceDoc = PDDocument.load(sourceInputStream, partitionedMemSetting);
+ }
+ catch (IOException ioe)
+ {
+ LOG.error("Couldn't load source document", ioe);
+ firstException = ioe;
+ }
tobeclosed.add(sourceDoc);
appendDocument(destination, sourceDoc);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java?rev=1827970&r1=1827969&r2=1827970&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java Thu Mar 29 10:35:42 2018
@@ -711,7 +711,7 @@ public final class PDAcroForm implements
*/
private boolean resolveNeedsTranslation(PDAppearanceStream appearanceStream)
{
- boolean needsTranslation = false;
+ boolean needsTranslation = true;
PDResources resources = appearanceStream.getResources();
if (resources != null && resources.getXObjectNames().iterator().hasNext())
@@ -731,9 +731,9 @@ public final class PDAcroForm implements
PDRectangle bbox = ((PDFormXObject)xObject).getBBox();
float llX = bbox.getLowerLeftX();
float llY = bbox.getLowerLeftY();
- if (Float.compare(llX, 0) == 0 && Float.compare(llY, 0) == 0)
+ if (Float.compare(llX, 0) != 0 && Float.compare(llY, 0) != 0)
{
- needsTranslation = true;
+ needsTranslation = false;
}
}
}