r15714 by christoph - latest GM patch from Herm

[scribus-commit]

Author: christoph
Date: Sun Oct 31 23:08:46 2010
New Revision: 15714

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15714
Log:
latest GM patch from Herm

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/cmake/modules/FindGMAGICK.cmake
    trunk/Scribus/scribus/scimgdataloader_gmagick.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15714&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun Oct 31 23:08:46 2010
@@ -719,19 +719,19 @@
 ENDIF (WITH_BOOST)
 #>>Boost for 2Geom Tools
 
-#<<GraphicksMagick++ for image import
+#<<GraphicksMagick for image import
 IF (WANT_GRAPHICSMAGICK)
   SET(GMAGICK_DIR ${CMAKE_MODULE_PATH})
   FIND_PACKAGE(GMAGICK)
   IF(GMAGICK_FOUND)
-	MESSAGE("GraphicksMagick++ Found OK")
+	MESSAGE("GraphicksMagick Found OK")
   ELSE(GMAGICK_FOUND)
-	MESSAGE("GraphicksMagick++ NOT found! Building without additional image format support!")
+	MESSAGE("GraphicksMagick NOT found! Building without additional image format support!")
   ENDIF(GMAGICK_FOUND)
 ELSE (WANT_GRAPHICSMAGICK)
-  MESSAGE("Building without GraphicksMagick++")
+  MESSAGE("Building without GraphicksMagick (use -DWANT_GRAPHICSMAGICK=1 to enable)")
 ENDIF (WANT_GRAPHICSMAGICK)
-#>>GraphicksMagick++ for image import
+#>>GraphicksMagick for image import
 
 ##############################################################################################################
 ########## Include Setup                                                                            ##########

Modified: trunk/Scribus/cmake/modules/FindGMAGICK.cmake
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15714&path=/trunk/Scribus/cmake/modules/FindGMAGICK.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindGMAGICK.cmake (original)
+++ trunk/Scribus/cmake/modules/FindGMAGICK.cmake Sun Oct 31 23:08:46 2010
@@ -1,31 +1,34 @@
-# - Try to find GraphicsMagick++
+# - Try to find GraphicsMagick
 # Once done, this will define
 #
 #  GMAGICK_FOUND - system has zziplib
 #  GMAGICK_INCLUDE_DIRS - the zziplib include directories
 #  GMAGICK_LIBRARIES - link these to use zziplib
 
+# Note: Detecting GraphicsMagick is hard, as all header files have the same names as the ImageMagick headers. But they are not compatible.
+
 include(FindPkgConfig)
 
 # Use pkg-config to get hints about paths
-pkg_check_modules(GMAGICK_PKGCONF GraphicsMagick++)
+pkg_check_modules(GMAGICK_PKGCONF GraphicsMagick)
 
 # Include dir
 find_path(GMAGICK_INCLUDE_DIR
-  NAMES Magick++.h
+  NAMES GraphicsMagick/magick/api.h
   PATHS ${GMAGICK_PKGCONF_INCLUDE_DIRS}
 )
 
 # Finally the library itself
 find_library(GMAGICK_LIBRARY
-  NAMES GraphicsMagick++
+  NAMES GraphicsMagick 
   PATHS ${GMAGICK_PKGCONF_LIBRARY_DIRS}
 )
 
+MESSAGE("GRAPHICS_MAGIC debug: pkgconf: ${GMAGICK_PKGCONF_INCLUDE_DIRS},${GMAGICK_PKGCONF_LIBRARY_DIRS} include:${GMAGICK_INCLUDE_DIR} lib:${GMAGICK_LIBRARY}")
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMAGICK DEFAULT_MSG GMAGICK_LIBRARY GMAGICK_INCLUDE_DIR)
 IF(GMAGICK_FOUND)
-    set(GMAGICK_INCLUDES ${GMAGICK_INCLUDE_DIR})
+    set(GMAGICK_INCLUDES ${GMAGICK_INCLUDE_DIR}/GraphicsMagick)
     set(GMAGICK_LIBRARIES ${GMAGICK_LIBRARY})
 ELSE()
     set(GMAGICK_INCLUDES)

Modified: trunk/Scribus/scribus/scimgdataloader_gmagick.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15714&path=/trunk/Scribus/scribus/scimgdataloader_gmagick.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_gmagick.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_gmagick.cpp Sun Oct 31 23:08:46 2010
@@ -163,12 +163,12 @@
 		return false;
 	}
 
-	qDebug() << "has matte(alpha):" << image->matte;
-	int width = image->columns;// .baseColumns();
-	int height = image->rows;// baseRows();
-
-	double xres = image->x_resolution; //.xResolution();
-	double yres = image->y_resolution; //.yResolution();
+//	qDebug() << "has matte(alpha):" << image->matte;
+	int width = image->columns;
+	int height = image->rows;
+
+	double xres = image->x_resolution;
+	double yres = image->y_resolution;
 
 	if (image->colorspace == CMYKColorspace) {
 		qDebug() << "CMYK image";