You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2019/10/13 13:09:33 UTC
svn commit: r1868406 - in /pdfbox/branches/issue45: ./
fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
Author: lehmi
Date: Sun Oct 13 13:09:33 2019
New Revision: 1868406
URL: http://svn.apache.org/viewvc?rev=1868406&view=rev
Log:
PDFBOX-4661: fixed comparison
Modified:
pdfbox/branches/issue45/ (props changed)
pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
pdfbox/branches/issue45/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
Propchange: pdfbox/branches/issue45/
------------------------------------------------------------------------------
Merged /pdfbox/branches/2.0:r1868402
Modified: pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1868406&r1=1868405&r2=1868406&view=diff
==============================================================================
--- pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Sun Oct 13 13:09:33 2019
@@ -388,8 +388,8 @@ public class CMapParser
if (tokenBytes.length > 0)
{
// PDFBOX-4661: avoid overflow of the last byte, all following values are undefined
- int values = Math.min(end - start + 1,
- 255 - (tokenBytes[tokenBytes.length - 1] & 0xFF));
+ int values = Math.min(end - start,
+ 255 - (tokenBytes[tokenBytes.length - 1] & 0xFF)) + 1;
addMappingFrombfrange(result, startCode, values, tokenBytes);
}
}
Modified: pdfbox/branches/issue45/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java?rev=1868406&r1=1868405&r2=1868406&view=diff
==============================================================================
--- pdfbox/branches/issue45/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java (original)
+++ pdfbox/branches/issue45/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java Sun Oct 13 13:09:33 2019
@@ -151,8 +151,8 @@ public class TestCMapParser extends Test
assertEquals("bytes 02 32 from bfrange <0232> <0432> <0041>", "A", cMap.toUnicode(0x232));
// check border values
- assertNotNull(cMap.toUnicode(0x2EF));
- assertNull(cMap.toUnicode(0x2F0));
+ assertNotNull(cMap.toUnicode(0x2F0));
+ assertNull(cMap.toUnicode(0x2F1));
}