diff options
| author | chr[] <chris@deviu.lan> | 2017-06-30 13:02:50 +0000 |
|---|---|---|
| committer | chr[] <chris@deviu.lan> | 2017-06-30 13:02:50 +0000 |
| commit | a90a18e6e5ac6a8d12d12043419e86e22d016efa (patch) | |
| tree | 620471c5d87ec0ca491cc389f73e34612390259c | |
| parent | Hackfest: Show dropper color in cursor, while moving the mouse. (diff) | |
| download | inkscape-a90a18e6e5ac6a8d12d12043419e86e22d016efa.tar.gz inkscape-a90a18e6e5ac6a8d12d12043419e86e22d016efa.zip | |
Replace ImageMagic with GraphicsMagic
... just a matter of taste.
But both wanna be initialized: fixed.
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 | ||||
| -rw-r--r-- | src/extension/init.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index a98ebcf2b..981598527 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -373,7 +373,7 @@ list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) if(WITH_IMAGE_MAGICK) - pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) + pkg_check_modules(ImageMagick ImageMagick++ ) if(ImageMagick_FOUND) list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) diff --git a/src/extension/init.cpp b/src/extension/init.cpp index f2e74377d..a40196a74 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -66,6 +66,7 @@ #endif #ifdef WITH_IMAGE_MAGICK +#include <Magick++.h> #include "internal/bitmap/adaptiveThreshold.h" #include "internal/bitmap/addNoise.h" #include "internal/bitmap/blur.h" @@ -204,6 +205,8 @@ init() /* Raster Effects */ #ifdef WITH_IMAGE_MAGICK + Magick::InitializeMagick(NULL); + Internal::Bitmap::AdaptiveThreshold::init(); Internal::Bitmap::AddNoise::init(); Internal::Bitmap::Blur::init(); |