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/20 11:22:43 UTC
svn commit: r1824853 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox: cff/DataInput.java
cff/Type1CharString.java ttf/OpenTypeScript.java ttf/TrueTypeFont.java
util/autodetect/NativeFontDirFinder.java
util/autodetect/WindowsFontDirFinder.java
Author: msahyoun
Date: Tue Feb 20 11:22:42 2018
New Revision: 1824853
URL: http://svn.apache.org/viewvc?rev=1824853&view=rev
Log:
PDFBOX-4118: retain exception in log message; use LOG.debug for handled exceptions
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/DataInput.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/NativeFontDirFinder.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/WindowsFontDirFinder.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/DataInput.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/DataInput.java?rev=1824853&r1=1824852&r2=1824853&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/DataInput.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/DataInput.java Tue Feb 20 11:22:42 2018
@@ -19,6 +19,9 @@ package org.apache.fontbox.cff;
import java.io.EOFException;
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.fontbox.util.Charsets;
/**
@@ -32,6 +35,8 @@ public class DataInput
private byte[] inputBuffer = null;
private int bufferPosition = 0;
+ private static final Log LOG = LogFactory.getLog(DataInput.class);
+
/**
* Constructor.
* @param buffer the buffer to be read
@@ -93,6 +98,7 @@ public class DataInput
}
catch (RuntimeException re)
{
+ LOG.debug("An error occured reading a byte - returning -1", re);
return -1;
}
}
@@ -199,6 +205,7 @@ public class DataInput
}
catch (RuntimeException re)
{
+ LOG.debug("An error occured reading an int - returning -1", re);
return -1;
}
}
@@ -212,6 +219,7 @@ public class DataInput
}
catch (RuntimeException re)
{
+ LOG.debug("An error occured peeking at offset " + offset + " - returning -1", re);
return -1;
}
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java?rev=1824853&r1=1824852&r2=1824853&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java Tue Feb 20 11:22:42 2018
@@ -490,7 +490,7 @@ public class Type1CharString
}
catch (IOException e)
{
- LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName);
+ LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName, e);
}
// accent character
String accentName = StandardEncoding.INSTANCE.getName(achar.intValue());
@@ -504,7 +504,7 @@ public class Type1CharString
}
catch (IOException e)
{
- LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName);
+ LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName, e);
}
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java?rev=1824853&r1=1824852&r2=1824853&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java Tue Feb 20 11:22:42 2018
@@ -234,7 +234,7 @@ public final class OpenTypeScript
catch (IOException e)
{
LOG.warn("Could not parse Scripts.txt, mirroring char map will be empty: "
- + e.getMessage());
+ + e.getMessage(), e);
}
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1824853&r1=1824852&r2=1824853&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Tue Feb 20 11:22:42 2018
@@ -30,6 +30,9 @@ import java.util.Map;
import org.apache.fontbox.FontBoxFont;
import org.apache.fontbox.util.BoundingBox;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* A TrueType font file.
*
@@ -37,6 +40,9 @@ import org.apache.fontbox.util.BoundingB
*/
public class TrueTypeFont implements FontBoxFont, Closeable
{
+
+ private static final Log LOG = LogFactory.getLog(TrueTypeFont.class);
+
private float version;
private int numberOfGlyphs = -1;
private int unitsPerEm = -1;
@@ -777,6 +783,7 @@ public class TrueTypeFont implements Fon
}
catch (IOException e)
{
+ LOG.debug("Error getting the NamingTable for the font", e);
return "(null - " + e.getMessage() + ")";
}
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/NativeFontDirFinder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/NativeFontDirFinder.java?rev=1824853&r1=1824852&r2=1824853&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/NativeFontDirFinder.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/NativeFontDirFinder.java Tue Feb 20 11:22:42 2018
@@ -20,6 +20,9 @@ package org.apache.fontbox.util.autodete
import java.io.File;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Native font finder base class. This class is based on a class provided by Apache FOP. see
* org.apache.fop.fonts.autodetect.NativeFontDirFinder
@@ -27,6 +30,8 @@ import java.util.List;
public abstract class NativeFontDirFinder implements FontDirFinder
{
+ private static final Log LOG = LogFactory.getLog(NativeFontDirFinder.class);
+
/**
* Generic method used by Mac and Unix font finders.
*
@@ -51,6 +56,7 @@ public abstract class NativeFontDirFinde
}
catch (SecurityException e)
{
+ LOG.debug("Couldn't get native font directories - ignoring", e);
// should continue if this fails
}
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/WindowsFontDirFinder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/WindowsFontDirFinder.java?rev=1824853&r1=1824852&r2=1824853&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/WindowsFontDirFinder.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/WindowsFontDirFinder.java Tue Feb 20 11:22:42 2018
@@ -23,6 +23,9 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.fontbox.util.Charsets;
/**
@@ -32,6 +35,8 @@ import org.apache.fontbox.util.Charsets;
public class WindowsFontDirFinder implements FontDirFinder
{
+ private static final Log LOG = LogFactory.getLog(WindowsFontDirFinder.class);
+
/**
* Attempts to read windir environment variable on windows (disclaimer: This is a bit dirty but seems to work
* nicely).
@@ -71,6 +76,7 @@ public class WindowsFontDirFinder implem
}
catch (SecurityException e)
{
+ LOG.debug("Couldn't get Windows font directories - ignoring", e);
// should continue if this fails
}
String osName = System.getProperty("os.name");
@@ -82,6 +88,7 @@ public class WindowsFontDirFinder implem
}
catch (IOException | SecurityException e)
{
+ LOG.debug("Couldn't get Windows font directories - ignoring", e);
// should continue if this fails
}
}
@@ -123,6 +130,7 @@ public class WindowsFontDirFinder implem
}
catch (SecurityException e)
{
+ LOG.debug("Couldn't get Windows font directories - ignoring", e);
// should continue if this fails
}
}
@@ -140,6 +148,7 @@ public class WindowsFontDirFinder implem
}
catch (SecurityException e)
{
+ LOG.debug("Couldn't get Windows font directories - ignoring", e);
// should continue if this fails
}
}