Merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module

[Rodolfo Ochoa]

Added code to check for ImageMagick library, with this, we don't need to ship any ImageMagick library.

Added code to check for ImageMagick library, with this, we don't need to ship any ImageMagick library.

[Chris Hillery (ceejatec)]

review: Approve

[Juan Zacarias (juan457)]

review: Needs Fixing

[Juan Zacarias (juan457)]

The installed version of image breaks looking for image magick DLLs

[Chris Hillery (ceejatec)]

Beautiful change. I'll vote Approve based on a reading of the code, but I can't actually test it; hopefully Juan can verify that an appropriate pretty error is thrown on a machine without ImageMagick installer.

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1010746-2012-09-13T21-32-37.716Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug1010746-2012-09-13T21-32-37.716Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1010746-2012-09-14T21-48-01.898Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug1010746-2012-09-14T21-48-01.898Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1010746-2012-09-14T22-33-43.083Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug1010746-2012-09-14T22-33-43.083Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1010746-2012-09-14T23-37-34.118Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug1010746-2012-09-14T23-37-34.118Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1010746-2012-09-15T01-46-35.176Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1010746-2012-09-15T01-46-35.176Z is finished. The final status was:

All tests succeeded!

=== modified file 'cmake_modules/Windows/FindImageMagick.cmake'
--- cmake_modules/Windows/FindImageMagick.cmake	2011-10-09 14:49:07 +0000
+++ cmake_modules/Windows/FindImageMagick.cmake	2012-09-10 14:01:22 +0000
@@ -26,23 +26,7 @@
 )
 
 IF (ImageMagick_FOUND)
-
   # find the needed DLL's
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_bzlib_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_jbig_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_jp2_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_jpeg_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_lcms_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_libxml_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_Magick++_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_magick_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_png_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_tiff_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_ttf_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_wand_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_xlib_")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_zlib_")
-
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "X11")
-
+  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "msvcp100")
+  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "msvcr100")
 ENDIF (ImageMagick_FOUND)

=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_module.cpp'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_module.cpp	2011-07-09 08:55:59 +0000
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_module.cpp	2012-09-10 14:01:22 +0000
@@ -46,4 +46,33 @@
   }
   delete this;
 }
+
+bool
+ImageModule::isImageMagickAvailable() {
+  bool result = false;
+  #ifdef WIN32
+
+  HKEY hKey;
+  LONG lRes = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ImageMagick\\Current\\", 0, KEY_READ, &hKey);
+  if (lRes != ERROR_SUCCESS) {
+    lRes = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Wow6432Node\\ImageMagick\\Current\\", 0, KEY_READ, &hKey);
+  }
+  if (lRes == ERROR_SUCCESS) {
+    std::wstring strKeyDefaultValue;
+
+    WCHAR szBuffer[512];
+    DWORD dwBufferSize = sizeof(szBuffer);
+    ULONG nError = RegQueryValueExW(hKey, L"Version", NULL, NULL, (LPBYTE)szBuffer, &dwBufferSize);
+    if (ERROR_SUCCESS == nError)
+    {
+        strKeyDefaultValue = szBuffer;  // ImageMagick Version
+        result = true;
+    }
+    RegCloseKey(hKey);
+  }
+  #endif  //WIN32
+  return result;
+}
+
+
 }  /* namespace imagemodule */ } /* namespace zorba */

=== 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-09-10 14:01:22 +0000
@@ -17,10 +17,16 @@
 #ifndef ZORBA_IMAGEMODULE_IMAGEMODULE_H
 #define ZORBA_IMAGEMODULE_IMAGEMODULE_H
 
+#ifdef WIN32
+#include <Windows.h>
+#undef DrawText
+#endif //WIN32
 #include <map>
 #include <zorba/zorba.h>
+#include <zorba/user_exception.h>
+#include <zorba/diagnostic_list.h>
 #include <zorba/external_module.h>
-
+#include <Magick++.h>
 
 namespace zorba {  namespace imagemodule { 
 
@@ -50,7 +56,17 @@
   virtual String
      getURI() const { return "http://www.zorba-xquery.com/modules/image/"; }
   
-
+  ImageModule()
+  {
+#ifdef WIN32
+    if (ImageModule::isImageMagickAvailable()) {
+      Magick::InitializeMagick(NULL);
+    } else {
+      throw USER_EXCEPTION( zerr::ZOSE0005_DLL_LOAD_FAILED, "ImageMagick is not installed" );
+    }
+#endif //WIN32
+  };
+  
   virtual ~ImageModule();
 
   virtual ExternalFunction*
@@ -69,6 +85,8 @@
 
     return theFactory;
   }
+  
+  static bool isImageMagickAvailable();
 };
 
 } /* namespace imagemodule */