From 927be72be5d20d19b177dc7dfa5c7844bcd7ca9e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 18 Apr 2009 01:12:56 -0700 Subject: [PATCH] Cleanup PDF cover extraction --- src/calibre/ebooks/metadata/pdf.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/calibre/ebooks/metadata/pdf.py b/src/calibre/ebooks/metadata/pdf.py index 1a664e638d..a2b18e21ac 100644 --- a/src/calibre/ebooks/metadata/pdf.py +++ b/src/calibre/ebooks/metadata/pdf.py @@ -10,10 +10,11 @@ from threading import Thread from calibre.ebooks.metadata import MetaInformation, authors_to_string from calibre.ptempfile import TemporaryDirectory from pyPdf import PdfFileReader, PdfFileWriter -import Image +#import Image try: from calibre.utils.PythonMagickWand import \ - NewMagickWand, MagickReadImage, MagickSetImageFormat, MagickWriteImage + NewMagickWand, MagickReadImage, MagickSetImageFormat, \ + MagickWriteImage, ImageMagick _imagemagick_loaded = True except: _imagemagick_loaded = False @@ -108,15 +109,15 @@ def get_cover(stream): outputStream = file(cover_path, "wb") output.write(outputStream) outputStream.close() + with ImageMagick(): + wand = NewMagickWand() + MagickReadImage(wand, cover_path) + MagickSetImageFormat(wand, 'JPEG') + MagickWriteImage(wand, '%s.jpg' % cover_path) - wand = NewMagickWand() - MagickReadImage(wand, cover_path) - MagickSetImageFormat(wand, 'JPEG') - MagickWriteImage(wand, '%s.jpg' % cover_path) + #img = Image.open('%s.jpg' % cover_path) - img = Image.open('%s.jpg' % cover_path) - - img.save(data, 'JPEG') + #img.save(data, 'JPEG') except: import traceback traceback.print_exc()