Feature: Support ImageMagick 7

This commit is contained in:
Vicki Pfau 2017-01-18 12:51:05 -08:00
parent 2f7d2fd7f8
commit 3064949029
3 changed files with 11 additions and 1 deletions

View File

@ -7,6 +7,7 @@ Bugfixes:
- GB MBC: Fix ROM bank overflows getting set to bank 0
Misc:
- Qt: Improved HiDPI support
- Feature: Support ImageMagick 7
0.5.2: (2016-12-31)
Bugfixes:

View File

@ -299,6 +299,7 @@ if(HAVE_UMASK)
endif()
# Feature dependencies
set(FEATURE_DEFINES)
set(FEATURES)
if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
set(LIBEDIT_LIBRARIES -ledit)
@ -409,11 +410,16 @@ if(USE_MAGICK)
list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION})
if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
set(MAGICKWAND_DEB_VERSION "5")
elseif(${MagickWand_VERSION} EQUAL "6.9.7")
set(MAGICKWAND_DEB_VERSION "-6.q16-3")
else()
set(MAGICKWAND_DEB_VERSION "-6.q16-2")
endif()
list(APPEND FEATURE_DEFINES MAGICKWAND_VERSION_MAJOR=${MAGICKWAND_VERSION_MAJOR})
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}")
endif()
@ -525,7 +531,6 @@ if(USE_EPOXY)
endif()
set(FEATURE_DEFINES)
foreach(FEATURE IN LISTS FEATURES)
list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
endforeach()

View File

@ -11,7 +11,11 @@
#define MAGICKCORE_HDRI_ENABLE 0
#define MAGICKCORE_QUANTUM_DEPTH 8
#if MAGICKWAND_VERSION_MAJOR >= 7
#include <MagickWand/MagickWand.h>
#else
#include <wand/MagickWand.h>
#endif
struct ImageMagickGIFEncoder {
struct mAVStream d;