merging from trunk server

bzr revid: mga@tinyerp.com-20090601101419-wkfesmoaddfpufxf

1 files changed, 4 insertions, 2 deletions

diff --git a/bin/report/render/html2html/html2html.py b/bin/report/render/html2html/html2html.py
index fb1f6fcedd0..d4fa8559720 100644
--- a/bin/report/render/html2html/html2html.py
+++ b/bin/report/render/html2html/html2html.py
@@ -58,8 +58,10 @@ class html2html(object):
                                 output = cStringIO.StringIO(base64.decodestring(src))
                                 img = ImageReader(output)
                                 (width,height) = img.getSize()
-                                new_child.set('width',str(width))
-                                new_child.set('height',str(height))
+                                if not new_child.get('width'):
+                                    new_child.set('width',str(width))
+                                if not new_child.get('height') :
+                                    new_child.set('height',str(height))
                             else :
                                 new_child.getparent().remove(new_child)
                     new_child.text  = utils._process_text(self, child.text)