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

oops

Browse Source
This commit is contained in:
Kovid Goyal 2007-07-11 03:25:56 +00:00
parent 2467d2b64c
commit 5616a14c28
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,7 +796,7 @@ class HTMLConverter(object):
return pt.name return pt.name
except IOError: # PIL chokes on interlaced PNG images except IOError: # PIL chokes on interlaced PNG images
print >>sys.stderr, 'Unable to process interlaced PNG', path print >>sys.stderr, 'Unable to process interlaced PNG', path
return return None
pheight = int(self.current_page.pageStyle.attrs['textheight']) pheight = int(self.current_page.pageStyle.attrs['textheight'])
pwidth = int(self.current_page.pageStyle.attrs['textwidth']) pwidth = int(self.current_page.pageStyle.attrs['textwidth'])
@ -837,8 +837,8 @@ class HTMLConverter(object):
print >>sys.stderr, 'Unable to autorotate interlaced PNG', path print >>sys.stderr, 'Unable to autorotate interlaced PNG', path
print >>sys.stderr, err print >>sys.stderr, err
finally: finally:
pt.close() pt.close()
if height > pheight: if height > pheight:
corrf = pheight/(1.*height) corrf = pheight/(1.*height)
width, height = floor(corrf*width), pheight-1 width, height = floor(corrf*width), pheight-1
@ -854,14 +854,16 @@ class HTMLConverter(object):
width, height = floor(corrf*width), pheight-1 width, height = floor(corrf*width), pheight-1
path = scale_image(width, height) path = scale_image(width, height)
width, height = int(width), int(height) width, height = int(width), int(height)
if not path:
return
if not self.images.has_key(path): if not self.images.has_key(path):
self.images[path] = ImageStream(path) self.images[path] = ImageStream(path)
im = Image(self.images[path], x0=0, y0=0, x1=width, y1=height,\ im = Image(self.images[path], x0=0, y0=0, x1=width, y1=height,\
xsize=width, ysize=height) xsize=width, ysize=height)
self.process_alignment(tag_css) self.process_alignment(tag_css)
if max(width, height) <= min(pwidth, pheight)/5.: if max(width, height) <= min(pwidth, pheight)/5.: