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) diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index 22aa6e85f4b..fe003b4b23f 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -196,7 +196,7 @@ class rml_parse(object): def removeParentNode(self, tag=None): raise Exception('Skip') - def set_html_image(self,id,model=None,field=None): + def set_html_image(self,id,model=None,field=None,context=None): if not id : return '' if not model: