Author: ssteiner
Date: Fri Jun 5 12:57:45 2015
New Revision: 1683746
URL: http://svn.apache.org/r1683746
Log:
FOP-2482: Read out loud not working with 256 bit encryption and accessibility
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=1683746&r1=1683745&r2=1683746&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
Fri Jun 5 12:57:45 2015
@@ -231,7 +231,7 @@ public abstract class AbstractPDFStream
lengthEntry = refLength;
} else {
encodedStream = encodeStream();
- lengthEntry = Integer.valueOf(encodedStream.getSize() + 1);
+ lengthEntry = encodedStream.getSize();
}
populateStreamDict(lengthEntry);
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java?rev=1683746&r1=1683745&r2=1683746&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
Fri Jun 5 12:57:45 2015
@@ -98,7 +98,7 @@ public class ObjectStreamTestCase {
expected.append(" /Type /ObjStm\n")
.append(" /N ").append(numObs).append("\n")
.append(" /First ").append(offsetsLength).append('\n')
- .append(" /Length ").append(OBJECT_CONTENT.length() * 2 +
offsetsLength + 1).append('\n')
+ .append(" /Length ").append(OBJECT_CONTENT.length() * 2 +
offsetsLength).append('\n')
.append(">>\n")
.append("stream\n");
int offset = 0;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java?rev=1683746&r1=1683745&r2=1683746&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java
Fri Jun 5 12:57:45 2015
@@ -123,7 +123,7 @@ public class CrossReferenceStreamTestCas
.append(" /Type /XRef\n")
.append(" /Size ").append(Integer.toString(maxObjectNumber +
1)).append('\n')
.append(" /W [1 8 2]\n")
- .append(" /Length ").append(Integer.toString((maxObjectNumber
+ 1) * 11 + 1)).append('\n')
+ .append(" /Length ").append(Integer.toString((maxObjectNumber
+ 1) * 11)).append('\n')
.append(">>\n")
.append("stream\n");
stream.write(getBytes(expected));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
