merged from 32: only scale images down, not up

svn: r14958
2010-03-28 14:48:23 +00:00 · 2010-03-28 14:48:23 +00:00 · 876f0ac1d3
commit 876f0ac1d3
parent efaec2271c
1 changed files with 1 additions and 1 deletions
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@ -2676,7 +2676,7 @@ class MediaPage(BasePage):
                                                                       # a max of zero is ignored

                            scale_h = (float(max_height)/height) or 1
-                            scale = min(scale_w, scale_h)
+                            scale = min(scale_w, scale_h, 1.0)
                            new_width = int(width*scale)
                            new_height = int(height*scale)
                            if scale < 0.8: