You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by gb...@apache.org on 2012/11/07 14:34:21 UTC
svn commit: r1406628 - in /pdfbox/trunk:
pdfbox/src/main/java/org/apache/pdfbox/cos/
pdfbox/src/main/java/org/apache/pdfbox/pdfparser/
preflight/src/main/java/org/apache/pdfbox/preflight/parser/
Author: gbailleul
Date: Wed Nov 7 13:34:20 2012
New Revision: 1406628
URL: http://svn.apache.org/viewvc?rev=1406628&view=rev
Log:
[PDFBOX-1437] : fixed COSString created from dictionnary encoding (use PDFEncoding)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java?rev=1406628&r1=1406627&r2=1406628&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java Wed Nov 7 13:34:20 2012
@@ -19,8 +19,8 @@ package org.apache.pdfbox.cos;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import org.apache.pdfbox.encoding.PdfDocEncoding;
import org.apache.pdfbox.exceptions.COSVisitorException;
import org.apache.pdfbox.persistence.util.COSHEXTable;
@@ -74,6 +74,7 @@ public class COSString extends COSBase
*/
public static final byte[] FF_ESCAPE = new byte[]{ 92, 102 }; //"\\f".getBytes( "ISO-8859-1" );
+
private ByteArrayOutputStream out = null;
private String str = null;
@@ -83,6 +84,8 @@ public class COSString extends COSBase
*/
private boolean forceHexForm = false;
+ private boolean isDictionary = false;
+
/**
* Constructor.
*/
@@ -91,6 +94,12 @@ public class COSString extends COSBase
out = new ByteArrayOutputStream();
}
+ public COSString (boolean isDictionary) {
+ this();
+ this.isDictionary = isDictionary;
+ }
+
+
/**
* Explicit constructor for ease of manual PDF construction.
*
@@ -173,9 +182,9 @@ public class COSString extends COSBase
public void setForceHexForm(boolean v)
{
- forceHexForm = v;
+ forceHexForm = v;
}
-
+
/**
* This will create a COS string from a string of hex characters.
*
@@ -216,7 +225,7 @@ public class COSString extends COSBase
retval.append('?');
} else {
IOException exception =
- new IOException("Invalid hex string: " + hex);
+ new IOException("Invalid hex string: " + hex);
exception.initCause(e);
throw exception;
}
@@ -273,9 +282,19 @@ public class COSString extends COSBase
}
try
{
- retval = new String( getBytes(), start, data.length-start, encoding );
+ if (isDictionary && encoding.equals("ISO-8859-1")) {
+ byte [] tmp = getBytes();
+ PdfDocEncoding pde = new PdfDocEncoding();
+ StringBuilder sb = new StringBuilder(tmp.length);
+ for (byte b : tmp) {
+ sb.append(pde.getCharacter((b+256)%256));
+ }
+ retval = sb.toString();
+ } else {
+ retval = new String( getBytes(), start, data.length-start, encoding );
+ }
}
- catch( UnsupportedEncodingException e )
+ catch( IOException e )
{
//should never happen
e.printStackTrace();
@@ -365,43 +384,43 @@ public class COSString extends COSBase
int b = (bytes[i]+256)%256;
switch( b )
{
- case '(':
- case ')':
- case '\\':
- {
- output.write(ESCAPE);
- output.write((byte)b);
- break;
- }
- case 10: //LF
- {
- output.write( LF_ESCAPE );
- break;
- }
- case 13: // CR
- {
- output.write( CR_ESCAPE );
- break;
- }
- case '\t':
- {
- output.write( HT_ESCAPE );
- break;
- }
- case '\b':
- {
- output.write( BS_ESCAPE );
- break;
- }
- case '\f':
- {
- output.write( FF_ESCAPE );
- break;
- }
- default:
- {
- output.write( (byte)b );
- }
+ case '(':
+ case ')':
+ case '\\':
+ {
+ output.write(ESCAPE);
+ output.write((byte)b);
+ break;
+ }
+ case 10: //LF
+ {
+ output.write( LF_ESCAPE );
+ break;
+ }
+ case 13: // CR
+ {
+ output.write( CR_ESCAPE );
+ break;
+ }
+ case '\t':
+ {
+ output.write( HT_ESCAPE );
+ break;
+ }
+ case '\b':
+ {
+ output.write( BS_ESCAPE );
+ break;
+ }
+ case '\f':
+ {
+ output.write( FF_ESCAPE );
+ break;
+ }
+ default:
+ {
+ output.write( (byte)b );
+ }
}
}
output.write(STRING_CLOSE);
@@ -442,7 +461,7 @@ public class COSString extends COSBase
{
COSString strObj = (COSString) obj;
return this.getString().equals(strObj.getString())
- && this.forceHexForm == strObj.forceHexForm;
+ && this.forceHexForm == strObj.forceHexForm;
}
return false;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1406628&r1=1406627&r2=1406628&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Wed Nov 7 13:34:20 2012
@@ -787,10 +787,10 @@ public abstract class BaseParser
*
* @throws IOException If there is an error reading from the stream.
*/
- protected COSString parseCOSString() throws IOException
+ protected COSString parseCOSString(boolean isDictionary) throws IOException
{
char nextChar = (char)pdfSource.read();
- COSString retval = new COSString();
+ COSString retval = new COSString(isDictionary);
char openBrace;
char closeBrace;
if( nextChar == '(' )
@@ -1221,7 +1221,7 @@ public abstract class BaseParser
}
else
{
- retval = parseCOSString();
+ retval = parseCOSString(true);
}
break;
}
@@ -1231,7 +1231,7 @@ public abstract class BaseParser
break;
}
case '(':
- retval = parseCOSString();
+ retval = parseCOSString(true);
break;
case '/': // name
retval = parseCOSName();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java?rev=1406628&r1=1406627&r2=1406628&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java Wed Nov 7 13:34:20 2012
@@ -257,7 +257,7 @@ public class PDFStreamParser extends Bas
}
else
{
- retval = parseCOSString();
+ retval = parseCOSString(false);
}
break;
}
@@ -267,7 +267,7 @@ public class PDFStreamParser extends Bas
break;
}
case '(': // string
- retval = parseCOSString();
+ retval = parseCOSString(false);
break;
case '/': // name
retval = parseCOSName();
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1406628&r1=1406627&r2=1406628&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java Wed Nov 7 13:34:20 2012
@@ -476,7 +476,7 @@ public class PreflightParser extends Non
* Check that the hexa string contains only an even number of Hexadecimal characters.
* Once it is done, reset the offset at the beginning of the string and call {@link BaseParser#parseCOSString()}
*/
- protected COSString parseCOSString() throws IOException
+ protected COSString parseCOSString(boolean isDictionary) throws IOException
{
// offset reminder
long offset = pdfSource.getOffset();
@@ -502,7 +502,7 @@ public class PreflightParser extends Non
// reset the offset to parse the COSString
pdfSource.seek(offset);
- COSString result = super.parseCOSString();
+ COSString result = super.parseCOSString(isDictionary);
if ( result.getString().length() > MAX_STRING_LENGTH) {
addValidationError(new ValidationError(ERROR_SYNTAX_HEXA_STRING_TOO_LONG, "Hexa string is too long"));