zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module.

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1010746 in Zorba: "animation.xq test crashes using Windows installer"
  https://bugs.launchpad.net/zorba/+bug/1010746

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209

Added code to check for ImageMagick library, with this, we don't need to ship any ImageMagick library.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.

=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_module.h'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_module.h	2011-07-09 08:55:59 +0000
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_module.h	2012-08-03 22:07:37 +0000
@@ -20,6 +20,7 @@
 #include <map>
 #include <zorba/zorba.h>
 #include <zorba/external_module.h>
+#include <Magick++.h>
 
 
 namespace zorba {  namespace imagemodule { 
@@ -49,8 +50,14 @@
 public:
   virtual String
      getURI() const { return "http://www.zorba-xquery.com/modules/image/";; }
+
+  ImageModule():ExternalModule()
+  {
+    #ifdef WIN32
+    Magick::InitializeMagick(NULL);
+    #endif  //WIN32
+  };
   
-
   virtual ~ImageModule();
 
   virtual ExternalFunction*