From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 9 Nov 2011 23:00:15 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6661
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60e1bf9f76b247c801c311900749876b0f083c85;p=imagemagick

---

diff --git a/coders/tiff.c b/coders/tiff.c
index 134a76318..87b5d076f 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1752,7 +1752,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
 
 #if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
 static TIFFExtendProc
-  tiff_extensions = (TIFFExtendProc) NULL;
+  tag_extender = (TIFFExtendProc) NULL;
 
 static void TIFFTagExtender(TIFF *tiff)
 {
@@ -1764,8 +1764,8 @@ static void TIFFTagExtender(TIFF *tiff)
 
   TIFFMergeFieldInfo(tiff,TIFFExtensions,sizeof(TIFFExtensions)/
     sizeof(*TIFFExtensions));
-  if (tiff_extensions != (TIFFExtendProc) NULL)
-    (*tiff_extensions)(tiff);
+  if (tag_extender != (TIFFExtendProc) NULL)
+    (*tag_extender)(tiff);
 }
 #endif
 
@@ -1787,8 +1787,8 @@ ModuleExport size_t RegisterTIFFImage(void)
       if (MagickCreateThreadKey(&tiff_exception) == MagickFalse)
         ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
 #if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
-      if (tiff_extensions == (TIFFExtendProc) NULL)
-        tiff_extensions=TIFFSetTagExtender(TIFFTagExtender);
+      if (tag_extender == (TIFFExtendProc) NULL)
+        tag_extender=TIFFSetTagExtender(TIFFTagExtender);
 #endif
       instantiate_key=MagickTrue;
     }