From 5fe3aabc4f1e744b85c5aa8c596b5c00f6c63226 Mon Sep 17 00:00:00 2001
From: Ciro Mattia Gonano <ciromattia@gmail.com>
Date: Thu, 6 Dec 2012 11:21:56 +0100
Subject: [PATCH] Version 1.2 - comic optimization, mangling, and more coherent
 codebase

---
 KindleComicConverter.app/Contents/Info.plist  |   6 +-
 .../Contents/Resources/Scripts/main.scpt      | Bin 37534 -> 38514 bytes
 .../Contents/Resources/cbxarchive.py          |  81 +++++++
 .../Contents/Resources/comic2ebook.py         | 176 ++++++---------
 .../Resources/description.rtfd/TXT.rtf        |  16 +-
 .../Contents/Resources/image.py               | 207 ++++++++++++++++++
 README.md                                     |  35 ++-
 cbxarchive.py                                 |  81 +++++++
 comic2ebook.py                                | 176 ++++++---------
 image.py                                      | 207 ++++++++++++++++++
 10 files changed, 751 insertions(+), 234 deletions(-)
 create mode 100644 KindleComicConverter.app/Contents/Resources/cbxarchive.py
 create mode 100755 KindleComicConverter.app/Contents/Resources/image.py
 create mode 100644 cbxarchive.py
 create mode 100755 image.py

diff --git a/KindleComicConverter.app/Contents/Info.plist b/KindleComicConverter.app/Contents/Info.plist
index 639da80..600af91 100644
--- a/KindleComicConverter.app/Contents/Info.plist
+++ b/KindleComicConverter.app/Contents/Info.plist
@@ -55,11 +55,11 @@
 		<key>name</key>
 		<string>ScriptWindowState</string>
 		<key>positionOfDivider</key>
-		<real>0.0</real>
+		<real>568</real>
 		<key>savedFrame</key>
-		<string>444 56 1021 972 0 0 1680 1028 </string>
+		<string>144 338 889 690 0 0 1680 1028 </string>
 		<key>selectedTabView</key>
-		<string>event log</string>
+		<string>result</string>
 	</dict>
 </dict>
 </plist>
diff --git a/KindleComicConverter.app/Contents/Resources/Scripts/main.scpt b/KindleComicConverter.app/Contents/Resources/Scripts/main.scpt
index 2db05407410e479b2738144e5302466c786b70e4..02a10ac6c58a89a1b9ba79c490217c5566f4c782 100644
GIT binary patch
delta 15490
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

delta 14329
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
OV21V|_1Eds>;Dh$E&=)g

diff --git a/KindleComicConverter.app/Contents/Resources/cbxarchive.py b/KindleComicConverter.app/Contents/Resources/cbxarchive.py
new file mode 100644
index 0000000..18fe690
--- /dev/null
+++ b/KindleComicConverter.app/Contents/Resources/cbxarchive.py
@@ -0,0 +1,81 @@
+# Copyright (c) 2012 Ciro Mattia Gonano <ciromattia@gmail.com>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+__version__ = '1.0'
+
+import os
+
+class CBxArchive:
+    def __init__(self, origFileName):
+        self.cbxexts = ['.zip','.cbz','.rar','.cbr']
+        self.origFileName = origFileName
+        self.filename = os.path.splitext(origFileName)
+        self.path = self.filename[0]
+
+    def isCbxFile(self):
+        result = (self.filename[1].lower() in self.cbxexts)
+        if result == True:
+            return result
+        return False
+
+    def getPath(self):
+        return self.path
+
+    def extractCBZ(self):
+        try:
+            from zipfile import ZipFile
+        except ImportError:
+            self.cbzFile = None
+        cbzFile = ZipFile(self.origFileName)
+        for f in cbzFile.namelist():
+            if (f.startswith('__MACOSX') or f.endswith('.DS_Store')):
+                pass # skip MacOS special files
+            elif f.endswith('/'):
+                try:
+                    os.makedirs(self.path+'/'+f)
+                except:
+                    pass #the dir exists so we are going to extract the images only.
+            else:
+                cbzFile.extract(f, self.path)
+
+    def extractCBR(self):
+        try:
+            import rarfile
+        except ImportError:
+            self.cbrFile = None
+        cbrFile = rarfile.RarFile(self.origFileName)
+        for f in cbrFile.namelist():
+            if (f.startswith('__MACOSX') or f.endswith('.DS_Store')):
+                pass # skip MacOS special files
+            elif f.endswith('/'):
+                try:
+                    os.makedirs(self.path+'/'+f)
+                except:
+                    pass #the dir exists so we are going to extract the images only.
+            else:
+                cbrFile.extract(f, self.path)
+
+    def extract(self):
+        if ('.cbr' == self.filename[1].lower() or '.rar' == self.filename[1].lower()):
+            self.extractCBR()
+        elif ('.cbz' == self.filename[1].lower() or '.zip' == self.filename[1].lower()):
+            self.extractCBZ()
+        dir = os.listdir(self.path)
+        if (len(dir) == 1):
+            import shutil
+            for f in os.listdir(self.path + "/" + dir[0]):
+                shutil.move(self.path + "/" + dir[0] + "/" + f,self.path)
+            os.rmdir(self.path + "/" + dir[0])
diff --git a/KindleComicConverter.app/Contents/Resources/comic2ebook.py b/KindleComicConverter.app/Contents/Resources/comic2ebook.py
index 4fe1417..a4bd469 100755
--- a/KindleComicConverter.app/Contents/Resources/comic2ebook.py
+++ b/KindleComicConverter.app/Contents/Resources/comic2ebook.py
@@ -19,113 +19,48 @@
 # Changelog
 #  1.00 - Initial version
 #  1.10 - Added support for CBZ/CBR files
