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 2018/10/03 11:57:49 UTC
svn commit: r1842709 -
/pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
Author: tilman
Date: Wed Oct 3 11:57:49 2018
New Revision: 1842709
URL: http://svn.apache.org/viewvc?rev=1842709&view=rev
Log:
PDFBOX-4330: skip double E
Modified:
pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
Modified: pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1842709&r1=1842708&r2=1842709&view=diff
==============================================================================
--- pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java (original)
+++ pdfbox/branches/1.8/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java Wed Oct 3 11:57:49 2018
@@ -25,6 +25,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fontbox.cff.CFFFont.Mapping;
import org.apache.fontbox.cff.charset.CFFCharset;
@@ -42,6 +44,10 @@ import org.apache.fontbox.cff.encoding.C
*/
public class CFFParser
{
+ /**
+ * Log instance.
+ */
+ private static final Log LOG = LogFactory.getLog(CFFParser.class);
private static final String TAG_OTTO = "OTTO";
private static final String TAG_TTCF = "ttcf";
@@ -273,6 +279,7 @@ public class CFFParser
StringBuffer sb = new StringBuffer();
boolean done = false;
boolean exponentMissing = false;
+ boolean hasExponent = false;
while (!done)
{
int b = input.readUnsignedByte();
@@ -298,12 +305,24 @@ public class CFFParser
sb.append(".");
break;
case 0xb:
+ if (hasExponent)
+ {
+ LOG.warn("duplicate 'E' ignored after " + sb);
+ break;
+ }
sb.append("E");
exponentMissing = true;
+ hasExponent = true;
break;
case 0xc:
+ if (hasExponent)
+ {
+ LOG.warn("duplicate 'E-' ignored after " + sb);
+ break;
+ }
sb.append("E-");
exponentMissing = true;
+ hasExponent = true;
break;
case 0xd:
break;