You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/08/01 16:46:01 UTC
svn commit: r1803668 -
/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
Author: tilman
Date: Tue Aug 1 16:46:01 2017
New Revision: 1803668
URL: http://svn.apache.org/viewvc?rev=1803668&view=rev
Log:
PDFBOX-2852: remove unneeded nullcheck, variable are never null
Modified:
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java?rev=1803668&r1=1803667&r2=1803668&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java Tue Aug 1 16:46:01 2017
@@ -482,34 +482,28 @@ public class Type1CharString
{
// base character
String baseName = StandardEncoding.INSTANCE.getName(bchar.intValue());
- if (baseName != null)
+ try
{
- try
- {
- Type1CharString base = font.getType1CharString(baseName);
- path.append(base.getPath().getPathIterator(null), false);
- }
- catch (IOException e)
- {
- LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName);
- }
+ Type1CharString base = font.getType1CharString(baseName);
+ path.append(base.getPath().getPathIterator(null), false);
+ }
+ catch (IOException e)
+ {
+ LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName);
}
// accent character
String accentName = StandardEncoding.INSTANCE.getName(achar.intValue());
- if (accentName != null)
+ try
{
- try
- {
- Type1CharString accent = font.getType1CharString(accentName);
- AffineTransform at = AffineTransform.getTranslateInstance(
+ Type1CharString accent = font.getType1CharString(accentName);
+ AffineTransform at = AffineTransform.getTranslateInstance(
leftSideBearing.getX() + adx.floatValue(),
leftSideBearing.getY() + ady.floatValue());
- path.append(accent.getPath().getPathIterator(at), false);
- }
- catch (IOException e)
- {
- LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName);
- }
+ path.append(accent.getPath().getPathIterator(at), false);
+ }
+ catch (IOException e)
+ {
+ LOG.warn("invalid seac character in glyph " + glyphName + " of font " + fontName);
}
}