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

Remove checks for magick extension functionality

Browse Source
This commit is contained in:
Kovid Goyal 2010-10-09 06:48:46 -06:00
parent d4f26ae1b4
commit 6a57e799af
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/ebooks/mobi/writer.py
View File

@ -122,15 +122,14 @@ def rescale_image(data, maxsizeb, dimen=None):
img = Image() img = Image()
quality = 95 quality = 95
if hasattr(img, 'set_compression_quality'): img.load(data)
img.load(data) while len(data) >= maxsizeb and quality >= 10:
while len(data) >= maxsizeb and quality >= 10: quality -= 5
quality -= 5 img.set_compression_quality(quality)
img.set_compression_quality(quality) data = img.export('jpg')
data = img.export('jpg') if len(data) <= maxsizeb:
if len(data) <= maxsizeb: return data
return data orig_data = data
orig_data = data
scale = 0.9 scale = 0.9
while len(data) >= maxsizeb and scale >= 0.05: while len(data) >= maxsizeb and scale >= 0.05:
@ -138,8 +137,7 @@ def rescale_image(data, maxsizeb, dimen=None):
img.load(orig_data) img.load(orig_data)
w, h = img.size w, h = img.size
img.size = (int(scale*w), int(scale*h)) img.size = (int(scale*w), int(scale*h))
if hasattr(img, 'set_compression_quality'): img.set_compression_quality(quality)
img.set_compression_quality(quality)
data = img.export('jpg') data = img.export('jpg')
scale -= 0.05 scale -= 0.05
return data return data

4
src/calibre/utils/magick/draw.py
View File

@ -42,7 +42,7 @@ def save_cover_data_to(data, path, bgcolor='#ffffff', resize_to=None,
if resize_to is not None: if resize_to is not None:
img.size = (resize_to[0], resize_to[1]) img.size = (resize_to[0], resize_to[1])
changed = True changed = True
if not hasattr(img, 'has_transparent_pixels') or img.has_transparent_pixels(): if img.has_transparent_pixels():
canvas = create_canvas(img.size[0], img.size[1], bgcolor) canvas = create_canvas(img.size[0], img.size[1], bgcolor)
canvas.compose(img) canvas.compose(img)
img = canvas img = canvas
@ -72,7 +72,7 @@ def thumbnail(data, width=120, height=120, bgcolor='#ffffff', fmt='jpg'):
img.size = (nwidth, nheight) img.size = (nwidth, nheight)
canvas = create_canvas(img.size[0], img.size[1], bgcolor) canvas = create_canvas(img.size[0], img.size[1], bgcolor)
canvas.compose(img) canvas.compose(img)
if fmt == 'jpg' and hasattr(canvas, 'set_compression_quality'): if fmt == 'jpg':
canvas.set_compression_quality(70) canvas.set_compression_quality(70)
return (canvas.size[0], canvas.size[1], canvas.export(fmt)) return (canvas.size[0], canvas.size[1], canvas.export(fmt))