From 58441b661878305942190a7fb941bb9d3e3f63bf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 May 2016 09:32:07 +0530
Subject: [PATCH] Remove IM from the device driver subsystem

---
 src/calibre/devices/hanvon/driver.py |  6 +++---
 src/calibre/devices/kobo/driver.py   | 15 ++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py
index 92ca295b4b..755ec3cdfc 100644
--- a/src/calibre/devices/hanvon/driver.py
+++ b/src/calibre/devices/hanvon/driver.py
@@ -107,7 +107,7 @@ class ALEX(N516):
 
     def upload_cover(self, path, filename, metadata, filepath):
         from calibre.ebooks import calibre_cover
-        from calibre.utils.magick.draw import thumbnail
+        from calibre.utils.img import scale_image
         coverdata = getattr(metadata, 'thumbnail', None)
         if coverdata and coverdata[2]:
             cover = coverdata[2]
@@ -115,8 +115,8 @@ class ALEX(N516):
             cover = calibre_cover(metadata.get('title', _('Unknown')),
                     metadata.get('authors', _('Unknown')))
 
-        cover = thumbnail(cover, width=self.THUMBNAIL_HEIGHT,
-                height=self.THUMBNAIL_HEIGHT, fmt='png')[-1]
+        cover = scale_image(cover, width=self.THUMBNAIL_HEIGHT,
+                height=self.THUMBNAIL_HEIGHT, as_png=True)[-1]
 
         cpath = self.alex_cpath(os.path.join(path, filename))
         cdir = os.path.dirname(cpath)
diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 91fe5c6a5e..c20b9fb037 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -963,7 +963,7 @@ class KOBO(USBMS):
             debug_print('FAILED to upload cover', filepath)
 
     def _upload_cover(self, path, filename, metadata, filepath, uploadgrayscale):
-        from calibre.utils.magick.draw import save_cover_data_to
+        from calibre.utils.img import save_cover_data_to
         if metadata.cover:
             cover = self.normalize_path(metadata.cover.replace('/', os.sep))
 
@@ -1016,9 +1016,7 @@ class KOBO(USBMS):
 
                             # Return the data resized and in Grayscale if
                             # required
-                            data = save_cover_data_to(data, 'dummy.jpg',
-                                    grayscale=uploadgrayscale,
-                                    resize_to=resize, return_data=True)
+                            data = save_cover_data_to(data, grayscale=uploadgrayscale, resize_to=resize)
 
                             with lopen(fpath, 'wb') as f:
                                 f.write(data)
@@ -2390,7 +2388,8 @@ class KOBOTOUCH(KOBO):
         return path
 
     def _upload_cover(self, path, filename, metadata, filepath, uploadgrayscale, keep_cover_aspect=False):
-        from calibre.utils.magick.draw import save_cover_data_to, identify_data
+        from calibre.utils.img import save_cover_data_to
+        from calibre.utils.imghdr import identify
         debug_print("KoboTouch:_upload_cover - filename='%s' uploadgrayscale='%s' "%(filename, uploadgrayscale))
 
         if metadata.cover:
@@ -2455,7 +2454,7 @@ class KOBOTOUCH(KOBO):
                                     if isFullsize:
                                         resize = None
                                     else:
-                                        width, height, fmt = identify_data(data)
+                                        fmt, width, height = identify(data)
                                         cover_aspect = width / height
                                         if cover_aspect > 1:
                                             resize = (resize[0], int(resize[0] / cover_aspect))
@@ -2464,9 +2463,7 @@ class KOBOTOUCH(KOBO):
 
                                 # Return the data resized and in Grayscale if
                                 # required
-                                data = save_cover_data_to(data, 'dummy.jpg',
-                                        grayscale=uploadgrayscale,
-                                        resize_to=resize, return_data=True)
+                                data = save_cover_data_to(data, grayscale=uploadgrayscale, resize_to=resize)
 
                                 with lopen(fpath, 'wb') as f:
                                     f.write(data)