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/04/20 17:49:18 UTC
svn commit: r1792099 - in /pdfbox/branches/2.0:
fontbox/src/main/java/org/apache/fontbox/cmap/
fontbox/src/main/java/org/apache/fontbox/ttf/
fontbox/src/test/java/org/apache/fontbox/cmap/
pdfbox/src/main/java/org/apache/pdfbox/cos/
Author: tilman
Date: Thu Apr 20 17:49:18 2017
New Revision: 1792099
URL: http://svn.apache.org/viewvc?rev=1792099&view=rev
Log:
PDFBOX-2852: simplify code
Modified:
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CodespaceRange.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java
pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java?rev=1792099&r1=1792098&r2=1792099&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java Thu Apr 20 17:49:18 2017
@@ -132,7 +132,7 @@ public class CMap
for (int i = 0; i < dataLen; ++i)
{
code <<= 8;
- code |= (data[i] + 256) % 256;
+ code |= (data[i] & 0xFF);
}
return code;
}
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CodespaceRange.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CodespaceRange.java?rev=1792099&r1=1792098&r2=1792099&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CodespaceRange.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CodespaceRange.java Thu Apr 20 17:49:18 2017
@@ -103,7 +103,7 @@ public class CodespaceRange
for (int i = 0; i < dataLen; ++i)
{
code <<= 8;
- code |= (data[i] + 256) % 256;
+ code |= (data[i] & 0xFF);
}
return code;
}
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java?rev=1792099&r1=1792098&r2=1792099&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java Thu Apr 20 17:49:18 2017
@@ -540,7 +540,7 @@ public class CmapSubtable
characterCodeToGlyphId = new HashMap<Integer, Integer>(glyphMapping.length);
for (int i = 0; i < glyphMapping.length; i++)
{
- int glyphIndex = (glyphMapping[i] + 256) % 256;
+ int glyphIndex = glyphMapping[i] & 0xFF;
glyphIdToCharacterCode[glyphIndex] = i;
characterCodeToGlyphId.put(i, glyphIndex);
}
Modified: pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java?rev=1792099&r1=1792098&r2=1792099&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java (original)
+++ pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java Thu Apr 20 17:49:18 2017
@@ -77,7 +77,7 @@ public class TestCMapParser extends Test
for (byte b : data)
{
code <<= 8;
- code |= (b + 256) % 256;
+ code |= (b & 0xFF);
}
return code;
}
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java?rev=1792099&r1=1792098&r2=1792099&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java Thu Apr 20 17:49:18 2017
@@ -685,7 +685,7 @@ public final class COSName extends COSBa
byte[] bytes = getName().getBytes(Charsets.US_ASCII);
for (byte b : bytes)
{
- int current = (b + 256) % 256;
+ int current = b & 0xFF;
// be more restrictive than the PDF spec, "Name Objects", see PDFBOX-2073
if (current >= 'A' && current <= 'Z' ||