Changeset 3832 for print

Timestamp:

07/14/11 15:16:51 (10 months ago)

Author:

sbrunner

Message:

fix issue introduce with [3831] maine map will not be visible :(

Files:

• print/trunk/src/main/java/org/mapfish/print/PDFUtils.java (modified) (1 diff)

print/trunk/src/main/java/org/mapfish/print/PDFUtils.java

@@ -132 +132 @@
             }
             else {
-                float maxw = w;
-                float maxh = h;
-                w = template.getWidth() * scale;
-                h = template.getWidth() * scale;
-                float scalew = w / maxw;
-                float scaleh = h / maxh;
-                float maxscale = Math.max(scalew, scaleh);
-                if (maxscale > 1f) {
-                    w /=  maxscale;
-                    h /=  maxscale;
+                if (scale == 0f) {
+                    h = w / template.getWidth() * template.getHeight();
+                }
+                else {
+                    float maxw = w;
+                    float maxh = h;
+                    w = template.getWidth() * scale;
+                    h = template.getWidth() * scale;
+                    float scalew = w / maxw;
+                    float scaleh = h / maxh;
+                    float maxscale = Math.max(scalew, scaleh);
+                    if (maxscale > 1f) {
+                        w /=  maxscale;
+                        h /=  maxscale;
+                    }
                 }
             }