+#  1.11 - Added support for ZIP/RAR extensions
+#  1.20 - Comic optimizations! Split pages not target-oriented (landscape
+#       with portrait target or portrait with landscape target), add palette
+#       and other image optimizations from Mangle.
+#       WARNING: PIL is required for all image mangling!
 #
 # Todo:
 #   - Add gracefully exit for CBR if no rarfile.py and no unrar
 #       executable are found
 #   - Improve error reporting
-#
+#   - recurse into dirtree for multiple comics
 
-__version__ = '1.10'
+__version__ = '1.20'
 
 import os
 import sys
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-class CBxArchive:
-    def __init__(self, origFileName):
-        self.cbxexts = ['.cbz', '.cbr']
-        self.origFileName = origFileName
-        self.filename = os.path.splitext(origFileName)
-        self.path = self.filename[0]
-
-    def isCbxFile(self):
-        result = (self.filename[1].lower() in self.cbxexts)
-        if result == True:
-            return result
-        return False
-
-    def getPath(self):
-        return self.path
-
-    def extractCBZ(self):
-        try:
-            from zipfile import ZipFile
-        except ImportError:
-            self.cbzFile = None
-        cbzFile = ZipFile(self.origFileName)
-        for f in cbzFile.namelist():
-            if (f.startswith('__MACOSX') or f.endswith('.DS_Store')):
-                pass # skip MacOS special files
-            elif f.endswith('/'):
-                try:
-                    os.makedirs(self.path+f)
-                except:
-                    pass #the dir exists so we are going to extract the images only.
-            else:
-                cbzFile.extract(f, self.path)
-
-    def extractCBR(self):
-        try:
-            import rarfile
-        except ImportError:
-            self.cbrFile = None
-        cbrFile = rarfile.RarFile(self.origFileName)
-        for f in cbrFile.namelist():
-            if f.endswith('/'):
-                try:
-                    os.makedirs(self.path+f)
-                except:
-                    pass #the dir exists so we are going to extract the images only.
-            else:
-                cbrFile.extract(f, self.path)
-
-    def extract(self):
-        if ('.cbr' == self.filename[1].lower()):
-            self.extractCBR()
-        elif ('.cbz' == self.filename[1].lower()):
-            self.extractCBZ()
-        dir = os.listdir(self.path)
-        if (len(dir) == 1):
-            import shutil
-            for f in os.listdir(self.path + "/" + dir[0]):
-                shutil.move(self.path + "/" + dir[0] + "/" + f,self.path)
-            os.rmdir(self.path + "/" + dir[0])
+import cbxarchive
 
 class HTMLbuilder:
+
     def getResult(self):
-        if (self.filename[0].startswith('.') or (self.filename[1] != '.png' and self.filename[1] != '.jpg' and self.filename[1] != '.jpeg')):
-            return None
-        return self.filename
+        return getImageFileName(self.file)
 
     def __init__(self, dstdir, file):
-        self.filename = os.path.splitext(file)
-        basefilename = self.filename[0]
-        ext = self.filename[1]
-        if (basefilename.startswith('.') or (ext != '.png' and ext != '.jpg' and ext != '.jpeg')):
-            return
-        htmlfile = dstdir + '/' + basefilename + '.html'
-        f = open(htmlfile, "w");
-        f.writelines(["<!DOCTYPE html SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
-                    "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n",
-                    "<head>\n",
-                    "<title>",basefilename,"</title>\n",
-                    "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n",
-                    "</head>\n",
-                    "<body>\n",
-                    "<div><img src=\"",file,"\" /></div>\n",
-                    "</body>\n",
-                    "</html>"
-                    ])
-        f.close()
+        self.file = file
+        filename = getImageFileName(file)
+        if (filename != None):
+            htmlfile = dstdir + '/' + filename[0] + '.html'
+            f = open(htmlfile, "w");
+            f.writelines(["<!DOCTYPE html SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
+                          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n",
+                          "<head>\n",
+                          "<title>",filename[0],"</title>\n",
+                          "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n",
+                          "</head>\n",
+                          "<body>\n",
+                          "<div><img src=\"",file,"\" /></div>\n",
+                          "</body>\n",
+                          "</html>"
+                          ])
+            f.close()
+        return None
 
 class NCXbuilder:
     def __init__(self, dstdir, title):
@@ -151,7 +86,7 @@ class OPFBuilder:
             width, height = im.size
             imgres = str(width) + "x" + str(height)
         except ImportError:
-	    print "Could not load PIL, falling back on default HD"
+            print "Could not load PIL, falling back on default HD"
             imgres = "758x1024"
         f = open(opffile, "w");
         f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
@@ -181,32 +116,65 @@ class OPFBuilder:
         f.close()
         return
 
+def getImageFileName(file):
+    filename = os.path.splitext(file)
+    if (filename[0].startswith('.') or (filename[1].lower() != '.png' and filename[1].lower() != '.jpg' and filename[1].lower() != '.jpeg')):
+        return None
+    return filename
+
+def isInFilelist(file,list):
+    filename = os.path.splitext(file)
+    seen = False
+    for item in list:
+        if filename[0] == item[0]:
+            seen = True
+    return seen
+
 if __name__ == "__main__":
-    sys.stdout=Unbuffered(sys.stdout)
     print ('comic2ebook v%(__version__)s. '
        'Written 2012 by Ciro Mattia Gonano.' % globals())
-    if len(sys.argv)<2 or len(sys.argv)>3:
+    if len(sys.argv)<3 or len(sys.argv)>4:
         print "Generates HTML, NCX and OPF for a Comic ebook from a bunch of images"
         print "Optimized for creating Mobipockets to be read into Kindle Paperwhite"
         print "Usage:"
