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 2014/04/02 20:35:32 UTC

svn commit: r1584124 - /pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java

Author: tilman
Date: Wed Apr  2 18:35:32 2014
New Revision: 1584124

URL: http://svn.apache.org/r1584124
Log:
PDFBOX-2012: slight optimizations as suggested by Philip Helger

Modified:
    pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java

Modified: pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java?rev=1584124&r1=1584123&r2=1584124&view=diff
==============================================================================
--- pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java (original)
+++ pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java Wed Apr  2 18:35:32 2014
@@ -405,7 +405,7 @@ public class CMAPEncodingEntry
 		for( int i=0; i<256; i++)
 		{
 			subHeaderKeys[i] = data.readUnsignedShort();
-			maxSubHeaderIndex = Math.max(maxSubHeaderIndex, (int)(subHeaderKeys[i]/8));
+			maxSubHeaderIndex = Math.max(maxSubHeaderIndex, subHeaderKeys[i]/8);
 		}
 
 		// ---- Read all SubHeaders to avoid useless seek on DataSource
@@ -518,16 +518,11 @@ public class CMAPEncodingEntry
 	 * @param characterCode
 	 * @return glyphId
 	 */
-	public int getGlyphId(int characterCode) {
-		if (this.characterCodeToGlyphId.containsKey(characterCode)) 
-		{
-			return this.characterCodeToGlyphId.get(characterCode);
-		} 
-		else 
-		{
-			return 0;
-		}
-	}
+        public int getGlyphId(int characterCode)
+        {
+            Integer glyphId = characterCodeToGlyphId.get(characterCode);
+            return glyphId == null ? 0 : glyphId.intValue();
+        }
 
 	/**
 	 * Class used to manage CMap - Format 2