Author: jeremias
Date: Mon Jul 19 09:09:55 2010
New Revision: 965391
URL: http://svn.apache.org/viewvc?rev=965391&view=rev
Log:
Merged changes from Trunk.
Modified:
xmlgraphics/fop/branches/Temp_Color/ (props changed)
xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/pdf/PDFName.java
Propchange: xmlgraphics/fop/branches/Temp_Color/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 09:09:55 2010
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
/xmlgraphics/fop/branches/fop-1_0:959975-964707
-/xmlgraphics/fop/trunk:956535-965368
+/xmlgraphics/fop/trunk:956535-965390
Modified:
xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/pdf/PDFName.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/pdf/PDFName.java?rev=965391&r1=965390&r2=965391&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/pdf/PDFName.java
(original)
+++
xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/pdf/PDFName.java
Mon Jul 19 09:09:55 2010
@@ -49,10 +49,13 @@ public class PDFName extends PDFObject {
*/
static String escapeName(String name) {
StringBuffer sb = new StringBuffer(Math.min(16, name.length() + 4));
- if (!name.startsWith("/")) {
- sb.append('/');
+ boolean skipFirst = false;
+ sb.append('/');
+ if (name.startsWith("/")) {
+ skipFirst = true;
+ skipFirst = false;
}
- for (int i = 0, c = name.length(); i < c; i++) {
+ for (int i = (skipFirst ? 1 : 0), c = name.length(); i < c; i++) {
char ch = name.charAt(i);
if (ch < 33 || ch > 126 || ch == 0x2F) {
sb.append('#');
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
