From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 1 Sep 2018 14:49:00 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1273
X-Git-Tag: 7.0.8-12~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bd3243c178c777b91268f4196833d0ae268d651;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1273
---

diff --git a/Makefile.in b/Makefile.in
index ac44b6071..222b1a45d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1572,10 +1572,10 @@ coders_sun_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(coders_sun_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_sun_la_rpath = -rpath $(codersdir)
-coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
+coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_coders_svg_la_OBJECTS = coders/coders_svg_la-svg.lo
 coders_svg_la_OBJECTS = $(am_coders_svg_la_OBJECTS)
 coders_svg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -3971,7 +3971,7 @@ coders_scr_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_svg_la_SOURCES = coders/svg.c
 coders_svg_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS)
 coders_svg_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # TGA coder module
 coders_tga_la_SOURCES = coders/tga.c
diff --git a/coders/Makefile.am b/coders/Makefile.am
index dc23ea6d9..ac5956140 100644
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -946,7 +946,7 @@ coders_scr_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_svg_la_SOURCES      = coders/svg.c
 coders_svg_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS)
 coders_svg_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_svg_la_LIBADD       = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+coders_svg_la_LIBADD       = $(MAGICKCORE_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # TGA coder module
 coders_tga_la_SOURCES      = coders/tga.c
diff --git a/coders/ttf.c b/coders/ttf.c
index cc346d441..939ff63b2 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -55,7 +55,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/module.h"
 #include "MagickCore/type.h"
-#include "MagickWand/MagickWand.h"
+#include "MagickCore/utility.h"
 #if defined(MAGICKCORE_FREETYPE_DELEGATE)
 #include <ft2build.h>
 #if defined(FT_FREETYPE_H)
diff --git a/configure b/configure
index 128452838..ddbc3bc64 100755
--- a/configure
+++ b/configure
@@ -4555,7 +4555,7 @@ MAGICK_PATCHLEVEL_VERSION=12
 
 MAGICK_VERSION=7.0.8-12
 
-MAGICK_GIT_REVISION=14736:9df54d695:20180901
+MAGICK_GIT_REVISION=14738:f0e35243b:20180901
 
 
 # Substitute library versioning