From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 3 Oct 2011 17:54:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aed9c3814a733cde3980063365ada192da886b49;p=imagemagick

---

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 3ae835ea5..f6a65aaa2 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -80,12 +80,10 @@
 #if defined(__MINGW32__)
 #  undef interface
 #endif
-#if defined(MAGICKCORE_HAVE_FT2BUILD_H)
-#  include <ft2build.h>
-#endif
 #if defined(FT_FREETYPE_H)
 #  include FT_FREETYPE_H
 #else
+#  include <ft2build.h>
 #  include <freetype/freetype.h>
 #endif
 #if defined(FT_GLYPH_H)
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 114ac8410..8273712b0 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -5162,7 +5162,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend,
       tint_image=DestroyImage(tint_image);
       return((Image *) NULL);
     }
-  if (opacity == (const char *) NULL)
+  if (blend == (const char *) NULL)
     return(tint_image);
   /*
     Determine RGB values of the color.