From a05d1b3614613f3d5719e077c407f7d55b0ee696 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Jul 2008 15:49:26 -0700
Subject: [PATCH] IGN:...

---
 installer/osx/freeze.py                      |  9 ++++++
 src/calibre/ebooks/lrf/comic/convert_from.py | 34 ++++++++++++--------
 src/calibre/utils/PythonMagickWand.py        |  2 +-
 3 files changed, 30 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 src/calibre/utils/PythonMagickWand.py

diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py
index e35e302d32..30fd2647a2 100644
--- a/installer/osx/freeze.py
+++ b/installer/osx/freeze.py
@@ -267,6 +267,15 @@ _check_symlinks_prescript()
         dst = os.path.join(resource_dir, 'lib', 'python2.5', 'IPython')
         if os.path.exists(dst): shutil.rmtree(dst)
         shutil.copytree(os.path.expanduser('~/build/ipython/IPython'), dst)
+        
+        print 
+        print 'Adding ImageMagick'
+        dest = os.path.join(frameworks_dir, 'ImageMagick')
+        if os.path.exists(dest):
+            sutil.rmtree(dest)
+        shutil.copytree(os.path.expanduser('~/ImageMagick'), dest, True)
+        shutil.copyfile('/usr/local/lib/libpng12.0.dylib', os.path.join(dest, 'lib', 'libpng12.0.dylib'))
+        
         print
         print 'Installing prescipt'
         sf = [os.path.basename(s) for s in all_names]
diff --git a/src/calibre/ebooks/lrf/comic/convert_from.py b/src/calibre/ebooks/lrf/comic/convert_from.py
index 9d05c03da1..829e331526 100755
--- a/src/calibre/ebooks/lrf/comic/convert_from.py
+++ b/src/calibre/ebooks/lrf/comic/convert_from.py
@@ -16,20 +16,24 @@ from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.utils.threadpool import ThreadPool, WorkRequest
 from calibre.utils.terminfo import ProgressBar
 from calibre.ebooks.lrf.pylrs.pylrs import Book, BookSetting, ImageStream, ImageBlock
-from calibre.utils.PythonMagickWand import \
-    NewMagickWand, NewPixelWand, \
-    MagickSetImageBorderColor, \
-    MagickReadImage, MagickRotateImage, \
-    MagickTrimImage, \
-    MagickNormalizeImage, MagickGetImageWidth, \
-    MagickGetImageHeight, \
-    MagickResizeImage, MagickSetImageType, \
-    GrayscaleType, CatromFilter,  MagickSetImagePage, \
-    MagickBorderImage, MagickSharpenImage, \
-    MagickQuantizeImage, RGBColorspace, \
-    MagickWriteImage, DestroyPixelWand, \
-    DestroyMagickWand, CloneMagickWand, \
-    MagickThumbnailImage, MagickCropImage, initialize, finalize
+try:
+    from calibre.utils.PythonMagickWand import \
+            NewMagickWand, NewPixelWand, \
+            MagickSetImageBorderColor, \
+            MagickReadImage, MagickRotateImage, \
+            MagickTrimImage, \
+            MagickNormalizeImage, MagickGetImageWidth, \
+            MagickGetImageHeight, \
+            MagickResizeImage, MagickSetImageType, \
+            GrayscaleType, CatromFilter,  MagickSetImagePage, \
+            MagickBorderImage, MagickSharpenImage, \
+            MagickQuantizeImage, RGBColorspace, \
+            MagickWriteImage, DestroyPixelWand, \
+            DestroyMagickWand, CloneMagickWand, \
+            MagickThumbnailImage, MagickCropImage, initialize, finalize
+    _imagemagick_loaded = True
+except:
+    _imagemagick_loaded = False
 
 PROFILES = {
             'prs500':(584, 754),            
@@ -198,6 +202,8 @@ def process_pages(pages, opts, update):
     '''
     Render all identified comic pages.
     '''
+    if not _imagemagick_loaded:
+        raise RuntimeError('Failed to load ImageMagick')
     initialize()
     try:
         tdir = PersistentTemporaryDirectory('_comic2lrf_pp')
diff --git a/src/calibre/utils/PythonMagickWand.py b/src/calibre/utils/PythonMagickWand.py
old mode 100755
new mode 100644
index c0664b3573..cdb3337e24
--- a/src/calibre/utils/PythonMagickWand.py
+++ b/src/calibre/utils/PythonMagickWand.py
@@ -73,7 +73,7 @@ isosx     = 'darwin' in sys.platform
 isfrozen  = getattr(sys, 'frozen', False)
 
 if isosx:
-    _lib = os.path.join(getattr(sys, 'frameworks_dir'), 'ImageMagick', 'libWand.dylib') \
+    _lib = os.path.join(getattr(sys, 'frameworks_dir'), 'ImageMagick', 'libMagickWand.dylib') \
            if isfrozen else util.find_library('Wand')
 elif iswindows:
     _lib = os.path.join(os.path.dirname(sys.executable), 'ImageMagick', 'CORE_RL_wand_.dll') \