svn commit: r1700901 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java

[jahewson]

Author: jahewson
Date: Wed Sep  2 20:47:22 2015
New Revision: 1700901

URL: http://svn.apache.org/r1700901
Log:
PDFBOX-2954: Typo

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1700901=1700900=1700901=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
 Wed Sep  2 20:47:22 2015
@@ -325,7 +325,7 @@ public class PDType1Font extends PDSimpl
 if (unicode > 0xff)
 {
 throw new IllegalArgumentException(String.format("Can't encode 
U+%04X in font %s. " +
-"Type 1 fonts only supports 8-bit code points", unicode, 
getName()));
+"Type 1 fonts only support 8-bit code points", unicode, 
getName()));
 }
 
 String name = getGlyphList().codePointToName(unicode);

svn commit: r1700899 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java

[jahewson]

Author: jahewson
Date: Wed Sep  2 20:45:28 2015
New Revision: 1700899

URL: http://svn.apache.org/r1700899
Log:
PDFBOX-2954: Add more detail to error message

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1700899=1700898=1700899=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
 Wed Sep  2 20:45:28 2015
@@ -324,7 +324,8 @@ public class PDType1Font extends PDSimpl
 {
 if (unicode > 0xff)
 {
-throw new IllegalArgumentException("This font type only supports 
8-bit code points");
+throw new IllegalArgumentException(String.format("Can't encode 
U+%04X in font %s. " +
+"Type 1 fonts only supports 8-bit code points", unicode, 
getName()));
 }
 
 String name = getGlyphList().codePointToName(unicode);

svn commit: r1700894 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding: DictionaryEncoding.java Encoding.java

[jahewson]

Author: jahewson
Date: Wed Sep  2 20:32:58 2015
New Revision: 1700894

URL: http://svn.apache.org/r1700894
Log:
PDFBOX-2951: Fix issue with Encoding caching names before Differences have been 
applied

Modified:

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java

pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java?rev=1700894=1700893=1700894=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java
 Wed Sep  2 20:32:58 2015
@@ -60,7 +60,6 @@ public class DictionaryEncoding extends
 }
 
 codeToName.putAll( this.baseEncoding.codeToName );
-names.addAll( this.baseEncoding.names );
 applyDifferences();
 }
 
@@ -118,7 +117,6 @@ public class DictionaryEncoding extends
 baseEncoding = base;
 
 codeToName.putAll( baseEncoding.codeToName );
-names.addAll( baseEncoding.names );
 applyDifferences();
 }
 

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java?rev=1700894=1700893=1700894=diff
==
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Encoding.java
 Wed Sep  2 20:32:58 2015
@@ -21,7 +21,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.common.COSObjectable;
 
@@ -59,7 +58,7 @@ public abstract class Encoding implement
 }
 
 protected final Map codeToName = new HashMap();
-protected final Set names = new HashSet();
+private Set names;
 
 /**
  * Returns an unmodifiable view of the Code2Name mapping.
@@ -80,7 +79,6 @@ public abstract class Encoding implement
 protected void add(int code, String name)
 {
 codeToName.put(code, name);
-names.add(name);
 }
 
 /**
@@ -90,6 +88,13 @@ public abstract class Encoding implement
  */
 public boolean contains(String name)
 {
+// we have to wait until all add() calls are done before building the 
name cache
+// otherwise /Differences won't be accounted for
+if (names == null)
+{
+names = new HashSet();
+names.addAll(codeToName.values());
+}
 return names.contains(name);
 }