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/07/26 14:46:59 UTC
svn commit: r1613617 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox:
cff/Type1CharStringFormatter.java ttf/CMAPEncodingEntry.java
ttf/TTFSubFont.java
Author: tilman
Date: Sat Jul 26 12:46:58 2014
New Revision: 1613617
URL: http://svn.apache.org/r1613617
Log:
PDFBOX-2147: Removed unnecessary unboxing
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringFormatter.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CMAPEncodingEntry.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubFont.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringFormatter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringFormatter.java?rev=1613617&r1=1613616&r2=1613617&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringFormatter.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharStringFormatter.java Sat Jul 26 12:46:58 2014
@@ -67,7 +67,7 @@ public class Type1CharStringFormatter
private void writeNumber(Integer number)
{
- int value = number.intValue();
+ int value = number;
if (value >= -107 && value <= 107)
{
output.write(value + 139);
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=1613617&r1=1613616&r2=1613617&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 Sat Jul 26 12:46:58 2014
@@ -545,7 +545,7 @@ public class CMAPEncodingEntry
public int getGlyphId(int characterCode)
{
Integer glyphId = characterCodeToGlyphId.get(characterCode);
- return glyphId == null ? 0 : glyphId.intValue();
+ return glyphId == null ? 0 : glyphId;
}
/**
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubFont.java?rev=1613617&r1=1613616&r2=1613617&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubFont.java Sat Jul 26 12:46:58 2014
@@ -578,8 +578,8 @@ public class TTFSubFont
long lastOff = 0L;
for (Integer glyphId : this.glyphIds)
{
- long offset = offsets[glyphId.intValue()];
- long len = offsets[glyphId.intValue()+1] - offset;
+ long offset = offsets[glyphId];
+ long len = offsets[glyphId+1] - offset;
is.skip(offset-lastOff);
byte[] buf= new byte[(int)len];
is.read(buf);
@@ -633,7 +633,7 @@ public class TTFSubFont
while ((flags & (1 << 5)) != 0);
}
- lastOff = offsets[glyphId.intValue()+1];
+ lastOff = offsets[glyphId+1];
}
}
finally
@@ -662,8 +662,8 @@ public class TTFSubFont
int ioff = 0;
for (Integer glyphId : this.glyphIds)
{
- long offset = offsets[glyphId.intValue()];
- long len = offsets[glyphId.intValue()+1] - offset;
+ long offset = offsets[glyphId];
+ long len = offsets[glyphId+1] - offset;
newOffsets[ioff++] = newOff;
is.skip(offset-lastOff);
byte[] buf= new byte[(int)len];
@@ -782,7 +782,7 @@ public class TTFSubFont
newOff += np;
}
- lastOff = offsets[glyphId.intValue()+1];
+ lastOff = offsets[glyphId+1];
}
newOffsets[ioff++] = newOff;
}
@@ -966,7 +966,7 @@ public class TTFSubFont
int[] gidToUC = this.baseCmap.getGlyphIdToCharacterCode();
for (Integer glyphId : this.glyphIds)
{
- int uc = gidToUC[glyphId.intValue()];
+ int uc = gidToUC[glyphId];
String name = null;
if (uc < 0x8000)
{
@@ -993,11 +993,11 @@ public class TTFSubFont
additionalNames.add(name);
additionalNamesIndices.put(name,idx);
}
- writeUint16(dos,idx.intValue()+258);
+ writeUint16(dos,idx+258);
}
else
{
- writeUint16(dos,macId.intValue());
+ writeUint16(dos, macId);
}
}
}
@@ -1005,7 +1005,7 @@ public class TTFSubFont
{
for (Integer glyphId : this.glyphIds)
{
- String name = glyphNames[glyphId.intValue()];
+ String name = glyphNames[glyphId];
Integer macId = Encoding.MAC_GLYPH_NAMES_INDICES.get(name);
if (macId == null)
{
@@ -1016,11 +1016,11 @@ public class TTFSubFont
additionalNames.add(name);
additionalNamesIndices.put(name,idx);
}
- writeUint16(dos,idx.intValue()+258);
+ writeUint16(dos,idx+258);
}
else
{
- writeUint16(dos,macId.intValue());
+ writeUint16(dos, macId);
}
}
}