Fixes to grayscale pages in forcecolor mode (#978)

* Fix bit depth of non-color pages in forcecolor mode

* Optimization for JPEG non-color pages in forcecolor mode

kindlecomicconverter/comic2ebook.py

@@ -642,8 +642,8 @@ def imgFileProcessing(work):
             img.autocontrastImage()
             img.resizeImage()
             img.optimizeForDisplay(opt.reducerainbow)
-            if opt.forcepng and not opt.forcecolor:
-                img.quantizeImage()
+            if not opt.forcecolor or (opt.forcecolor and not workImg.color):
+                img.convertToGrayscaleOrQuantize()
             output.append(img.saveToDir())
         return output
     except Exception:

kindlecomicconverter/image.py

@@ -304,8 +304,6 @@ class ComicPage:
     def saveToDir(self):
         try:
             flags = []
-            if not self.opt.forcecolor and not self.opt.forcepng:
-                self.image = self.image.convert('L')
             if self.rotated:
                 flags.append('Rotated')
             if self.fill != 'white':
@@ -353,6 +351,12 @@ class ComicPage:
         else:
             self.image = ImageOps.autocontrast(Image.eval(self.image, lambda a: int(255 * (a / 255.) ** gamma)))
 
+    def convertToGrayscaleOrQuantize(self):
+        if self.opt.forcepng:
+            self.quantizeImage()
+        else:
+            self.image = self.image.convert('L')
+
     def quantizeImage(self):
         palImg = Image.new('P', (1, 1))
         palImg.putpalette(self.palette)