xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acumis...@apache.org
Subject svn commit: r675577 - /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java
Date Thu, 10 Jul 2008 14:05:19 GMT
Author: acumiskey
Date: Thu Jul 10 07:05:18 2008
New Revision: 675577

URL: http://svn.apache.org/viewvc?rev=675577&view=rev
Log:
This fixes "IllegalArgumentException: Transparent data is longer than 253 bytes"
exception problem with <fo:block/> text is more than 253 characters (see https://issues.apache.org/bugzilla/show_bug.cgi?id=44024).

Modified:
    xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java?rev=675577&r1=675576&r2=675577&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java
Thu Jul 10 07:05:18 2008
@@ -110,7 +110,8 @@
      *            The control sequence indicator.
      */
     public PresentationTextData(boolean controlInd) {
-        final byte[] data = { 0x5A, // Structured field identifier
+        final byte[] data = {
+                0x5A, // Structured field identifier
                 0x00, // Record length byte 1
                 0x00, // Record length byte 2
                 (byte) 0xD3, // PresentationTextData identifier byte 1
@@ -123,7 +124,7 @@
         baos.write(data, 0, 9);
 
         if (controlInd) {
-            baos.write(new byte[] { 0x2B, (byte) 0xD3 }, 0, 2);
+            baos.write(new byte[] {0x2B, (byte) 0xD3}, 0, 2);
         }
     }
 
@@ -145,7 +146,7 @@
             currentFont = String.valueOf(font);
         }
 
-        afpdata.write(new byte[] { 0x03, (byte) 0xF1, font, }, 0, 3);
+        afpdata.write(new byte[] {0x03, (byte) 0xF1, font}, 0, 3);
     }
 
     /**
@@ -161,7 +162,7 @@
     private void absoluteMoveInline(int coordinate,
             ByteArrayOutputStream afpdata) {
         byte[] b = BinaryUtils.convert(coordinate, 2);
-        afpdata.write(new byte[] { 0x04, (byte) 0xC7, b[0], b[1], }, 0, 4);
+        afpdata.write(new byte[] {0x04, (byte) 0xC7, b[0], b[1]}, 0, 4);
         currentXCoordinate = coordinate;
     }
 
@@ -178,10 +179,12 @@
     private void absoluteMoveBaseline(int coordinate,
             ByteArrayOutputStream afpdata) {
         byte[] b = BinaryUtils.convert(coordinate, 2);
-        afpdata.write(new byte[] { 0x04, (byte) 0xD3, b[0], b[1], }, 0, 4);
+        afpdata.write(new byte[] {0x04, (byte) 0xD3, b[0], b[1]}, 0, 4);
         currentYCoordinate = coordinate;
     }
 
+    private static final int TRANSPARENT_MAX_SIZE = 253;
+    
     /**
      * The Transparent Data control sequence contains a sequence of code points
      * that are presented without a scan for embedded control sequences.
@@ -197,9 +200,9 @@
         if (l > 255) {
             // Check that we are not exceeding the maximum length
             throw new IllegalArgumentException(
-                    "Transparent data is longer than 253 bytes: " + data);
+                    "Transparent data is longer than " + TRANSPARENT_MAX_SIZE + " bytes:
" + data);
         }
-        afpdata.write(new byte[] { BinaryUtils.convert(l)[0], (byte) 0xDB, },
+        afpdata.write(new byte[] {BinaryUtils.convert(l)[0], (byte) 0xDB},
                 0, 2);
         afpdata.write(data, 0, data.length);
     }
@@ -218,7 +221,8 @@
      */
     private void drawBaxisRule(int length, int width,
             ByteArrayOutputStream afpdata) {
-        afpdata.write(new byte[] { 0x07, // Length
+        afpdata.write(new byte[] {
+                0x07, // Length
                 (byte) 0xE7, // Type
         }, 0, 2);
         // Rule length
@@ -245,7 +249,8 @@
      */
     private void drawIaxisRule(int length, int width,
             ByteArrayOutputStream afpdata) {
-        afpdata.write(new byte[] { 0x07, // Length
+        afpdata.write(new byte[] {
+                0x07, // Length
                 (byte) 0xE5, // Type
         }, 0, 2);
         // Rule length
@@ -314,7 +319,26 @@
 
         setCodedFont(BinaryUtils.convert(textDataInfo.getFontReference())[0],
                 afpdata);
-        addTransparentData(textDataInfo.getData(), afpdata);
+        
+        // Add transparent data
+        byte[] data = textDataInfo.getData();
+        if (data.length <= TRANSPARENT_MAX_SIZE) {
+            addTransparentData(data, afpdata);            
+        } else {
+            // data size greater than TRANSPARENT_MAX_SIZE so slice
+            int numTransData = data.length / TRANSPARENT_MAX_SIZE;
+            byte[] buff = new byte[TRANSPARENT_MAX_SIZE];
+            int currIndex = 0;
+            for (int transDataCnt = 0; transDataCnt < numTransData; transDataCnt++) {
+                currIndex = transDataCnt * TRANSPARENT_MAX_SIZE;
+                System.arraycopy(data, currIndex, buff, 0, TRANSPARENT_MAX_SIZE);
+                addTransparentData(buff, afpdata);
+            }
+            int remainingTransData = data.length / TRANSPARENT_MAX_SIZE;
+            buff = new byte[remainingTransData];
+            System.arraycopy(data, currIndex, buff, 0, remainingTransData);        
+            addTransparentData(buff, afpdata);
+        }
         currentXCoordinate = -1;
 
         int dataSize = afpdata.size();



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message