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 2014/01/04 18:34:29 UTC
svn commit: r1555384 - in
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
PDType1CFont.java PDType1Font.java
Author: lehmi
Date: Sat Jan 4 17:34:29 2014
New Revision: 1555384
URL: http://svn.apache.org/r1555384
Log:
PDFBOX-1770: don't try to encode the given string using an embedded Type1C font
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=1555384&r1=1555383&r2=1555384&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java Sat Jan 4 17:34:29 2014
@@ -104,21 +104,6 @@ public class PDType1CFont extends PDSimp
load();
}
- /**
- * {@inheritDoc}
- */
- public String encode( byte[] bytes, int offset, int length ) throws IOException
- {
- String character = getCharacter(bytes, offset, length);
- if( character == null )
- {
- log.debug("No character for code " + (bytes[offset] & 0xff) + " in " + this.cffFont.getName());
- return null;
- }
-
- return character;
- }
-
public int encodeToCID( byte[] bytes, int offset, int length )
{
if (length > 2)
@@ -133,15 +118,6 @@ public class PDType1CFont extends PDSimp
return code;
}
- private String getCharacter( byte[] bytes, int offset, int length )
- {
- int code = encodeToCID(bytes, offset, length);
- if (code == -1) {
- return null;
- }
- return (String)this.codeToCharacter.get(code);
- }
-
/**
* {@inheritDoc}
*/
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1555384&r1=1555383&r2=1555384&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Sat Jan 4 17:34:29 2014
@@ -451,22 +451,6 @@ public class PDType1Font extends PDSimpl
}
}
- /**
- * {@inheritDoc}
- */
- @Override
- public String encode(byte[] c, int offset, int length) throws IOException
- {
- if (type1CFont != null && getFontEncoding() == null)
- {
- return type1CFont.encode(c, offset, length);
- }
- else
- {
- return super.encode(c, offset, length);
- }
- }
-
public int encodeToCID( byte[] c, int offset, int length ) throws IOException {
if (type1CFont != null && getFontEncoding() == null)
{