Merge lp:~gabipetrovay/zorba/ImageMagick into lp:zorba/image-module

[Gabriel Petrovay]

1. Removed: image/cmake_modules/FindImageMagick.cmake
CMake (2.6 and 2.8) both distribute FindImageMagick.cmake which
successfully find [only] an installed ImageMagick. Therefore this
module is not needed in Zorba.

2. Changed: image/cmake_modules/Windows/FindImageMagick.cmake
- I have replaced the old call to FIND_PACKAGE_DLLS_WIN32 with the new
FIND_PACKAGE_DLL_WIN32
- Added also the search for X11.dll since ImageMagick also requires this one
- removed all the searches for the ImageMagick xml files for the
following reasons:
 - they are not DLLs (they are not needed in the PATH, etc)
 - are they necessary for ImageMagick to work? (Or are they only used
by the ImageMagick GUI:
http://www.imagemagick.org/script/resources.php).
 - even if they can be used by placing them near the Zorba DLLs, the
advanced ImageMagick user will know where to take them from or to
write them.

=== removed file 'cmake_modules/FindImageMagick.cmake'
--- cmake_modules/FindImageMagick.cmake	2011-10-06 08:18:47 +0000
+++ cmake_modules/FindImageMagick.cmake	1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-# - Find the ImageMagick binary suite.
-# This module will search for a set of ImageMagick tools specified
-# as components in the FIND_PACKAGE call. Typical components include,
-# but are not limited to (future versions of ImageMagick might have
-# additional components not listed here):
-#
-#  animate
-#  compare
-#  composite
-#  conjure
-#  convert
-#  display
-#  identify
-#  import
-#  mogrify
-#  montage
-#  stream
-#
-# If no component is specified in the FIND_PACKAGE call, then it only
-# searches for the ImageMagick executable directory. This code defines
-# the following variables:
-#
-#  ImageMagick_FOUND                  - TRUE if all components are found.
-#  ImageMagick_EXECUTABLE_DIR         - Full path to executables directory.
-#  ImageMagick_<component>_FOUND      - TRUE if <component> is found.
-#  ImageMagick_<component>_EXECUTABLE - Full path to <component> executable.
-#
-# There are also components for the following ImageMagick APIs:
-#
-#  Magick++
-#  MagickWand
-#  MagickCore
-#
-# For these components the following variables are set:
-#
-#  ImageMagick_FOUND                    - TRUE if all components are found.
-#  ImageMagick_INCLUDE_DIRS             - Full paths to all include dirs.
-#  ImageMagick_LIBRARIES                - Full paths to all libraries.
-#  ImageMagick_<component>_FOUND        - TRUE if <component> is found.
-#  ImageMagick_<component>_INCLUDE_DIRS - Full path to <component> include dirs.
-#  ImageMagick_<component>_LIBRARIES    - Full path to <component> libraries.
-#
-# Example Usages:
-#  FIND_PACKAGE(ImageMagick)
-#  FIND_PACKAGE(ImageMagick COMPONENTS convert)
-#  FIND_PACKAGE(ImageMagick COMPONENTS convert mogrify display)
-#  FIND_PACKAGE(ImageMagick COMPONENTS Magick++)
-#  FIND_PACKAGE(ImageMagick COMPONENTS Magick++ convert)
-#
-# Note that the standard FIND_PACKAGE features are supported
-# (i.e., QUIET, REQUIRED, etc.).
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-# Copyright 2007-2008 Miguel A. Figueroa-Villanueva <miguelf at ieee dot org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distributed this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-#---------------------------------------------------------------------
-# Helper functions
-#---------------------------------------------------------------------
-FUNCTION(FIND_IMAGEMAGICK_API component header)
-  SET(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
-
-  FIND_PATH(ImageMagick_${component}_INCLUDE_DIR
-    NAMES ${header}
-    PATHS
-      ${ImageMagick_INCLUDE_DIRS}
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
-    PATH_SUFFIXES
-      ImageMagick
-    DOC "Path to the ImageMagick include dir."
-    )
-  FIND_LIBRARY(ImageMagick_${component}_LIBRARY
-    NAMES ${ARGN}
-    PATHS
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"
-    DOC "Path to the ImageMagick Magick++ library."
-    )
-
-  IF(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
-    SET(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
-
-    LIST(APPEND ImageMagick_INCLUDE_DIRS
-      ${ImageMagick_${component}_INCLUDE_DIR}
-      )
-    LIST(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
-    SET(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
-
-    LIST(APPEND ImageMagick_LIBRARIES
-      ${ImageMagick_${component}_LIBRARY}
-      )
-    SET(ImageMagick_LIBRARIES ${ImageMagick_LIBRARIES} PARENT_SCOPE)
-  ENDIF(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
-ENDFUNCTION(FIND_IMAGEMAGICK_API)
-
-FUNCTION(FIND_IMAGEMAGICK_EXE component)
-  SET(_IMAGEMAGICK_EXECUTABLE
-    ${ImageMagick_EXECUTABLE_DIR}/${component}${CMAKE_EXECUTABLE_SUFFIX})
-  IF(EXISTS ${_IMAGEMAGICK_EXECUTABLE})
-    SET(ImageMagick_${component}_EXECUTABLE
-      ${_IMAGEMAGICK_EXECUTABLE}
-       PARENT_SCOPE
-       )
-    SET(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
-  ELSE(EXISTS ${_IMAGEMAGICK_EXECUTABLE})
-    SET(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
-  ENDIF(EXISTS ${_IMAGEMAGICK_EXECUTABLE})
-ENDFUNCTION(FIND_IMAGEMAGICK_EXE)
-
-#---------------------------------------------------------------------
-# Start Actual Work
-#---------------------------------------------------------------------
-# Try to find a ImageMagick installation binary path.
-FIND_PATH(ImageMagick_EXECUTABLE_DIR
-  NAMES mogrify${CMAKE_EXECUTABLE_SUFFIX}
-  PATHS
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]"
-  DOC "Path to the ImageMagick binary directory."
-  NO_DEFAULT_PATH
-  )
-FIND_PATH(ImageMagick_EXECUTABLE_DIR
-  NAMES mogrify${CMAKE_EXECUTABLE_SUFFIX}
-  )
-
-# Find each component. Search for all tools in same dir
-# <ImageMagick_EXECUTABLE_DIR>; otherwise they should be found
-# independently and not in a cohesive module such as this one.
-SET(ImageMagick_FOUND TRUE)
-FOREACH(component ${ImageMagick_FIND_COMPONENTS}
-    # DEPRECATED: forced components for backward compatibility
-    convert mogrify import montage composite
-    )
-  IF(component STREQUAL "Magick++")
-    FIND_IMAGEMAGICK_API(Magick++ Magick++.h
-      Magick++ CORE_RL_Magick++_
-      )
-  ELSEIF(component STREQUAL "MagickWand")
-    FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
-      Wand MagickWand CORE_RL_wand_
-      )
-  ELSEIF(component STREQUAL "MagickCore")
-    FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
-      Magick MagickCore CORE_RL_magick_
-      )
-  ELSE(component STREQUAL "Magick++")
-    IF(ImageMagick_EXECUTABLE_DIR)
-      FIND_IMAGEMAGICK_EXE(${component})
-    ENDIF(ImageMagick_EXECUTABLE_DIR)
-  ENDIF(component STREQUAL "Magick++")
-  
-  IF(NOT ImageMagick_${component}_FOUND)
-    LIST(FIND ImageMagick_FIND_COMPONENTS ${component} is_requested)
-    IF(is_requested GREATER -1)
-      SET(ImageMagick_FOUND FALSE)
-    ENDIF(is_requested GREATER -1)
-  ENDIF(NOT ImageMagick_${component}_FOUND)
-ENDFOREACH(component)
-
-SET(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS})
-SET(ImageMagick_LIBRARIES ${ImageMagick_LIBRARIES})
-
-#---------------------------------------------------------------------
-# Standard Package Output
-#---------------------------------------------------------------------
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-  ImageMagick DEFAULT_MSG ImageMagick_FOUND
-  )
-# Maintain consistency with all other variables.
-SET(ImageMagick_FOUND ${IMAGEMAGICK_FOUND})
-
-#---------------------------------------------------------------------
-# DEPRECATED: Setting variables for backward compatibility.
-#---------------------------------------------------------------------
-SET(IMAGEMAGICK_BINARY_PATH          ${ImageMagick_EXECUTABLE_DIR}
-    CACHE PATH "Path to the ImageMagick binary directory.")
-SET(IMAGEMAGICK_CONVERT_EXECUTABLE   ${ImageMagick_convert_EXECUTABLE}
-    CACHE FILEPATH "Path to ImageMagick's convert executable.")
-SET(IMAGEMAGICK_MOGRIFY_EXECUTABLE   ${ImageMagick_mogrify_EXECUTABLE}
-    CACHE FILEPATH "Path to ImageMagick's mogrify executable.")
-SET(IMAGEMAGICK_IMPORT_EXECUTABLE    ${ImageMagick_import_EXECUTABLE}
-    CACHE FILEPATH "Path to ImageMagick's import executable.")
-SET(IMAGEMAGICK_MONTAGE_EXECUTABLE   ${ImageMagick_montage_EXECUTABLE}
-    CACHE FILEPATH "Path to ImageMagick's montage executable.")
-SET(IMAGEMAGICK_COMPOSITE_EXECUTABLE ${ImageMagick_composite_EXECUTABLE}
-    CACHE FILEPATH "Path to ImageMagick's composite executable.")
-MARK_AS_ADVANCED(
-  IMAGEMAGICK_BINARY_PATH
-  IMAGEMAGICK_CONVERT_EXECUTABLE
-  IMAGEMAGICK_MOGRIFY_EXECUTABLE
-  IMAGEMAGICK_IMPORT_EXECUTABLE
-  IMAGEMAGICK_MONTAGE_EXECUTABLE
-  IMAGEMAGICK_COMPOSITE_EXECUTABLE
-  )

=== modified file 'cmake_modules/Windows/FindImageMagick.cmake'
--- cmake_modules/Windows/FindImageMagick.cmake	2011-08-19 00:03:49 +0000
+++ cmake_modules/Windows/FindImageMagick.cmake	2011-10-08 15:26:24 +0000
@@ -22,13 +22,26 @@
 #
 # See the FindLibTidy.cmake module shipped with Zorba for more information.
 
-FIND_PACKAGE_WIN32(NAME ImageMagick FOUND_VAR ImageMagick_FOUND SEARCH_NAMES ImageMagick COMPONENTS Magick++ MagickCore MagickWand)
+FIND_PACKAGE_WIN32 (NAME ImageMagick FOUND_VAR ImageMagick_FOUND SEARCH_NAMES ImageMagick COMPONENTS Magick++ MagickCore MagickWand)
 
 IF (ImageMagick_FOUND)
 
   #find the needed DLL's
-  FIND_PACKAGE_DLLS_WIN32 (${FOUND_LOCATION} "config/colors.xml;config/coder.xml;config/configure.xml;config/delegates.xml;config/english.xml;config/locale.xml;config/log.xml;config/magic.xml;config/mime.xml;config/thresholds.xml;config/type.xml;config/type-ghostscript.xml;CORE_RL_tiff_.dll;CORE_RL_png_.dll;CORE_RL_libxml_.dll;CORE_RL_jbig_.dll;CORE_RL_jp2_.dll;CORE_RL_jpeg_.dll;CORE_RL_Magick++_.dll;CORE_RL_bzlib_.dll;CORE_RL_lcms_.dll;CORE_RL_ttf_.dll;CORE_RL_xlib_.dll;CORE_RL_zlib_.dll;CORE_RL_magick_.dll;CORE_RL_wand_.dll")
-  
-ENDIF (ImageMagick_FOUND)  
-
- 
\ No newline at end of file
+  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")
+
+ENDIF (ImageMagick_FOUND)
\ No newline at end of file