From 876f0ac1d312f18bdcb48e29dab655c352f7b697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Charette?= <stephanecharette@gmail.com>
Date: Sun, 28 Mar 2010 14:48:23 +0000
Subject: [PATCH] merged from 32: only scale images down, not up

svn: r14958
---
 src/plugins/webreport/NarrativeWeb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 5766d9538..9f457d3c5 100644
--- 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: