public/kcc
1
0
Fork 0
mirror of https://github.com/ciromattia/kcc synced 2026-10-11 12:02:31 +00:00
Code Issues Releases Wiki Activity

MAJOR Landscape Mode improvement

Browse Source 
No idea how this change will impact Non-Kindle devices but quality
increase of spitted pages is amazing.
This commit is contained in:
Paweł Jastrzębski
2013-03-17 08:47:35 +01:00
parent a597173b71
commit 943431346d
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kcc/comic2ebook.py
+4 -10
View File
@@ -289,11 +289,11 @@ def isInFilelist(filename, filelist):
return seen return seen
def applyImgOptimization(img, isSplit=False, toRight=False): def applyImgOptimization(img, isSplit=False):
img.cropWhiteSpace(10.0) img.cropWhiteSpace(10.0)
if options.cutpagenumbers: if options.cutpagenumbers:
img.cutPageNumber() img.cutPageNumber()
img.resizeImage(options.upscale, options.stretch, options.black_borders, isSplit, toRight, options.landscapemode, img.resizeImage(options.upscale, options.stretch, options.black_borders, isSplit, options.landscapemode,
options.panelviewhq) options.panelviewhq)
img.optimizeImage(options.gamma) img.optimizeImage(options.gamma)
if not options.notquantize: if not options.notquantize:
@@ -322,12 +322,6 @@ def dirImgProcess(path):
if split is not None: if split is not None:
if options.verbose: if options.verbose:
print "Splitted " + afile print "Splitted " + afile
if options.righttoleft:
toRight1 = False
toRight2 = True
else:
toRight1 = True
toRight2 = False
if options.righttoleft: if options.righttoleft:
if facing == "left": if facing == "left":
splitCount += 1 splitCount += 1
@@ -337,10 +331,10 @@ def dirImgProcess(path):
splitCount += 1 splitCount += 1
facing = "left" facing = "left"
img0 = image.ComicPage(split[0], options.profile) img0 = image.ComicPage(split[0], options.profile)
applyImgOptimization(img0, True, toRight1) applyImgOptimization(img0, True)
img0.saveToDir(dirpath, options.notquantize) img0.saveToDir(dirpath, options.notquantize)
img1 = image.ComicPage(split[1], options.profile) img1 = image.ComicPage(split[1], options.profile)
applyImgOptimization(img1, True, toRight2) applyImgOptimization(img1, True)
img1.saveToDir(dirpath, options.notquantize) img1.saveToDir(dirpath, options.notquantize)
else: else:
if facing == "right": if facing == "right":
kcc/image.py
+2 -10
View File
@@ -143,8 +143,8 @@ class ComicPage:
palImg.putpalette(self.palette) palImg.putpalette(self.palette)
self.image = self.image.quantize(palette=palImg) self.image = self.image.quantize(palette=palImg)
def resizeImage(self, upscale=False, stretch=False, black_borders=False, isSplit=False, toRight=False, def resizeImage(self, upscale=False, stretch=False, black_borders=False, isSplit=False, landscapeMode=False,
landscapeMode=False, panelViewHQ=False): panelViewHQ=False):
method = Image.ANTIALIAS method = Image.ANTIALIAS
if black_borders: if black_borders:
fill = 'black' fill = 'black'
@@ -157,20 +157,12 @@ class ComicPage:
if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]: if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
if not upscale: if not upscale:
if isSplit and landscapeMode: if isSplit and landscapeMode:
borderw = (self.size[0] - self.image.size[0])
borderh = (self.size[1] - self.image.size[1]) / 2 borderh = (self.size[1] - self.image.size[1]) / 2
self.image = ImageOps.expand(self.image, border=(0, borderh), fill=fill) self.image = ImageOps.expand(self.image, border=(0, borderh), fill=fill)
tempImg = Image.new(self.image.mode, (self.image.size[0] + borderw, self.image.size[1]), fill)
if toRight:
tempImg.paste(self.image, (borderw, 0))
else:
tempImg.paste(self.image, (0, 0))
self.image = tempImg
else: else:
borderw = (self.size[0] - self.image.size[0]) / 2 borderw = (self.size[0] - self.image.size[0]) / 2
borderh = (self.size[1] - self.image.size[1]) / 2 borderh = (self.size[1] - self.image.size[1]) / 2
self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=fill) self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=fill)
return self.image
else: else:
method = Image.NEAREST method = Image.NEAREST
if stretch: if stretch: