gmazza 2004/01/01 10:52:22
Modified: src/java/org/apache/fop/fo/flow ExternalGraphic.java
Log:
Bug #25806 (Patch by Finn Bock)--NPE fixed in ExternalGraphic.java.
Revision Changes Path
1.15 +4 -2 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ExternalGraphic.java 28 Dec 2003 17:10:16 -0000 1.14
+++ ExternalGraphic.java 1 Jan 2004 18:52:22 -0000 1.15
@@ -65,6 +65,7 @@
import org.apache.fop.image.ImageFactory;
import org.apache.fop.image.FopImage;
import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.LengthRange;
// Java
import java.awt.geom.Rectangle2D;
@@ -108,8 +109,9 @@
}
url = ImageFactory.getURL(url);
- // assume lr-tb for now
- Length ipd = propertyList.get(PR_INLINE_PROGRESSION_DIMENSION).getLength();
+ // assume lr-tb for now and just use the .optimum value of the range
+ Length ipd = propertyList.get(PR_INLINE_PROGRESSION_DIMENSION).
+ getLengthRange().getOptimum().getLength();
if (!ipd.isAuto()) {
viewWidth = ipd.getValue();
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
