aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Cumiskey <acumiskey@apache.org>2008-04-16 12:44:07 +0000
committerAdrian Cumiskey <acumiskey@apache.org>2008-04-16 12:44:07 +0000
commit72e6f108465cc95fc96d82e9f519bc8b9c7709c3 (patch)
treeb457e4249b87da48334b23ebdfe270a91268a898
parent18e3a8208cc7e574e8fd4183efd99d4107ba19d0 (diff)
downloadxmlgraphics-fop-72e6f108465cc95fc96d82e9f519bc8b9c7709c3.tar.gz
xmlgraphics-fop-72e6f108465cc95fc96d82e9f519bc8b9c7709c3.zip
Structured field length fix for ObjectContainer.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@648684 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/render/afp/modca/ObjectContainer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/render/afp/modca/ObjectContainer.java b/src/java/org/apache/fop/render/afp/modca/ObjectContainer.java
index 909476772..b29a14719 100644
--- a/src/java/org/apache/fop/render/afp/modca/ObjectContainer.java
+++ b/src/java/org/apache/fop/render/afp/modca/ObjectContainer.java
@@ -31,7 +31,7 @@ import org.apache.fop.render.afp.tools.BinaryUtils;
/**
* Object containers are MO:DCA objects that envelop and carry object data.
*/
-public class ObjectContainer extends AbstractPreparedAFPObject implements DataObjectAccessor {
+public class ObjectContainer extends AbstractNamedAFPObject implements DataObjectAccessor {
/**
* the data object
@@ -95,7 +95,7 @@ public class ObjectContainer extends AbstractPreparedAFPObject implements DataOb
this.objectData = bos.toByteArray();
// Set the total record length
- byte[] len = BinaryUtils.convert(18 + getTripletDataLength() + objectData.length, 2);
+ byte[] len = BinaryUtils.convert(16 + getTripletDataLength(), 2);
byte[] data = new byte[] {
0x5A, // Structured field identifier
len[0], // Length byte 1
@@ -106,7 +106,7 @@ public class ObjectContainer extends AbstractPreparedAFPObject implements DataOb
0x00, // Flags
0x00, // Reserved
0x00, // Reserved
- nameBytes[0],
+ nameBytes[0],
nameBytes[1],
nameBytes[2],
nameBytes[3],