svn commit: r677932 - /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java

[acumiskey]

Author: acumiskey
Date: Fri Jul 18 08:18:03 2008
New Revision: 677932

URL: http://svn.apache.org/viewvc?rev=677932&view=rev
Log:
Replaced PresentationSpaceMixingRulesTriplet (currently unsupported in AFP 
environments...) with PresentationSpaceResetMixingTriplet.

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

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java?rev=677932&r1=677931&r2=677932&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java
 Fri Jul 18 08:18:03 2008
@@ -27,6 +27,7 @@
 import org.apache.fop.render.afp.modca.triplets.MeasurementUnitsTriplet;
 import org.apache.fop.render.afp.modca.triplets.ObjectAreaSizeTriplet;
 import 
org.apache.fop.render.afp.modca.triplets.PresentationSpaceMixingRulesTriplet;
+import 
org.apache.fop.render.afp.modca.triplets.PresentationSpaceResetMixingTriplet;
 import org.apache.fop.render.afp.tools.BinaryUtils;
 
 /**
@@ -53,15 +54,18 @@
     protected byte[] getTripletData() throws IOException {
         if (tripletData == null) {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            final byte descriptorPositionId = 0x01;
-            new DescriptorPositionTriplet(descriptorPositionId).write(bos);
+            
+            // Specifies the associated ObjectAreaPosition structured field
+            final byte oapId = 0x01;
+            new DescriptorPositionTriplet(oapId).write(bos);
+
             new MeasurementUnitsTriplet(widthRes, heightRes).write(bos);
+
             new ObjectAreaSizeTriplet(width, height).write(bos);
-            byte[] mixingRules = new byte[] {
-                 PresentationSpaceMixingRulesTriplet.RULE_FORE_ON_BACK, 
-                 PresentationSpaceMixingRulesTriplet.OVERPAINT
-            };
-            new PresentationSpaceMixingRulesTriplet(mixingRules).write(bos);
+            
+            new PresentationSpaceResetMixingTriplet(
+                    PresentationSpaceResetMixingTriplet.NOT_RESET).write(bos);
+            
             this.tripletData = bos.toByteArray();
         }
         return this.tripletData;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]