text: MagickWand 7 compat

This commit is contained in:
Martin Pulec
2016-12-06 18:11:25 +01:00
parent ab535c5305
commit 2c982f24e1
2 changed files with 7 additions and 0 deletions

View File

@@ -2341,8 +2341,10 @@ then
COMMON_FLAGS="$COMMON_FLAGS $TEXT_CFLAGS"
TEXT_LIB="$TEXT_LIBS"
TEXT_OBJ="$TEXT_OBJ src/vo_postprocess/text.o"
CFLAGS="$CFLAGS $MAGICKWAND_CFLAGS"
ADD_MODULE("vo_pp_text", "$TEXT_OBJ", "$TEXT_LIB")
AC_DEFINE([HAVE_TEXT], [1], [Build text postprocessor])
PKG_CHECK_MODULES([WAND7], [MagickWand > 7], AC_DEFINE([WAND7], [1], [MagickWand is v7 or later]))
fi
if test $text_req = yes -a $text = no; then

View File

@@ -47,7 +47,12 @@
#endif /* HAVE_CONFIG_H */
#include <memory>
#ifdef WAND7
#include <MagickWand/MagickWand.h>
#else
#include <wand/magick_wand.h>
#endif
#include "capture_filter.h"
#include "debug.h"