From 93dc416dd3a2cc56e99586e8c45112fef4a2c0b6 Mon Sep 17 00:00:00 2001 From: Thomas Rehn Date: Thu, 9 Oct 2014 18:05:09 +0200 Subject: [PATCH 1/2] only use alpha channel if it exists --- addons/hw_escpos/escpos/escpos.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/hw_escpos/escpos/escpos.py b/addons/hw_escpos/escpos/escpos.py index 13ea11af7a6..d35da17412f 100644 --- a/addons/hw_escpos/escpos/escpos.py +++ b/addons/hw_escpos/escpos/escpos.py @@ -438,7 +438,12 @@ class Escpos: f.seek(0) img_rgba = Image.open(f) img = Image.new('RGB', img_rgba.size, (255,255,255)) - img.paste(img_rgba, mask=img_rgba.split()[3]) + channels = img_rgba.split() + kwargs = {} + if len(channels) > 1: + # use alpha channel as mask + kwargs['mask'] = img_rgba.split()[3] + img.paste(img_rgba, **kwargs) print 'convert image' From 7659da9fd813db428ab664eda1d2d018da0cf440 Mon Sep 17 00:00:00 2001 From: Thomas Rehn Date: Wed, 19 Nov 2014 10:13:54 +0100 Subject: [PATCH 2/2] improve patch according to reviewer's suggestion --- addons/hw_escpos/escpos/escpos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hw_escpos/escpos/escpos.py b/addons/hw_escpos/escpos/escpos.py index d35da17412f..bb60d632e96 100644 --- a/addons/hw_escpos/escpos/escpos.py +++ b/addons/hw_escpos/escpos/escpos.py @@ -439,11 +439,11 @@ class Escpos: img_rgba = Image.open(f) img = Image.new('RGB', img_rgba.size, (255,255,255)) channels = img_rgba.split() - kwargs = {} if len(channels) > 1: # use alpha channel as mask - kwargs['mask'] = img_rgba.split()[3] - img.paste(img_rgba, **kwargs) + img.paste(img_rgba, mask=channels[3]) + else: + img.paste(img_rgba) print 'convert image'