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 2019/04/22 00:23:16 UTC
svn commit: r1857931 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
Author: tilman
Date: Mon Apr 22 00:23:16 2019
New Revision: 1857931
URL: http://svn.apache.org/viewvc?rev=1857931&view=rev
Log:
PDFBOX-4017: SonarQube fix
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1857931&r1=1857930&r2=1857931&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Mon Apr 22 00:23:16 2019
@@ -584,42 +584,39 @@ public class PDType1Font extends PDSimpl
{
return name;
}
- else
+
+ // try alternative name
+ String altName = ALT_NAMES.get(name);
+ if (altName != null && !name.equals(".notdef") && genericFont.hasGlyph(altName))
{
- // try alternative name
- String altName = ALT_NAMES.get(name);
- if (altName != null && !name.equals(".notdef") && genericFont.hasGlyph(altName))
+ return altName;
+ }
+
+ // try unicode name
+ String unicodes = getGlyphList().toUnicode(name);
+ if (unicodes != null && unicodes.length() == 1)
+ {
+ String uniName = getUniNameOfCodePoint(unicodes.codePointAt(0));
+ if (genericFont.hasGlyph(uniName))
{
- return altName;
+ return uniName;
}
- else
+ // PDFBOX-4017: no postscript table on Windows 10, and the low uni00NN
+ // names are not found. What works is using the PDF code plus 0xF000
+ // while disregarding encoding from the PDF (because of file from PDFBOX-1606,
+ // makes sense because this segment is about finding the name in a standard font)
+ //TODO bring up better solution than this
+ if ("SymbolMT".equals(genericFont.getName()))
{
- // try unicode name
- String unicodes = getGlyphList().toUnicode(name);
- if (unicodes != null && unicodes.length() == 1)
+ int code = SymbolEncoding.INSTANCE.getNameToCodeMap().get(name);
+ uniName = getUniNameOfCodePoint(code + 0xF000);
+ if (genericFont.hasGlyph(uniName))
{
- String uniName = getUniNameOfCodePoint(unicodes.codePointAt(0));
- if (genericFont.hasGlyph(uniName))
- {
- return uniName;
- }
- // PDFBOX-4017: no postscript table on Windows 10, and the low uni00NN
- // names are not found. What works is using the PDF code plus 0xF000
- // while disregarding encoding from the PDF (because of file from PDFBOX-1606;
- // makes sense because this segment is about finding the name in a standard font)
- //TODO bring up better solution than this
- if ("SymbolMT".equals(genericFont.getName()))
- {
- int code = SymbolEncoding.INSTANCE.getNameToCodeMap().get(name);
- uniName = getUniNameOfCodePoint(code + 0xF000);
- if (genericFont.hasGlyph(uniName))
- {
- return uniName;
- }
- }
+ return uniName;
}
}
}
+
return ".notdef";
}