Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 628688
Collapse All | Expand All

(-)old/CMakeLists.txt (+8 lines)
Lines 96-101 Link Here
96
FIND_PACKAGE(ImageMagick COMPONENTS Magick++)
96
FIND_PACKAGE(ImageMagick COMPONENTS Magick++)
97
FIND_PACKAGE(ImageMagick COMPONENTS MagickWand)
97
FIND_PACKAGE(ImageMagick COMPONENTS MagickWand)
98
FIND_PACKAGE(ImageMagick COMPONENTS MagickCore)
98
FIND_PACKAGE(ImageMagick COMPONENTS MagickCore)
99
if (NOT ImageMagick_MagickCore_FOUND)
100
    set(ImageMagick_INCLUDE_DIRS "/usr/include/GraphicsMagick")
101
    set(ImageMagick_Magick++_INCLUDE_DIRS "/usr/include/GraphicsMagick/Magick++")
102
    set(ImageMagick_MagickCore_INCLUDE_DIRS "")
103
    set(ImageMagick_LIBRARY "/usr/lib/libGraphicsMagick.so")
104
    set(ImageMagick_Magick++_LIBRARY "/usr/lib/libGraphicsMagick++.so")
105
    set(ImageMagick_MagickCore_LIBRARY "")
106
endif ()
99
107
100
INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
108
INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
101
INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
109
INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
(-)old/src/converter.cpp (+6 lines)
Lines 234-241 Link Here
234
234
235
    bool hasTransparency = false;
235
    bool hasTransparency = false;
236
236
237
/*  Workaround to compile with GraphicsMagick:
238
    GraphicsMagick "MagickLibVersion" is greater that 0x100000
239
    e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501"
240
    or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */
237
#if MagickLibVersion < 0x700
241
#if MagickLibVersion < 0x700
238
    hasTransparency = my_image.matte();
242
    hasTransparency = my_image.matte();
243
#elif MagickLibVersion > 0x100000
244
    hasTransparency = my_image.matte();
239
#else
245
#else
240
    hasTransparency = my_image.alpha();
246
    hasTransparency = my_image.alpha();
241
#endif
247
#endif
(-)old/src/globals.h (+6 lines)
Lines 32-39 Link Here
32
using namespace Magick;
32
using namespace Magick;
33
using namespace std;
33
using namespace std;
34
34
35
/*  Workaround to compile with GraphicsMagick:
36
    GraphicsMagick "MagickLibVersion" is greater that 0x100000
37
    e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501"
38
    or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */
35
#if MagickLibVersion < 0x700
39
#if MagickLibVersion < 0x700
36
    typedef FilterTypes IMFilterType;
40
    typedef FilterTypes IMFilterType;
41
#elif MagickLibVersion > 0x100000
42
    typedef FilterTypes IMFilterType;
37
#else
43
#else
38
    typedef FilterType IMFilterType;
44
    typedef FilterType IMFilterType;
39
#endif
45
#endif

Return to bug 628688