-        print "    %s <dir> <title>" % sys.argv[0]
+        print "    %s <profile> <dir> <title>" % sys.argv[0]
         print " <title> is optional"
         sys.exit(1)
     else:
-        dir = sys.argv[1]
-        cbx = CBxArchive(dir)
+        profile = sys.argv[1]
+        dir = sys.argv[2]
+        cbx = cbxarchive.CBxArchive(dir)
         if cbx.isCbxFile():
             cbx.extract()
             dir = cbx.getPath()
-        if len(sys.argv)==3:
-            title = sys.argv[2]
+        if len(sys.argv)==4:
+            title = sys.argv[3]
         else:
             title = "comic"
         filelist = []
+        try:
+            import image
+            print "Splitting double pages..."
+            for file in os.listdir(dir):
+                if (getImageFileName(file) != None):
+                    img = image.ComicPage(dir+'/'+file, profile)
+                    img.splitPage(dir)
+            for file in os.listdir(dir):
+                if (getImageFileName(file) != None):
+                    print "Optimizing " + file + " for " + profile
+                    img = image.ComicPage(dir+'/'+file, profile)
+                    img.resizeImage()
+                    img.frameImage()
+                    img.quantizeImage()
+                    img.saveToDir(dir)
+        except ImportError:
+            print "Could not load PIL, not optimizing image"
+
         for file in os.listdir(dir):
-            filename = HTMLbuilder(dir,file).getResult()
-            if (filename != None):
-                filelist.append(filename)
+            if (getImageFileName(file) != None and isInFilelist(file,filelist) == False):
+                filename = HTMLbuilder(dir,file).getResult()
+                if (filename != None):
+                    filelist.append(filename)
         NCXbuilder(dir,title)
         OPFBuilder(dir,title,filelist)
     sys.exit(0)
diff --git a/KindleComicConverter.app/Contents/Resources/description.rtfd/TXT.rtf b/KindleComicConverter.app/Contents/Resources/description.rtfd/TXT.rtf
index 0132f76..c8de892 100644
--- a/KindleComicConverter.app/Contents/Resources/description.rtfd/TXT.rtf
+++ b/KindleComicConverter.app/Contents/Resources/description.rtfd/TXT.rtf
@@ -5,8 +5,18 @@
 
 \f0\fs24 \cf2 \CocoaLigature0 Copyright (c) 2012 Ciro Mattia Gonano <ciromattia@gmail.com>\
 \
