[patch] converseen-0.9.6.2-r1_graphicsmagick.diff

converseen-0.9.6.2-r1_graphicsmagick.diff (text/plain), 2.16 KB, created by Sergey Torokhov on 2017-09-17 00:13:22 UTC

diff -Naur old/CMakeLists.txt new/CMakeLists.txt
--- old/CMakeLists.txt	2017-03-28 23:31:34.000000000 +0300
+++ new/CMakeLists.txt	2017-09-14 00:43:27.000000000 +0300
@@ -96,6 +96,14 @@
 FIND_PACKAGE(ImageMagick COMPONENTS Magick++)
 FIND_PACKAGE(ImageMagick COMPONENTS MagickWand)
 FIND_PACKAGE(ImageMagick COMPONENTS MagickCore)
+if (NOT ImageMagick_MagickCore_FOUND)
+    set(ImageMagick_INCLUDE_DIRS "/usr/include/GraphicsMagick")
+    set(ImageMagick_Magick++_INCLUDE_DIRS "/usr/include/GraphicsMagick/Magick++")
+    set(ImageMagick_MagickCore_INCLUDE_DIRS "")
+    set(ImageMagick_LIBRARY "/usr/lib/libGraphicsMagick.so")
+    set(ImageMagick_Magick++_LIBRARY "/usr/lib/libGraphicsMagick++.so")
+    set(ImageMagick_MagickCore_LIBRARY "")
+endif ()
 
 INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
diff -Naur old/src/converter.cpp new/src/converter.cpp
--- old/src/converter.cpp	2017-03-28 23:31:34.000000000 +0300
+++ new/src/converter.cpp	2017-09-14 00:45:13.000000000 +0300
@@ -234,8 +234,14 @@
 
     bool hasTransparency = false;
 
+/*  Workaround to compile with GraphicsMagick:
+    GraphicsMagick "MagickLibVersion" is greater that 0x100000
+    e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501"
+    or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */
 #if MagickLibVersion < 0x700
     hasTransparency = my_image.matte();
+#elif MagickLibVersion > 0x100000
+    hasTransparency = my_image.matte();
 #else
     hasTransparency = my_image.alpha();
 #endif
diff -Naur old/src/globals.h new/src/globals.h
--- old/src/globals.h	2017-03-28 23:31:34.000000000 +0300
+++ new/src/globals.h	2017-09-14 00:06:51.000000000 +0300
@@ -32,8 +32,14 @@
 using namespace Magick;
 using namespace std;
 
+/*  Workaround to compile with GraphicsMagick:
+    GraphicsMagick "MagickLibVersion" is greater that 0x100000
+    e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501"
+    or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */
 #if MagickLibVersion < 0x700
     typedef FilterTypes IMFilterType;
+#elif MagickLibVersion > 0x100000
+    typedef FilterTypes IMFilterType;
 #else
     typedef FilterType IMFilterType;
 #endif