From fad47882722408a120ecfcd88b3ff650d4e09d2f Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 3 Mar 2016 10:48:57 +0100 Subject: [PATCH] [FIX] web_editor: image size Make sure to create an image of a size larger than zero. A size of zero will generate a traceback. --- addons/web_editor/controllers/main.py | 2 ++ addons/web_editor/static/src/js/transcoder.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py index 24fb6064dcb..963a78488ce 100644 --- a/addons/web_editor/controllers/main.py +++ b/addons/web_editor/controllers/main.py @@ -84,6 +84,8 @@ class Web_Editor(http.Controller): :returns PNG image converted from given font """ + # Make sure we have at least size=1 + size = max(1, size) # Initialize font addons_path = http.addons_manifest['web']['addons_path'] font_obj = ImageFont.truetype(addons_path + font, size) diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js index 14461ba1cf6..d327252b63d 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -133,7 +133,7 @@ var font_to_img = function ($editable) { }); if (content) { var color = $font.css("color").replace(/\s/g, ''); - var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+$font.height(), window.encodeURI(content), window.encodeURI(color)); + var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+Math.max(1, $font.height()), window.encodeURI(content), window.encodeURI(color)); var $img = $("").attr("src", src) .attr("data-class", $font.attr("class")) .attr("class", $font.attr("class").replace(new RegExp("(^|\\s+)" + icon + "(-[^\\s]+)?", "gi"), '')) // remove inline font-awsome style