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/02 17:31:07 UTC
svn commit: r1803888 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CMapManager.java
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Author: tilman
Date: Wed Aug 2 17:31:07 2017
New Revision: 1803888
URL: http://svn.apache.org/viewvc?rev=1803888&view=rev
Log:
PDFBOX-2852: remove unneeded nullcheck; improve javadoc
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CMapManager.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1803888&r1=1803887&r2=1803888&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Wed Aug 2 17:31:07 2017
@@ -67,7 +67,7 @@ public class CMapParser
* Parses a predefined CMap.
*
* @param name CMap name.
- * @return The parsed predefined CMap as a java object.
+ * @return The parsed predefined CMap as a java object, never null.
* @throws IOException If the CMap could not be parsed.
*/
public CMap parsePredefined(String name) throws IOException
@@ -82,7 +82,7 @@ public class CMapParser
* This will parse the stream and create a cmap object.
*
* @param input The CMAP stream to parse.
- * @return The parsed stream as a java object.
+ * @return The parsed stream as a java object, never null.
* @throws IOException If there is an error parsing the stream.
*/
public CMap parse(InputStream input) throws IOException
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CMapManager.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CMapManager.java?rev=1803888&r1=1803887&r2=1803888&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CMapManager.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/CMapManager.java Wed Aug 2 17:31:07 2017
@@ -41,6 +41,8 @@ final class CMapManager
* Fetches the predefined CMap from disk (or cache).
*
* @param cMapName CMap name
+ * @return The predefined CMap, never null.
+ * @throws IOException
*/
public static CMap getPredefinedCMap(String cMapName) throws IOException
{
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=1803888&r1=1803887&r2=1803888&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 2 17:31:07 2017
@@ -267,16 +267,9 @@ public class PDType0Font extends PDFont
// try to find the corresponding Unicode (UC2) CMap
if (strName != null)
{
- CMap cMap = CMapManager.getPredefinedCMap(strName);
- if (cMap != null)
- {
- String ucs2Name = cMap.getRegistry() + "-" + cMap.getOrdering() + "-UCS2";
- CMap ucs2CMap = CMapManager.getPredefinedCMap(ucs2Name);
- if (ucs2CMap != null)
- {
- cMapUCS2 = ucs2CMap;
- }
- }
+ CMap prdCMap = CMapManager.getPredefinedCMap(strName);
+ String ucs2Name = prdCMap.getRegistry() + "-" + prdCMap.getOrdering() + "-UCS2";
+ cMapUCS2 = CMapManager.getPredefinedCMap(ucs2Name);
}
}
}