From 388d448008ddd5c551d21a281e54f8cb24932ad0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 8 Dec 2010 09:34:45 -0700
Subject: [PATCH] Cleanup save_cover_data_to

---
 src/calibre/utils/magick/draw.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/calibre/utils/magick/draw.py b/src/calibre/utils/magick/draw.py
index d3cbd58c7d..c03a8660c8 100644
--- a/src/calibre/utils/magick/draw.py
+++ b/src/calibre/utils/magick/draw.py
@@ -54,19 +54,23 @@ def save_cover_data_to(data, path, bgcolor='#ffffff', resize_to=None,
         changed = True
     if not changed:
         changed = fmt != orig_fmt
+
+    ret = None
     if return_data:
+        ret = data
         if changed:
             if hasattr(img, 'set_compression_quality') and fmt == 'jpg':
                 img.set_compression_quality(compression_quality)
-            return img.export(fmt)
-        return data
-    if changed:
-        if hasattr(img, 'set_compression_quality') and fmt == 'jpg':
-            img.set_compression_quality(compression_quality)
-        img.save(path)
+            ret = img.export(fmt)
     else:
-        with lopen(path, 'wb') as f:
-            f.write(data)
+        if changed:
+            if hasattr(img, 'set_compression_quality') and fmt == 'jpg':
+                img.set_compression_quality(compression_quality)
+            img.save(path)
+        else:
+            with lopen(path, 'wb') as f:
+                f.write(data)
+    return ret
 
 def thumbnail(data, width=120, height=120, bgcolor='#ffffff', fmt='jpg'):
     img = Image()