Bugzilla #46638: MinOptMaxUtil.toMinOptMax was converting LengthRangeProperty objects into illegal MinOptMax objects (in some cases opt could be inferior to min).

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@739376 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 9 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java b/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java
index 155abcd39..f029d9082 100644
--- a/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java
+++ b/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java
@@ -103,15 +103,13 @@ public class MinOptMaxUtil {
      * @return the requested MinOptMax instance
      */
     public static MinOptMax toMinOptMax(LengthRangeProperty prop, PercentBaseContext context) {
-        MinOptMax mom = new MinOptMax(
-                (prop.getMinimum(context).isAuto()
-                        ? 0 : prop.getMinimum(context).getLength().getValue(context)),
-                (prop.getOptimum(context).isAuto()
-                        ? 0 : prop.getOptimum(context).getLength().getValue(context)),
-                (prop.getMaximum(context).isAuto()
-                        ? Integer.MAX_VALUE
-                        : prop.getMaximum(context).getLength().getValue(context)));
-        return mom;
+        int min = prop.getMinimum(context).isAuto() ? 0
+                : prop.getMinimum(context).getLength().getValue(context);
+        int opt = prop.getOptimum(context).isAuto() ? min
+                : prop.getOptimum(context).getLength().getValue(context);
+        int max = prop.getMaximum(context).isAuto() ? Integer.MAX_VALUE
+                : prop.getMaximum(context).getLength().getValue(context);
+        return new MinOptMax(min, opt, max);
     }
 
 }