Author: tilman
Date: Wed Apr 2 18:35:09 2014
New Revision: 1584123
URL: http://svn.apache.org/r1584123
Log:
PDFBOX-2012: slight optimizations as suggested by Philip Helger
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java?rev=1584123&r1=1584122&r2=1584123&view=diff
==============================================================================
---
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java
(original)
+++
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java
Wed Apr 2 18:35:09 2014
@@ -436,7 +436,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
@@ -550,20 +550,14 @@ public class CMAPEncodingEntry
/**
* Returns the GlyphId linked with the given character code.
- *
+ *
* @param characterCode the given character code to be mapped
* @return glyphId the corresponding glyph id for the given character code
*/
public int getGlyphId(int characterCode)
{
- if (characterCodeToGlyphId.containsKey(characterCode))
- {
- return characterCodeToGlyphId.get(characterCode);
- }
- else
- {
- return 0;
- }
+ Integer glyphId = characterCodeToGlyphId.get(characterCode);
+ return glyphId == null ? 0 : glyphId.intValue();
}
/**
