(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 3ae835ea53d1f3281a390f8658db786066ce93ae..f6a65aaa284d8182b41e578005fd780e667c13ca 100644 (file)
--- 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 114ac84107e4b2a292c2f1e06788aa433d953d96..8273712b00750ea2c1a2a0caf879c23543bd1e65 100644 (file)
--- 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.