From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 9 Jan 2012 17:16:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6421
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d93c30e3c16d1e3fb2943c19ac50d37ce5c7582e;p=imagemagick

---

diff --git a/coders/tiff.c b/coders/tiff.c
index 10b76febc..2fd26e357 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1102,7 +1102,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     }
     TIFFGetProfiles(tiff,image,exception);
     TIFFGetProperties(tiff,image,exception);
-    TIFFGetEXIFProperties(tiff,image,exception);
+    option=GetImageOption(image_info,"tiff:exif-properties");
+    if ((option == (const char *) NULL) ||
+        (IsMagickTrue(option) == MagickFalse))
+      TIFFGetEXIFProperties(tiff,image,exception);
     /*
       Allocate memory for the image and pixel buffer.
     */