Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove IM from the image rescale transform

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-04 23:15:10 +05:30
parent f1af9c9f6d
commit 2d7ab2bd05
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/calibre/ebooks/oeb/transforms/rescale.py
View File

@ -20,7 +20,8 @@ class RescaleImages(object):
self.rescale() self.rescale()
def rescale(self): def rescale(self):
from calibre.utils.magick.draw import Image from PIL import Image
from io import BytesIO
is_image_collection = getattr(self.opts, 'is_image_collection', False) is_image_collection = getattr(self.opts, 'is_image_collection', False)
@ -44,49 +45,32 @@ class RescaleImages(object):
# Probably an svg image # Probably an svg image
continue continue
try: try:
img = Image() img = Image.open(BytesIO(raw))
img.load(raw) except Exception:
except:
continue continue
width, height = img.size width, height = img.size
try: try:
if self.check_colorspaces and img.colorspace == 'CMYKColorspace': if self.check_colorspaces and img.mode == 'CMYK':
# We cannot do an imagemagick conversion of CMYK to RGB as self.log.warn(
# ImageMagick inverts colors if you just set the colorspace 'The image %s is in the CMYK colorspace, converting it '
# to rgb. See for example: https://bugs.launchpad.net/bugs/1246710 'to RGB as Adobe Digital Editions cannot display CMYK' % item.href)
from PyQt5.Qt import QImage img = img.convert('RGB')
from calibre.gui2 import pixmap_to_data
qimg = QImage()
qimg.loadFromData(raw)
if not qimg.isNull():
raw = item.data = pixmap_to_data(qimg, format=ext, quality=95)
img = Image()
img.load(raw)
self.log.warn(
'The image %s is in the CMYK colorspace, converting it '
'to RGB as Adobe Digital Editions cannot display CMYK' % item.href)
else:
self.log.warn(
'The image %s is in the CMYK colorspace, you should convert'
' it to sRGB as Adobe Digital Editions cannot render CMYK' % item.href)
except Exception: except Exception:
pass self.log.exception('Failed to convert image %s from CMYK to RGB' % item.href)
scaled, new_width, new_height = fit_image(width, height, scaled, new_width, new_height = fit_image(width, height, page_width, page_height)
page_width, page_height)
if scaled: if scaled:
new_width = max(1, new_width) new_width = max(1, new_width)
new_height = max(1, new_height) new_height = max(1, new_height)
self.log('Rescaling image from %dx%d to %dx%d'%( self.log('Rescaling image from %dx%d to %dx%d'%(
width, height, new_width, new_height), item.href) width, height, new_width, new_height), item.href)
img.resize((new_width, new_height))
buf = BytesIO()
try: try:
img.size = (new_width, new_height) img.save(buf, ext)
data = img.export(ext.lower()) except Exception:
except KeyboardInterrupt:
raise
except:
self.log.exception('Failed to rescale image') self.log.exception('Failed to rescale image')
else: else:
item.data = data item.data = buf.getvalue()
item.unload_data_from_memory() item.unload_data_from_memory()