about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <[email protected]>2017-03-25 09:16:29 +0100
committerPaweł Jastrzębski <[email protected]>2017-03-25 09:16:29 +0100
commita53c272bd0e04c0a5fb1e1db609ffe8edd100216 (patch)
tree0216913293ceadaf14b85a9a428100d5203cc897
parentCode cleanup (diff)
downloadkcc-a53c272bd0e04c0a5fb1e1db609ffe8edd100216.tar.gz
kcc-a53c272bd0e04c0a5fb1e1db609ffe8edd100216.tar.bz2
kcc-a53c272bd0e04c0a5fb1e1db609ffe8edd100216.zip
Tweaked webtoon splitter
-rw-r--r--kindlecomicconverter/comic2panel.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/kindlecomicconverter/comic2panel.py b/kindlecomicconverter/comic2panel.py
index f1c54e2..2bb92b8 100644
--- a/kindlecomicconverter/comic2panel.py
+++ b/kindlecomicconverter/comic2panel.py
@@ -100,7 +100,7 @@ def splitImage(work):
         opt = work[2]
         filePath = os.path.join(path, name)
         imgOrg = Image.open(filePath).convert('RGB')
-        imgProcess = Image.open(filePath).convert('L')
+        imgProcess = Image.open(filePath).convert('1')
         widthImg, heightImg = imgOrg.size
         if heightImg > opt.height:
             if opt.debug:
@@ -123,24 +123,9 @@ def splitImage(work):
                     panels.append((panelY1, panelY2, panelY2 - panelY1))
                 yWork += 5
 
-            # Merge nearby panels
-            panelsMerged = []
-            previousPanel = False
-            for panel in panels:
-                if not previousPanel:
-                    previousPanel = panel
-                    continue
-                if panel[0] - previousPanel[1] <= 15:
-                    previousPanel = (previousPanel[0], panel[1], panel[1] - previousPanel[0])
-                else:
-                    panelsMerged.append(previousPanel)
-                    previousPanel = panel
-            if panels:
-                panelsMerged.append(panels[-1])
-
             # Split too big panels
             panelsProcessed = []
-            for panel in panelsMerged:
+            for panel in panels:
                 if panel[2] <= opt.height * 1.5:
                     panelsProcessed.append(panel)
                 elif panel[2] < opt.height * 2: