Improved format detection in the heic coder.

diff --git a/coders/heic.c b/coders/heic.c
index 5ede21515a082554392b474f072f9b08167e2398..379ae7ee8bdea9d87982b8ffd845f9f582808c96 100644 (file)
--- a/coders/heic.c
+++ b/coders/heic.c
@@ -408,8 +408,14 @@ static MagickBooleanType IsHEIC(const unsigned char *magick,const size_t length)
 {
   if (length < 12)
     return(MagickFalse);
+  if (LocaleNCompare((const char *) magick+4,"ftyp",4) != 0)
+  return(MagickFalse);
   if (LocaleNCompare((const char *) magick+8,"heic",4) == 0)
     return(MagickTrue);
+  if (LocaleNCompare((const char *) magick+8,"heix",4) == 0)
+    return(MagickTrue);
+  if (LocaleNCompare((const char *) magick+8,"mif1",4) == 0)
+    return(MagickTrue);
   return(MagickFalse);
 }