diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-02 20:19:07 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-02 20:19:07 +0000 |
| commit | e4c44f8b4674b88c0174270f27d61db808f66bc6 (patch) | |
| tree | 1f32b22aab4963bf5b0a1c22a72acbe42e53f395 /src/extension/internal/image-resolution.cpp | |
| parent | 2geom: update to c709d6b6780098d3e53363d925f7aee3c2640478 (diff) | |
| download | inkscape-e4c44f8b4674b88c0174270f27d61db808f66bc6.tar.gz inkscape-e4c44f8b4674b88c0174270f27d61db808f66bc6.zip | |
CMake: Allow to build with GraphicsMagick instead of ImageMagick
For now we still default to ImageMagick, but we can fall-back to
GraphicsMagick (e.g. if only ImageMagick 7 is available; add a check
for this).
To prefer GraphicsMagick despite a compatible version of ImageMagick
use -DWITH_IMAGE_MAGICK=OFF when running CMake
Diffstat (limited to 'src/extension/internal/image-resolution.cpp')
| -rw-r--r-- | src/extension/internal/image-resolution.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index befb48222..d1618d3b5 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -30,7 +30,7 @@ #include <csetjmp> #endif -#ifdef WITH_IMAGE_MAGICK +#ifdef WITH_MAGICK #include <Magick++.h> #endif @@ -396,7 +396,7 @@ void ImageResolution::readjfif(char const *) { #endif -#ifdef WITH_IMAGE_MAGICK +#ifdef WITH_MAGICK void ImageResolution::readmagick(char const *fn) { Magick::Image image; debug("Trying image.read"); @@ -439,7 +439,7 @@ void ImageResolution::readmagick(char const *fn) { void ImageResolution::readmagick(char const *) { } -#endif /* WITH_IMAGE_MAGICK */ +#endif /* WITH_MAGICK */ } } |