-This script heavily relies on KindleStrip (C) by Paul Durrant and released in public domain	(http://www.mobileread.com/forums/showthread.php?t=96903)\
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.\
+\
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\
+\
+This script heavily relies on KindleStrip (C) by Paul Durrant and released in public domain (http://www.mobileread.com/forums/showthread.php?t=96903)\
 Also, you need to have kindlegen v2.7 (with KF8 support) which is downloadable from Amazon website.\
 \
-This script is released under The MIT License (http://opensource.org/licenses/MIT)\
-}
\ No newline at end of file
+Changelog:\
+	1.0: first release\
+	1.10: add CBZ/CBR support to comic2ebook.py\
+	1.11: add CBZ/CBR support to KindleComicConverter\
+	1.2: added image page splitting and optimizations\
+\
+Todo:\
+	- bundle a script to manipulate images (to get rid of Mangle/E-nki/whatsoever)}
\ No newline at end of file
diff --git a/KindleComicConverter.app/Contents/Resources/image.py b/KindleComicConverter.app/Contents/Resources/image.py
new file mode 100755
index 0000000..31128fa
--- /dev/null
+++ b/KindleComicConverter.app/Contents/Resources/image.py
@@ -0,0 +1,207 @@
+# Copyright (C) 2010  Alex Yatskov
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+from PIL import Image, ImageDraw
+
+class ImageFlags:
+    Orient = 1 << 0
+    Resize = 1 << 1
+    Frame = 1 << 2
+    Quantize = 1 << 3
+    Stretch = 1 << 4
+
+
+class KindleData:
+    Palette4 = [
+        0x00, 0x00, 0x00,
+        0x55, 0x55, 0x55,
+        0xaa, 0xaa, 0xaa,
+        0xff, 0xff, 0xff
+    ]
+
+    Palette15a = [
+        0x00, 0x00, 0x00,
+        0x11, 0x11, 0x11,
+        0x22, 0x22, 0x22,
+        0x33, 0x33, 0x33,
+        0x44, 0x44, 0x44,
+        0x55, 0x55, 0x55,
+        0x66, 0x66, 0x66,
+        0x77, 0x77, 0x77,
+        0x88, 0x88, 0x88,
+        0x99, 0x99, 0x99,
+        0xaa, 0xaa, 0xaa,
+        0xbb, 0xbb, 0xbb,
+        0xcc, 0xcc, 0xcc,
+        0xdd, 0xdd, 0xdd,
+        0xff, 0xff, 0xff,
+    ]
+
+    Palette15b = [
+        0x00, 0x00, 0x00,
+        0x11, 0x11, 0x11,
+        0x22, 0x22, 0x22,
+        0x33, 0x33, 0x33,
+        0x44, 0x44, 0x44,
+        0x55, 0x55, 0x55,
+        0x77, 0x77, 0x77,
+        0x88, 0x88, 0x88,
+        0x99, 0x99, 0x99,
+        0xaa, 0xaa, 0xaa,
+        0xbb, 0xbb, 0xbb,
+        0xcc, 0xcc, 0xcc,
+        0xdd, 0xdd, 0xdd,
+        0xee, 0xee, 0xee,
+        0xff, 0xff, 0xff,
+    ]
+
+    Profiles = {
+        'K1': ((600, 800), Palette4),
+        'K2': ((600, 800), Palette15a),
+        'K3': ((600, 800), Palette15a),
+        'K4': ((600, 800), Palette15b),
+        'KHD': ((758, 1024), Palette15b),
+        'KDX': ((824, 1200), Palette15a)
+    }
+
+class ComicPage:
+    def __init__(self,source,device):
+        try:
+            self.size, self.palette = KindleData.Profiles[device]
+        except KeyError:
+            raise RuntimeError('Unexpected output device %s' % device)
+        try:
+            self.origFileName = source
+            self.image = Image.open(source)
+        except IOError:
+            raise RuntimeError('Cannot read image file %s' % source)
+        self.image = self.image.convert('RGB')
+
+    def saveToDir(self,targetdir):
+        filename = os.path.basename(self.origFileName)
+        print "Saving to " + targetdir + '/' + filename
+        try:
+            self.image = self.image.convert('L')    # convert to grayscale
+            self.image.save(targetdir + '/' + filename,"JPEG")
+        except IOError as e:
+            raise RuntimeError('Cannot write image in directory %s: %s' %(targetdir,e))
+
+    def quantizeImage(self):
+        colors = len(self.palette) / 3
+        if colors < 256:
+            palette = self.palette + self.palette[:3] * (256 - colors)
+        palImg = Image.new('P', (1, 1))
+        palImg.putpalette(palette)
+        self.image = self.image.quantize(palette=palImg)
+
+    def stretchImage(self):
+        widthDev, heightDev = self.size
+        self.image = self.image.resize((widthDev, heightDev), Image.ANTIALIAS)
+
+    def resizeImage(self):
+        widthDev, heightDev = self.size
+        widthImg, heightImg = self.image.size
+        if widthImg <= widthDev and heightImg <= heightDev:
+            return self.image
+        ratioImg = float(widthImg) / float(heightImg)
+        ratioWidth = float(widthImg) / float(widthDev)
+        ratioHeight = float(heightImg) / float(heightDev)
+        if ratioWidth > ratioHeight:
+            widthImg = widthDev
+            heightImg = int(widthDev / ratioImg)
+        elif ratioWidth < ratioHeight:
+            heightImg = heightDev
+            widthImg = int(heightDev * ratioImg)
+        else:
+            widthImg, heightImg = self.size
+        self.image = self.image.resize((widthImg, heightImg), Image.ANTIALIAS)
+
+    def orientImage(self):
+        widthDev, heightDev = self.size
+        widthImg, heightImg = self.image.size
+        if (widthImg > heightImg) != (widthDev > heightDev):
+            self.image =  self.image.rotate(90, Image.BICUBIC, True)
+
+    def splitPage(self, targetdir, righttoleft=False):
+        width, height = self.image.size
+        dstwidth, dstheight = self.size
+        print "Image is %d x %d" % (width,height)
+        # only split if origin is not oriented the same as target
+        if (width > height) != (dstwidth > dstheight):
+            if (width > height):
+                # source is landscape, so split by the width
+                leftbox = (0, 0, width/2, height)
+                rightbox = (width/2, 0, width, height)
+            else:
+                # source is portrait and target is landscape, so split by the height
+                leftbox = (0, 0, width, height/2)
+                rightbox = (0, height/2, width, height)
+            filename = os.path.splitext(os.path.basename(self.origFileName))
+            fileone = targetdir + '/' + filename[0] + '-1' + filename[1]
+            filetwo = targetdir + '/' + filename[0] + '-2' + filename[1]
+            try:
+                if (righttoleft == True):
+                    pageone = self.image.crop(rightbox)
+                    pagetwo = self.image.crop(leftbox)
+                else:
+                    pageone = self.image.crop(leftbox)
+                    pagetwo = self.image.crop(rightbox)
+                pageone.save(fileone)
+                pagetwo.save(filetwo)
+                os.remove(self.origFileName)
+            except IOError as e:
+                raise RuntimeError('Cannot write image in directory %s: %s' %(targetdir,e))
+            return (fileone,filetwo)
+        return None
+
+    def frameImage(self):
+        foreground = tuple(self.palette[:3])
+        background = tuple(self.palette[-3:])
+        widthDev, heightDev = self.size
+        widthImg, heightImg = self.image.size
+        pastePt = (
+            max(0, (widthDev - widthImg) / 2),
+            max(0, (heightDev - heightImg) / 2)
+        )
+        corner1 = (
+            pastePt[0] - 1,
+            pastePt[1] - 1
+        )
+        corner2 = (
+            pastePt[0] + widthImg + 1,
+            pastePt[1] + heightImg + 1
+        )
+        imageBg = Image.new(self.image.mode, self.size, background)
+        imageBg.paste(self.image, pastePt)
+        draw = ImageDraw.Draw(imageBg)
+        draw.rectangle([corner1, corner2], outline=foreground)
+        self.image = imageBg
+
+# for debug purposes (this file is not meant to be called directly
+if __name__ == "__main__":
+    import sys
+    imgfile = sys.argv[1]
+    img = ComicPage(imgfile, "KHD")
+    pages = img.splitPage('temp/',False)
+    if (pages != None):
+        print "%s, %s" % pages
+    sys.exit(0)
+    img.orientImage()
+    img.resizeImage()
+    img.frameImage()
+    img.quantizeImage()
+    img.saveToDir("temp/")
+    sys.exit(0)
diff --git a/README.md b/README.md
index 3577e3f..1ef183c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # KindleComicConverter
 
-`KindleComicConverter` is a MacOS X AppleScript droplet to convert image folders to a comic-type Mobipocket ebook to take advantage of the new Panel View mode on Amazon's Kindle.
+`KindleComicConverter` is a Python script wrapped by a MacOS X AppleScript droplet to convert image folders to a comic-type Mobipocket ebook to take advantage of the new Panel View mode on Amazon's Kindle.
 
 ## REQUIREMENTS
 - Python (included in MacOS and Linux, follow the [official documentation](http://www.python.org/getit/windows/) to install on Windows)  
@@ -9,36 +9,28 @@
 ### for standalone `comic2ebook.py` script:
 - [unrar](http://www.rarlab.com/download.htm) and [rarfile.py](http://developer.berlios.de/project/showfiles.php?group_id=5373&release_id=18844) for `calibre2ebook.py` automatic CBR extracting.  
 
-The app and the standalone `comic2ebook.py` script can optionally use the [Python Imaging Library](http://www.pythonware.com/products/pil/) to correctly set the image resolution on OPF file, please refer to official documentation for installing into your system.
+You are strongly encouraged to get the [Python Imaging Library](http://www.pythonware.com/products/pil/) that, altough optional, provides a bunch of comic optimizations like split double pages, resize to optimal resolution, improve contrast and palette, etc.
+Please refer to official documentation for installing into your system.
 
 ## USAGE
 Drop a folder or a CBZ/CBR file over the droplet, after a while you'll get a comic-type .mobi to sideload on your Kindle.  
 The script takes care of calling `comic2ebook.py`, `kindlegen` and `kindlestrip.py`.
 
-**WARNING:** at the moment the script does not perform image manipulation. Image optimization and resizing (HD Kindles want 758x1024, non-HD ones 600x800) is up to you.
+> **WARNING:** at the moment the droplet *ALWAYS* uses the **KHD** profile (*Kindle Paperwhite*).
+> If you want to specify other profiles, please use the script from command line.
 
 ### standalone `comic2ebook.py` usage:
-1. Prepare image folder resizing the images to 758x1024 for HD or 600x800 for non-HD readers, in .png or .jpg formats
-2. Organize the images into the folders (Use leading 0's to avoid file ordering problems). For example,
+1. Launch
 
-	> Legs Weaver 51/  
-	> Legs Weaver 51/001.png  
-	> Legs Weaver 51/002.png  
-	> etc...
+	```python comic2ebook.py <profile> <directory|file> <title>```
 
-3. Launch
-
-	```python comic2ebook.py <directory> <title>```
-
-	The directory should be then filled with a `.opf`, `.ncx`, and many `.html` files.
+	The script takes care of unzipping/unrarring the file if it's an archive, creating a directory of images which should be then filled with a `.opf`, `.ncx`, and many `.html` files.
 4. Run `Kindlegen` on `content.opf`. Depending on how many images you have, this may take awhile. Once completed, the `.mobi` file should be in the directory.
 5. Remove the SRCS record to reduce the `.mobi` filesize in half. You can use [Kindlestrip](http://www.mobileread.com/forums/showthread.php?t=96903).
 6. Copy the `.mobi` file to your Kindle!
 
 ## CREDITS
-This script exists as a cross-platform alternative to `KindleComicParser` by **Dc5e**
-(published in [this mobileread forum thread](http://www.mobileread.com/forums/showthread.php?t=192783))  
-
+This script born as a cross-platform alternative to `KindleComicParser` by **Dc5e** (published in [this mobileread forum thread](http://www.mobileread.com/forums/showthread.php?t=192783))
 
 The app relies and includes the following scripts/binaries:
 
@@ -47,6 +39,7 @@ The app relies and includes the following scripts/binaries:
  - the `rarfile.py` script &copy; 2005-2011 **Marko Kreen** <markokr@gmail.com>, released with ISC License
  - the free version `unrar` executable (downloadable from [here](http://www.rarlab.com/rar_add.htm), refer to `LICENSE_unrar.txt` for further details)
  - the icon is by **Nikolay Verin** ([http://ncrow.deviantart.com/](http://ncrow.deviantart.com/)) and released under [CC Attribution-NonCommercial-ShareAlike 3.0 Unported](http://creativecommons.org/licenses/by-nc-sa/3.0/) License
+ - the `image.py` class from [Mangle](http://foosoft.net/mangle/)
 
 Also, you need to have `kindlegen` v2.7 (with KF8 support) which is downloadable from Amazon website
 and installed in `/usr/local/bin/`
@@ -56,13 +49,15 @@ and installed in `/usr/local/bin/`
   - 1.00 - Initial version
   - 1.10 - Added support for CBZ/CBR files in comic2ebook.py
   - 1.11 - Added support for CBZ/CBR files in KindleComicConverter
+  - 1.20 - Comic optimizations! Split pages not target-oriented (landscape with portrait target or portrait
+   with landscape target), add palette and other image optimizations from Mangle.
+   WARNING: PIL is required for all image mangling!
 
 ## TODO
-  - bundle a script to manipulate images (to get rid of Mangle/E-nki/whatsoever)
-
-#### calibre2ebook.py
   - Add gracefully exit for CBR if no rarfile.py and no unrar executable are found
   - Improve error reporting
+  - Recurse into dirtree for multiple comics
+  - Create a GUI to allow user control more options
 
 ## COPYRIGHT
 
diff --git a/cbxarchive.py b/cbxarchive.py
new file mode 100644
index 0000000..18fe690
--- /dev/null
+++ b/cbxarchive.py
@@ -0,0 +1,81 @@
+# Copyright (c) 2012 Ciro Mattia Gonano <ciromattia@gmail.com>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+__version__ = '1.0'
+
+import os
+
+class CBxArchive:
+    def __init__(self, origFileName):
+        self.cbxexts = ['.zip','.cbz','.rar','.cbr']
+        self.origFileName = origFileName
+        self.filename = os.path.splitext(origFileName)
+        self.path = self.filename[0]
+
+    def isCbxFile(self):
+        result = (self.filename[1].lower() in self.cbxexts)
+        if result == True:
+            return result
+        return False
+
+    def getPath(self):
+        return self.path
+
+    def extractCBZ(self):
+        try:
+            from zipfile import ZipFile
+        except ImportError:
+            self.cbzFile = None
+        cbzFile = ZipFile(self.origFileName)
+        for f in cbzFile.namelist():
+            if (f.startswith('__MACOSX') or f.endswith('.DS_Store')):
+                pass # skip MacOS special files
+            elif f.endswith('/'):
+                try:
+                    os.makedirs(self.path+'/'+f)
+                except:
+                    pass #the dir exists so we are going to extract the images only.
+            else:
+                cbzFile.extract(f, self.path)
+
+    def extractCBR(self):
+        try:
+            import rarfile
+        except ImportError:
+            self.cbrFile = None
+        cbrFile = rarfile.RarFile(self.origFileName)
+        for f in cbrFile.namelist():
+            if (f.startswith('__MACOSX') or f.endswith('.DS_Store')):
+                pass # skip MacOS special files
+            elif f.endswith('/'):
+                try:
+                    os.makedirs(self.path+'/'+f)
+                except:
+                    pass #the dir exists so we are going to extract the images only.
+            else:
+                cbrFile.extract(f, self.path)
+
+    def extract(self):
+        if ('.cbr' == self.filename[1].lower() or '.rar' == self.filename[1].lower()):
+            self.extractCBR()
+        elif ('.cbz' == self.filename[1].lower() or '.zip' == self.filename[1].lower()):
+            self.extractCBZ()
+        dir = os.listdir(self.path)
+        if (len(dir) == 1):
+            import shutil
+            for f in os.listdir(self.path + "/" + dir[0]):
+                shutil.move(self.path + "/" + dir[0] + "/" + f,self.path)
+            os.rmdir(self.path + "/" + dir[0])
diff --git a/comic2ebook.py b/comic2ebook.py
index 4fe1417..a4bd469 100755
--- a/comic2ebook.py
+++ b/comic2ebook.py
@@ -19,113 +19,48 @@
 # Changelog
 #  1.00 - Initial version
 #  1.10 - Added support for CBZ/CBR files
+#  1.11 - Added support for ZIP/RAR extensions
+#  1.20 - Comic optimizations! Split pages not target-oriented (landscape
+#       with portrait target or portrait with landscape target), add palette
+#       and other image optimizations from Mangle.
+#       WARNING: PIL is required for all image mangling!
 #
 # Todo:
 #   - Add gracefully exit for CBR if no rarfile.py and no unrar
 #       executable are found
 #   - Improve error reporting
-#
+#   - recurse into dirtree for multiple comics
 
-__version__ = '1.10'
+__version__ = '1.20'
 
 import os
 import sys
-
-class Unbuffered:
-    def __init__(self, stream):
-        self.stream = stream
-    def write(self, data):
-        self.stream.write(data)
-        self.stream.flush()
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-class CBxArchive:
-    def __init__(self, origFileName):
-        self.cbxexts = ['.cbz', '.cbr']
-        self.origFileName = origFileName
-        self.filename = os.path.splitext(origFileName)
-        self.path = self.filename[0]
-
-    def isCbxFile(self):
-        result = (self.filename[1].lower() in self.cbxexts)
-        if result == True:
-            return result
-        return False
-
-    def getPath(self):
-        return self.path
-
-    def extractCBZ(self):
-        try:
-            from zipfile import ZipFile
-        except ImportError:
-            self.cbzFile = None
-        cbzFile = ZipFile(self.origFileName)
-        for f in cbzFile.namelist():
-            if (f.startswith('__MACOSX') or f.endswith('.DS_Store')):
-                pass # skip MacOS special files
-            elif f.endswith('/'):
-                try:
-                    os.makedirs(self.path+f)
-                except:
-                    pass #the dir exists so we are going to extract the images only.
-            else:
-                cbzFile.extract(f, self.path)
-
-    def extractCBR(self):
-        try:
-            import rarfile
-        except ImportError:
-            self.cbrFile = None
-        cbrFile = rarfile.RarFile(self.origFileName)
-        for f in cbrFile.namelist():
-            if f.endswith('/'):
-                try:
-                    os.makedirs(self.path+f)
-                except:
-                    pass #the dir exists so we are going to extract the images only.
-            else:
-                cbrFile.extract(f, self.path)
-
-    def extract(self):
-        if ('.cbr' == self.filename[1].lower()):
-            self.extractCBR()
-        elif ('.cbz' == self.filename[1].lower()):
-            self.extractCBZ()
-        dir = os.listdir(self.path)
-        if (len(dir) == 1):
-            import shutil
-            for f in os.listdir(self.path + "/" + dir[0]):
-                shutil.move(self.path + "/" + dir[0] + "/" + f,self.path)
-            os.rmdir(self.path + "/" + dir[0])
+import cbxarchive
 
 class HTMLbuilder:
+
     def getResult(self):
-        if (self.filename[0].startswith('.') or (self.filename[1] != '.png' and self.filename[1] != '.jpg' and self.filename[1] != '.jpeg')):
-            return None
-        return self.filename
+        return getImageFileName(self.file)
 
     def __init__(self, dstdir, file):
-        self.filename = os.path.splitext(file)
-        basefilename = self.filename[0]
-        ext = self.filename[1]
-        if (basefilename.startswith('.') or (ext != '.png' and ext != '.jpg' and ext != '.jpeg')):
-            return
-        htmlfile = dstdir + '/' + basefilename + '.html'
-        f = open(htmlfile, "w");
-        f.writelines(["<!DOCTYPE html SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
-                    "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n",
-                    "<head>\n",
-                    "<title>",basefilename,"</title>\n",
-                    "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n",
-                    "</head>\n",
-                    "<body>\n",
-                    "<div><img src=\"",file,"\" /></div>\n",
-                    "</body>\n",
-                    "</html>"
-                    ])
-        f.close()
+        self.file = file
+        filename = getImageFileName(file)
+        if (filename != None):
+            htmlfile = dstdir + '/' + filename[0] + '.html'
+            f = open(htmlfile, "w");
+            f.writelines(["<!DOCTYPE html SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
+                          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n",
+                          "<head>\n",
+                          "<title>",filename[0],"</title>\n",
+                          "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n",
+                          "</head>\n",
+                          "<body>\n",
+                          "<div><img src=\"",file,"\" /></div>\n",
+                          "</body>\n",
+                          "</html>"
+                          ])
+            f.close()
+        return None
 
 class NCXbuilder:
     def __init__(self, dstdir, title):
@@ -151,7 +86,7 @@ class OPFBuilder:
             width, height = im.size
             imgres = str(width) + "x" + str(height)
         except ImportError:
-	    print "Could not load PIL, falling back on default HD"
+            print "Could not load PIL, falling back on default HD"
             imgres = "758x1024"
         f = open(opffile, "w");
         f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
@@ -181,32 +116,65 @@ class OPFBuilder:
         f.close()
         return
 
+def getImageFileName(file):
+    filename = os.path.splitext(file)
+    if (filename[0].startswith('.') or (filename[1].lower() != '.png' and filename[1].lower() != '.jpg' and filename[1].lower() != '.jpeg')):
+        return None
+    return filename
+
+def isInFilelist(file,list):
+    filename = os.path.splitext(file)
+    seen = False
+    for item in list:
+        if filename[0] == item[0]:
+            seen = True
+    return seen
+
 if __name__ == "__main__":
-    sys.stdout=Unbuffered(sys.stdout)
     print ('comic2ebook v%(__version__)s. '
        'Written 2012 by Ciro Mattia Gonano.' % globals())
-    if len(sys.argv)<2 or len(sys.argv)>3:
+    if len(sys.argv)<3 or len(sys.argv)>4:
         print "Generates HTML, NCX and OPF for a Comic ebook from a bunch of images"
         print "Optimized for creating Mobipockets to be read into Kindle Paperwhite"
         print "Usage:"
-        print "    %s <dir> <title>" % sys.argv[0]
+        print "    %s <profile> <dir> <title>" % sys.argv[0]
         print " <title> is optional"
         sys.exit(1)
     else:
-        dir = sys.argv[1]
-        cbx = CBxArchive(dir)
+        profile = sys.argv[1]
+        dir = sys.argv[2]
+        cbx = cbxarchive.CBxArchive(dir)
         if cbx.isCbxFile():
             cbx.extract()
             dir = cbx.getPath()
-        if len(sys.argv)==3:
-            title = sys.argv[2]
+        if len(sys.argv)==4:
+            title = sys.argv[3]
         else:
             title = "comic"
         filelist = []
+        try:
+            import image
+            print "Splitting double pages..."
+            for file in os.listdir(dir):
+                if (getImageFileName(file) != None):
+                    img = image.ComicPage(dir+'/'+file, profile)
+                    img.splitPage(dir)
+            for file in os.listdir(dir):
+                if (getImageFileName(file) != None):
+                    print "Optimizing " + file + " for " + profile
+                    img = image.ComicPage(dir+'/'+file, profile)
+                    img.resizeImage()
+                    img.frameImage()
+                    img.quantizeImage()
+                    img.saveToDir(dir)
+        except ImportError:
+            print "Could not load PIL, not optimizing image"
+
         for file in os.listdir(dir):
-            filename = HTMLbuilder(dir,file).getResult()
-            if (filename != None):
-                filelist.append(filename)
+            if (getImageFileName(file) != None and isInFilelist(file,filelist) == False):
+                filename = HTMLbuilder(dir,file).getResult()
+                if (filename != None):
+                    filelist.append(filename)
         NCXbuilder(dir,title)
         OPFBuilder(dir,title,filelist)
     sys.exit(0)
diff --git a/image.py b/image.py
new file mode 100755
index 0000000..31128fa
--- /dev/null
+++ b/image.py
@@ -0,0 +1,207 @@
+# Copyright (C) 2010  Alex Yatskov
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+from PIL import Image, ImageDraw
+
+class ImageFlags:
+    Orient = 1 << 0
+    Resize = 1 << 1
+    Frame = 1 << 2
+    Quantize = 1 << 3
+    Stretch = 1 << 4
+
+
+class KindleData:
+    Palette4 = [
+        0x00, 0x00, 0x00,
+        0x55, 0x55, 0x55,
+        0xaa, 0xaa, 0xaa,
+        0xff, 0xff, 0xff
+    ]
+
+    Palette15a = [
+        0x00, 0x00, 0x00,
+        0x11, 0x11, 0x11,
+        0x22, 0x22, 0x22,
+        0x33, 0x33, 0x33,
+        0x44, 0x44, 0x44,
+        0x55, 0x55, 0x55,
+        0x66, 0x66, 0x66,
+        0x77, 0x77, 0x77,
+        0x88, 0x88, 0x88,
+        0x99, 0x99, 0x99,
+        0xaa, 0xaa, 0xaa,
+        0xbb, 0xbb, 0xbb,
+        0xcc, 0xcc, 0xcc,
+        0xdd, 0xdd, 0xdd,
+        0xff, 0xff, 0xff,
+    ]
+
+    Palette15b = [
+        0x00, 0x00, 0x00,
+        0x11, 0x11, 0x11,
+        0x22, 0x22, 0x22,
+        0x33, 0x33, 0x33,
+        0x44, 0x44, 0x44,
+        0x55, 0x55, 0x55,
+        0x77, 0x77, 0x77,
+        0x88, 0x88, 0x88,
+        0x99, 0x99, 0x99,
+        0xaa, 0xaa, 0xaa,
+        0xbb, 0xbb, 0xbb,
+        0xcc, 0xcc, 0xcc,
+        0xdd, 0xdd, 0xdd,
+        0xee, 0xee, 0xee,
+        0xff, 0xff, 0xff,
+    ]
+
+    Profiles = {
+        'K1': ((600, 800), Palette4),
+        'K2': ((600, 800), Palette15a),
+        'K3': ((600, 800), Palette15a),
+        'K4': ((600, 800), Palette15b),
+        'KHD': ((758, 1024), Palette15b),
+        'KDX': ((824, 1200), Palette15a)
+    }
+
+class ComicPage:
+    def __init__(self,source,device):
+        try:
+            self.size, self.palette = KindleData.Profiles[device]
+        except KeyError:
+            raise RuntimeError('Unexpected output device %s' % device)
+        try:
+            self.origFileName = source
+            self.image = Image.open(source)
+        except IOError:
+            raise RuntimeError('Cannot read image file %s' % source)
+        self.image = self.image.convert('RGB')
+
+    def saveToDir(self,targetdir):
+        filename = os.path.basename(self.origFileName)
+        print "Saving to " + targetdir + '/' + filename
+        try:
+            self.image = self.image.convert('L')    # convert to grayscale
+            self.image.save(targetdir + '/' + filename,"JPEG")
+        except IOError as e:
+            raise RuntimeError('Cannot write image in directory %s: %s' %(targetdir,e))
+
+    def quantizeImage(self):
+        colors = len(self.palette) / 3
+        if colors < 256:
+            palette = self.palette + self.palette[:3] * (256 - colors)
+        palImg = Image.new('P', (1, 1))
+        palImg.putpalette(palette)
+        self.image = self.image.quantize(palette=palImg)
+
+    def stretchImage(self):
+        widthDev, heightDev = self.size
+        self.image = self.image.resize((widthDev, heightDev), Image.ANTIALIAS)
+
+    def resizeImage(self):
+        widthDev, heightDev = self.size
+        widthImg, heightImg = self.image.size
+        if widthImg <= widthDev and heightImg <= heightDev:
+            return self.image
+        ratioImg = float(widthImg) / float(heightImg)
+        ratioWidth = float(widthImg) / float(widthDev)
+        ratioHeight = float(heightImg) / float(heightDev)
+        if ratioWidth > ratioHeight:
+            widthImg = widthDev
+            heightImg = int(widthDev / ratioImg)
+        elif ratioWidth < ratioHeight:
+            heightImg = heightDev
+            widthImg = int(heightDev * ratioImg)
+        else:
+            widthImg, heightImg = self.size
+        self.image = self.image.resize((widthImg, heightImg), Image.ANTIALIAS)
+
+    def orientImage(self):
+        widthDev, heightDev = self.size
+        widthImg, heightImg = self.image.size
+        if (widthImg > heightImg) != (widthDev > heightDev):
+            self.image =  self.image.rotate(90, Image.BICUBIC, True)
+
+    def splitPage(self, targetdir, righttoleft=False):
+        width, height = self.image.size
+        dstwidth, dstheight = self.size
+        print "Image is %d x %d" % (width,height)
+        # only split if origin is not oriented the same as target
+        if (width > height) != (dstwidth > dstheight):
+            if (width > height):
+                # source is landscape, so split by the width
+                leftbox = (0, 0, width/2, height)
+                rightbox = (width/2, 0, width, height)
+            else:
+                # source is portrait and target is landscape, so split by the height
+                leftbox = (0, 0, width, height/2)
+                rightbox = (0, height/2, width, height)
+            filename = os.path.splitext(os.path.basename(self.origFileName))
+            fileone = targetdir + '/' + filename[0] + '-1' + filename[1]
+            filetwo = targetdir + '/' + filename[0] + '-2' + filename[1]
+            try:
+                if (righttoleft == True):
+                    pageone = self.image.crop(rightbox)
+                    pagetwo = self.image.crop(leftbox)
+                else:
+                    pageone = self.image.crop(leftbox)
+                    pagetwo = self.image.crop(rightbox)
+                pageone.save(fileone)
+                pagetwo.save(filetwo)
+                os.remove(self.origFileName)
+            except IOError as e:
+                raise RuntimeError('Cannot write image in directory %s: %s' %(targetdir,e))
+            return (fileone,filetwo)
+        return None
+
+    def frameImage(self):
+        foreground = tuple(self.palette[:3])
+        background = tuple(self.palette[-3:])
+        widthDev, heightDev = self.size
+        widthImg, heightImg = self.image.size
+        pastePt = (
+            max(0, (widthDev - widthImg) / 2),
+            max(0, (heightDev - heightImg) / 2)
+        )
+        corner1 = (
+            pastePt[0] - 1,
+            pastePt[1] - 1
+        )
+        corner2 = (
+            pastePt[0] + widthImg + 1,
+            pastePt[1] + heightImg + 1
+        )
+        imageBg = Image.new(self.image.mode, self.size, background)
+        imageBg.paste(self.image, pastePt)
+        draw = ImageDraw.Draw(imageBg)
+        draw.rectangle([corner1, corner2], outline=foreground)
+        self.image = imageBg
+
+# for debug purposes (this file is not meant to be called directly
+if __name__ == "__main__":
+    import sys
+    imgfile = sys.argv[1]
+    img = ComicPage(imgfile, "KHD")
+    pages = img.splitPage('temp/',False)
+    if (pages != None):
+        print "%s, %s" % pages
+    sys.exit(0)
+    img.orientImage()
+    img.resizeImage()
+    img.frameImage()
+    img.quantizeImage()
+    img.saveToDir("temp/")
+    sys.exit(0)