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

Fix conversion to JPEG

Browse Source
This commit is contained in:
Kovid Goyal 2007-05-14 23:18:24 +00:00
parent 5961fe6fc7
commit 98f18fb074
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libprs500/__init__.py
View File

@ -33,7 +33,7 @@ You may have to adjust the GROUP and the location of the rules file to
suit your distribution. suit your distribution.
""" """
__version__ = "0.3.29" __version__ = "0.3.30"
__docformat__ = "epytext" __docformat__ = "epytext"
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"

14
src/libprs500/lrf/html/convert_from.py
View File

@ -631,11 +631,11 @@ class HTMLConverter(object):
''' '''
align = 'head' align = 'head'
if css.has_key('text-align'): if css.has_key('text-align'):
val = css['text-align'] val = css['text-align'].lower()
if val in ["right", "foot"]: if val in ["right", "foot"]:
align = "foot" align = "foot"
elif val == "center": elif val == "center":
align = "center" align = "center"
if align != self.current_block.textStyle.attrs['align']: if align != self.current_block.textStyle.attrs['align']:
self.current_para.append_to(self.current_block) self.current_para.append_to(self.current_block)
self.current_block.append_to(self.current_page) self.current_block.append_to(self.current_page)
@ -799,7 +799,7 @@ class HTMLConverter(object):
def scale_image(width, height): def scale_image(width, height):
pt = PersistentTemporaryFile(suffix='.jpeg') pt = PersistentTemporaryFile(suffix='.jpeg')
im.resize((int(width), int(height)), PILImage.ANTIALIAS).save(pt, 'JPEG') im.resize((int(width), int(height)), PILImage.ANTIALIAS).convert('RGB').save(pt, 'JPEG')
pt.close() pt.close()
self.scaled_images[path] = pt self.scaled_images[path] = pt
return pt.name return pt.name
@ -832,7 +832,7 @@ class HTMLConverter(object):
ysize=ceil(height*factor))) ysize=ceil(height*factor)))
else: else:
pb = self.current_block pb = self.current_block
self.end_current_para() self.end_current_para()
self.process_alignment(tag_css) self.process_alignment(tag_css)
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)
@ -937,7 +937,7 @@ class HTMLConverter(object):
self.current_para = Paragraph() self.current_para = Paragraph()
self.current_block = self.book.create_text_block(textStyle=pb.textStyle, self.current_block = self.book.create_text_block(textStyle=pb.textStyle,
blockStyle=pb.blockStyle) blockStyle=pb.blockStyle)
elif tagname in ['p', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']: elif tagname in ['p', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']:
if self.chapter_detection and tagname.startswith('h'): if self.chapter_detection and tagname.startswith('h'):
src = self.get_text(tag) src = self.get_text(tag)
if self.chapter_regex.search(src): if self.chapter_regex.search(src):
@ -946,7 +946,7 @@ class HTMLConverter(object):
self.end_page() self.end_page()
self.page_break_found = True self.page_break_found = True
self.end_current_para() self.end_current_para()
self.lstrip_toggle = True self.lstrip_toggle = True
if tag_css.has_key('text-indent'): if tag_css.has_key('text-indent'):
indent = Span.unit_convert(tag_css['text-indent']) indent = Span.unit_convert(tag_css['text-indent'])
if not indent: if not indent:
@ -1008,7 +1008,7 @@ def process_file(path, options):
matches = glob.glob(re.sub('-', '', item[1])+'.*') matches = glob.glob(re.sub('-', '', item[1])+'.*')
for match in matches: for match in matches:
if match.lower().endswith('.jpeg') or match.lower().endswith('.jpg') or \ if match.lower().endswith('.jpeg') or match.lower().endswith('.jpg') or \
match.lower().endswith('.gif') or match.lower().endswith('.bmp'): match.lower().endswith('.gif') or match.lower().endswith('.png'):
options.cover = match options.cover = match
break break
if options.cover: if options.cover: