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/02/28 11:15:28 UTC
svn commit: r1825549 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/afm/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/
pdfbox/src/main/java/org/apache/pdfbox/rendering/
Author: msahyoun
Date: Wed Feb 28 11:15:28 2018
New Revision: 1825549
URL: http://svn.apache.org/viewvc?rev=1825549&view=rev
Log:
PDFBOX-4118: retain exception in log message; use LOG.debug for ignored exceptions
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java?rev=1825549&r1=1825548&r2=1825549&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java Wed Feb 28 11:15:28 2018
@@ -111,7 +111,7 @@ public class FontMetrics
if( metric != null )
{
result = metric.getWy();
- if( result == 0 )
+ if( Float.compare(result, 0) == 0 )
{
result = metric.getBoundingBox().getHeight();
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java?rev=1825549&r1=1825548&r2=1825549&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java Wed Feb 28 11:15:28 2018
@@ -1194,6 +1194,7 @@ public final class StandardSecurityHandl
}
catch (NoSuchAlgorithmException ex)
{
+ LOG.debug("AES Algorithm not available", ex);
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1825549&r1=1825548&r2=1825549&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Wed Feb 28 11:15:28 2018
@@ -386,6 +386,7 @@ final class FileSystemFontProvider exten
}
catch (SecurityException e)
{
+ LOG.debug("Error checking for file existence", e);
}
if (fileExists)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1825549&r1=1825548&r2=1825549&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Wed Feb 28 11:15:28 2018
@@ -1388,6 +1388,7 @@ public class PageDrawer extends PDFGraph
}
catch (IOException ex)
{
+ LOG.debug("Couldn't get an alternate ColorSpace", ex);
return false;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java?rev=1825549&r1=1825548&r2=1825549&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java Wed Feb 28 11:15:28 2018
@@ -29,6 +29,10 @@ import java.awt.image.ColorModel;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.pdfbox.pdmodel.common.function.PDFunction;
import org.apache.pdfbox.pdmodel.common.function.PDFunctionTypeIdentity;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
@@ -43,6 +47,9 @@ import org.apache.pdfbox.pdmodel.graphic
*/
class SoftMask implements Paint
{
+
+ private static final Log LOG = LogFactory.getLog(SoftMask.class);
+
private static final ColorModel ARGB_COLOR_MODEL =
new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getColorModel();
@@ -86,6 +93,7 @@ class SoftMask implements Paint
catch (IOException ex)
{
// keep default
+ LOG.debug("Couldn't convert backdropColor to RGB - keeping default", ex);
}
}
}
@@ -183,6 +191,7 @@ class SoftMask implements Paint
catch (IOException ex)
{
// ignore exception, treat as outside
+ LOG.debug("Couldn't apply transferFunction - treating as outside", ex);
pixelOutput[3] = Math.round(pixelOutput[3] * (bc / 255f));
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java?rev=1825549&r1=1825548&r2=1825549&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java Wed Feb 28 11:15:28 2018
@@ -20,6 +20,10 @@ import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.Map;
import java.util.WeakHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -33,6 +37,8 @@ import org.apache.pdfbox.util.Matrix;
*/
class TilingPaintFactory
{
+ private static final Log LOG = LogFactory.getLog(TilingPaintFactory.class);
+
private final PageDrawer drawer;
private final Map<TilingPaintParameter, WeakReference<TilingPaint>> weakCache
= new WeakHashMap<>();
@@ -129,6 +135,7 @@ class TilingPaintFactory
}
catch (IOException ex)
{
+ LOG.debug("Couldn't convert color to RGB - treating as not equal", ex);
return false;
}
return !(this.xform != other.xform && (this.xform == null || !this.xform.equals(other.xform)));