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

Respect aspect ratio when resizing cover

Browse Source
This commit is contained in:
Kovid Goyal 2007-10-16 04:32:21 +00:00
parent 901a41389a
commit d11844ef8a
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/libprs500/ebooks/lrf/html/convert_from.py
View File

@ -64,6 +64,20 @@ def munge_paths(basepath, url):
path = os.path.join(os.path.dirname(basepath), path) path = os.path.join(os.path.dirname(basepath), path)
return os.path.normpath(path), fragment return os.path.normpath(path), fragment
def fit_image(width, height, pwidth, pheight):
scaled = height > pheight or width > pwidth
if height > pheight:
corrf = pheight/float(height)
width, height = floor(corrf*width), pheight
if width > pwidth:
corrf = (pwidth)/float(width)
width, height = pwidth, floor(corrf*height)
if height > pheight:
corrf = pheight/float(height)
width, height = floor(corrf*width), pheight
return scaled, int(width), int(height)
class HTMLConverter(object): class HTMLConverter(object):
SELECTOR_PAT = re.compile(r"([A-Za-z0-9\-\_\:\.]+[A-Za-z0-9\-\_\:\.\s\,]*)\s*\{([^\}]*)\}") SELECTOR_PAT = re.compile(r"([A-Za-z0-9\-\_\:\.]+[A-Za-z0-9\-\_\:\.\s\,]*)\s*\{([^\}]*)\}")
PAGE_BREAK_PAT = re.compile(r'page-break-(?:after|before)\s*:\s*(\w+)', re.IGNORECASE) PAGE_BREAK_PAT = re.compile(r'page-break-(?:after|before)\s*:\s*(\w+)', re.IGNORECASE)
@ -603,17 +617,23 @@ class HTMLConverter(object):
def add_image_page(self, path): def add_image_page(self, path):
if os.access(path, os.R_OK): if os.access(path, os.R_OK):
self.end_page() self.end_page()
pwidth, pheight = self.profile.screen_width, self.profile.screen_height - \
self.profile.fudge
page = self.book.create_page(evensidemargin=0, oddsidemargin=0, page = self.book.create_page(evensidemargin=0, oddsidemargin=0,
topmargin=0, textwidth=self.profile.screen_width, topmargin=0, textwidth=pwidth,
headheight=0, headsep=0, footspace=0, headheight=0, headsep=0, footspace=0,
footheight=0, footheight=0,
textheight=self.profile.screen_height) textheight=pheight)
if not self.images.has_key(path): if not self.images.has_key(path):
self.images[path] = ImageStream(path) self.images[path] = ImageStream(path)
ib = ImageBlock(self.images[path], x1=self.profile.screen_width, im = PILImage.open(path)
y1=self.profile.screen_height, blockwidth=self.profile.screen_width, width, height = im.size
blockheight=self.profile.screen_height) canvas = Canvas(pwidth, pheight)
page.append(ib) ib = ImageBlock(self.images[path], x1=width,
y1=height, xsize=width, ysize=height,
blockwidth=width, blockheight=height)
canvas.put_object(ib, int((pwidth-width)/2.), int((pheight-height)/2.))
page.append(canvas)
self.book.append(page) self.book.append(page)
def process_children(self, ptag, pcss, ppcss={}): def process_children(self, ptag, pcss, ppcss={}):
@ -870,22 +890,10 @@ class HTMLConverter(object):
finally: finally:
pt.close() pt.close()
if height > pheight: scaled, width, height = fit_image(width, height, pwidth, pheight)
corrf = pheight/(1.*height) if scaled:
width, height = floor(corrf*width), pheight-1
if width > pwidth:
corrf = (pwidth)/(1.*width)
width, height = pwidth-1, floor(corrf*height)
path = scale_image(width, height) path = scale_image(width, height)
if width > pwidth:
corrf = pwidth/(1.*width)
width, height = pwidth-1, floor(corrf*height)
if height > pheight:
corrf = (pheight)/(1.*height)
width, height = floor(corrf*width), pheight-1
path = scale_image(width, height)
width, height = int(width), int(height)
if not path: if not path:
return return
@ -1556,16 +1564,23 @@ def process_file(path, options, logger=None):
if os.access(options.cover, os.R_OK): if os.access(options.cover, os.R_OK):
th = Device.THUMBNAIL_HEIGHT th = Device.THUMBNAIL_HEIGHT
im = PILImage.open(options.cover) im = PILImage.open(options.cover)
cim = im.resize((options.profile.screen_width, pwidth, pheight = options.profile.screen_width, \
options.profile.screen_height - options.profile.fudge), options.profile.screen_height - options.profile.fudge
PILImage.BICUBIC).convert('RGB') width, height = im.size
if width < pwidth:
corrf = float(pwidth)/width
width, height = pwidth, int(corrf*height)
scaled, width, height = fit_image(width, height, pwidth, pheight)
cim = im.resize((width, height), PILImage.BICUBIC).convert('RGB') if \
scaled else im
cf = PersistentTemporaryFile(prefix=__appname__+"_", suffix=".jpg") cf = PersistentTemporaryFile(prefix=__appname__+"_", suffix=".jpg")
cf.close() cf.close()
cim.save(cf.name) cim.save(cf.name)
options.cover = cf.name options.cover = cf.name
tim = im.resize((int(0.75*th), th), PILImage.ANTIALIAS).convert('RGB') tim = im.resize((int(0.75*th), th), PILImage.ANTIALIAS).convert('RGB')
tf = PersistentTemporaryFile(prefix="html2lrf_", suffix=".jpg") tf = PersistentTemporaryFile(prefix=__appname__+'_', suffix=".jpg")
tf.close() tf.close()
tim.save(tf.name) tim.save(tf.name)
tpath = tf.name tpath = tf.name