You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2007/05/01 11:41:06 UTC
svn commit: r533986 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/pdf/PDFDocument.java
src/java/org/apache/fop/pdf/PDFRectangle.java
src/java/org/apache/fop/pdf/PDFStream.java status.xml
Author: jeremias
Date: Tue May 1 02:41:05 2007
New Revision: 533986
URL: http://svn.apache.org/viewvc?view=rev&rev=533986
Log:
Bugzilla #41434:
Fix PDF Genaration for non-ASCII compatible locales.
Submitted by: Martin Kögler <martin.koegler.at.brz.gv.at>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java?view=diff&rev=533986&r1=533985&r2=533986
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java Tue May 1 02:41:05 2007
@@ -934,7 +934,7 @@
getProfile().verifyPDFVersion();
- byte[] pdf = ("%PDF-" + getPDFVersionString() + "\n").getBytes();
+ byte[] pdf = encode("%PDF-" + getPDFVersionString() + "\n");
stream.write(pdf);
this.position += pdf.length;
@@ -955,9 +955,9 @@
try {
MessageDigest digest = MessageDigest.getInstance("MD5");
DateFormat df = new SimpleDateFormat("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'SSS");
- digest.update(df.format(new Date()).getBytes());
+ digest.update(encode(df.format(new Date())));
//Ignoring the filename here for simplicity even though it's recommended by the PDF spec
- digest.update(String.valueOf(this.position).getBytes());
+ digest.update(encode(String.valueOf(this.position)));
digest.update(getInfo().toPDF());
byte[] res = digest.digest();
String s = PDFText.toHex(res);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java?view=diff&rev=533986&r1=533985&r2=533986
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java Tue May 1 02:41:05 2007
@@ -79,7 +79,7 @@
* @return the PDF
*/
public byte[] toPDF() {
- return toPDFString().getBytes();
+ return PDFDocument.encode(toPDFString());
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java?view=diff&rev=533986&r1=533985&r2=533986
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java Tue May 1 02:41:05 2007
@@ -57,7 +57,7 @@
*/
public void add(String s) {
try {
- data.getOutputStream().write(s.getBytes());
+ data.getOutputStream().write(PDFDocument.encode(s));
} catch (IOException ex) {
//TODO throw the exception and catch it elsewhere
ex.printStackTrace();
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?view=diff&rev=533986&r1=533985&r2=533986
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue May 1 02:41:05 2007
@@ -28,6 +28,9 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="JM" type="fix" fixes-bug="41434" due-to="Martin Kögler">
+ Fix PDF Genaration for non-ASCII compatible locales.
+ </action>
<action context="Code" dev="VH, JM" type="add" importance="high" fixes-bug="36934">
Add support for the collapsing-border model in tables.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org