diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index 54d29cf..e62d8a7 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -144,7 +144,7 @@ class ComicPageParser: self.payload.append(['N', self.source, new_image, self.color, self.fill]) elif (width > height) != (dstwidth > dstheight) and width <= dstheight and height <= dstwidth \ and not self.opt.webtoon and self.opt.splitter == 1: - self.payload.append(['R', self.source, self.image.rotate(90, Image.BICUBIC, True), self.color, self.fill]) + self.payload.append(['R', self.source, self.image.rotate(90, Image.Resampling.BICUBIC, True), self.color, self.fill]) elif (width > height) != (dstwidth > dstheight) and not self.opt.webtoon: if self.opt.splitter != 1: if width > height: @@ -162,7 +162,7 @@ class ComicPageParser: self.payload.append(['S1', self.source, pageone, self.color, self.fill]) self.payload.append(['S2', self.source, pagetwo, self.color, self.fill]) if self.opt.splitter > 0: - self.payload.append(['R', self.source, self.image.rotate(90, Image.BICUBIC, True), + self.payload.append(['R', self.source, self.image.rotate(90, Image.Resampling.BICUBIC, True), self.color, self.fill]) else: self.payload.append(['N', self.source, self.image, self.color, self.fill]) @@ -300,9 +300,9 @@ class ComicPage: def resizeImage(self): if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]: - method = Image.BICUBIC + method = Image.Resampling.BICUBIC else: - method = Image.LANCZOS + method = Image.Resampling.LANCZOS if self.opt.stretch or (self.opt.kfx and ('-KCC-B' in self.targetPath or '-KCC-C' in self.targetPath)): self.image = self.image.resize(self.size, method) elif self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1] and not self.opt.upscale: @@ -311,7 +311,7 @@ class ComicPage: borderh = int((self.size[1] - self.image.size[1]) / 2) self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=self.fill) if self.image.size[0] != self.size[0] or self.image.size[1] != self.size[1]: - self.image = ImageOps.fit(self.image, self.size, method=Image.BICUBIC, centering=(0.5, 0.5)) + self.image = ImageOps.fit(self.image, self.size, method=Image.Resampling.BICUBIC, centering=(0.5, 0.5)) else: if self.opt.format == 'CBZ' or self.opt.kfx: ratioDev = float(self.size[0]) / float(self.size[1]) @@ -327,7 +327,7 @@ class ComicPage: wsize = int((float(self.image.size[0]) * float(hpercent))) self.image = self.image.resize((wsize, self.size[1]), method) if self.image.size[0] > self.size[0] or self.image.size[1] > self.size[1]: - self.image.thumbnail(self.size, Image.LANCZOS) + self.image.thumbnail(self.size, Image.Resampling.LANCZOS) def getBoundingBox(self, tmptmg): min_margin = [int(0.005 * i + 0.5) for i in tmptmg.size] @@ -381,7 +381,7 @@ class Cover: self.image = ImageOps.autocontrast(self.image) if not self.options.forcecolor: self.image = self.image.convert('L') - self.image.thumbnail(self.options.profileData[1], Image.LANCZOS) + self.image.thumbnail(self.options.profileData[1], Image.Resampling.LANCZOS) self.save() def save(self): @@ -391,7 +391,7 @@ class Cover: raise RuntimeError('Failed to save cover.') def saveToKindle(self, kindle, asin): - self.image = self.image.resize((300, 470), Image.ANTIALIAS) + self.image = self.image.resize((300, 470), Image.Resampling.LANCZOS) try: self.image.save(os.path.join(kindle.path.split('documents')[0], 'system', 'thumbnails', 'thumbnail_' + asin + '_EBOK_portrait.jpg'), 'JPEG', optimize=1, quality=85)