r19735 by fschmid - Fixed Bug #12878: Only bottom layer of Gimp image is imported

[scribus-commit]

Author: fschmid
Date: Mon Jan  5 16:14:34 2015
New Revision: 19735

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19735
Log:
Fixed Bug #12878: Only bottom layer of Gimp image is imported
Adjusted CMake files to use pkg_config to find GMagick

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scimgdataloader_gmagick.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19735&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Mon Jan  5 16:14:34 2015
@@ -771,7 +771,8 @@
 #<<GraphicksMagick for image import
 IF (WANT_GRAPHICSMAGICK)
   SET(GMAGICK_DIR ${CMAKE_MODULE_PATH})
-  FIND_PACKAGE(GMAGICK)
+  pkg_check_modules(GMAGICK GraphicsMagick)
+#  FIND_PACKAGE(GMAGICK)
   IF(GMAGICK_FOUND)
 	MESSAGE("GraphicksMagick Found OK")
   ELSE(GMAGICK_FOUND)

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19735&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Mon Jan  5 16:14:34 2015
@@ -1067,9 +1067,9 @@
 )
 
 IF (GMAGICK_FOUND)
-	MESSAGE(STATUS "GMAGICK: Libs: ${GMAGICK_LIBRARIES}, Inc: ${GMAGICK_INCLUDES}, Ldflags: ${GMAGICK_LDFLAGS}")
+	MESSAGE(STATUS "GMAGICK: Libs: ${GMAGICK_LDFLAGS}, Inc: ${GMAGICK_INCLUDE_DIRS}, Ldflags: ${GMAGICK_LDFLAGS}")
 	INCLUDE_DIRECTORIES(
-		BEFORE ${GMAGICK_INCLUDES}
+		BEFORE ${GMAGICK_INCLUDE_DIRS}
 	)
 	LINK_DIRECTORIES(
 		${GMAGICK_LDFLAGS} #TODO

Modified: trunk/Scribus/scribus/scimgdataloader_gmagick.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19735&path=/trunk/Scribus/scribus/scimgdataloader_gmagick.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_gmagick.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_gmagick.cpp Mon Jan  5 16:14:34 2015
@@ -162,7 +162,7 @@
 		qCritical() << "Failed to read image" << fn;
 		return false;
 	}
-
+	image = FlattenImages(image, &exception);
 //	qDebug() << "has matte(alpha):" << image->matte;
 	int width = image->columns;
 	int height = image->rows;