From afebdabbf140c14a9ee61dd935b659db0dc5e59e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 5 Apr 2011 23:11:43 -0600 Subject: [PATCH] save_cover_data_to: Fix return_data returning Image object instead of bytes when an Image object is passed in --- src/calibre/utils/magick/draw.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/utils/magick/draw.py b/src/calibre/utils/magick/draw.py index 42659d70cc..fdce30177a 100644 --- a/src/calibre/utils/magick/draw.py +++ b/src/calibre/utils/magick/draw.py @@ -92,12 +92,12 @@ def save_cover_data_to(data, path, bgcolor='#ffffff', resize_to=None, ret = None if return_data: ret = data - if changed: + if changed or isinstance(ret, Image): if hasattr(img, 'set_compression_quality') and fmt == 'jpg': img.set_compression_quality(compression_quality) ret = img.export(fmt) else: - if changed: + if changed or isinstance(ret, Image): if hasattr(img, 'set_compression_quality') and fmt == 'jpg': img.set_compression_quality(compression_quality) img.save(path)