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/30 17:21:29 UTC
svn commit: r1806716 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Author: tilman
Date: Wed Aug 30 17:21:29 2017
New Revision: 1806716
URL: http://svn.apache.org/viewvc?rev=1806716&view=rev
Log:
PDFBOX-3916: avoid NPE
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1806716&r1=1806715&r2=1806716&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Wed Aug 30 17:21:29 2017
@@ -225,11 +225,11 @@ public class PDType0Font extends PDFont
PDCIDSystemInfo ros = descendantFont.getCIDSystemInfo();
if (ros != null)
{
- isDescendantCJK = ros.getRegistry().equals("Adobe") &&
- (ros.getOrdering().equals("GB1") ||
- ros.getOrdering().equals("CNS1") ||
- ros.getOrdering().equals("Japan1") ||
- ros.getOrdering().equals("Korea1"));
+ isDescendantCJK = "Adobe".equals(ros.getRegistry()) &&
+ ("GB1".equals(ros.getOrdering()) ||
+ "CNS1".equals(ros.getOrdering()) ||
+ "Japan1".equals(ros.getOrdering()) ||
+ "Korea1".equals(ros.getOrdering()));
}
}