From 9c47c73fa67a9301cf2205c741aa12af3c6fe6c3 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 9 Nov 2011 19:58:33 +0000
Subject: [PATCH]

---
 MagickCore/identify.c |  2 +-
 coders/tiff.c         | 51 +++++++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 10ca5a2a9..ea5a3a930 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -1061,7 +1061,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   (void) FormatLocaleFile(file,"  Tainted: %s\n",CommandOptionToMnemonic(
     MagickBooleanOptions,(ssize_t) image->taint));
   (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
-  (void) FormatLocaleFile(file,"  Filesize: %sB\n",format);
+  (void) FormatLocaleFile(file,"  Filesize: %s\n",format);
   (void) FormatMagickSize((MagickSizeType) image->columns*image->rows,
      MagickFalse,format);
   (void) FormatLocaleFile(file,"  Number pixels: %s\n",format);
diff --git a/coders/tiff.c b/coders/tiff.c
index 9d91af4c3..79ddc5354 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -507,6 +507,11 @@ static void TIFFErrors(const char *module,const char *format,va_list error)
       "`%s'",module);
 }
 
+static toff_t TIFFGetBlobSize(thandle_t image)
+{
+  return((toff_t) GetBlobSize((Image *) image));
+}
+
 static void TIFFGetProfiles(TIFF *tiff,Image *image,ExceptionInfo *exception)
 {
   uint32
@@ -734,10 +739,24 @@ static toff_t TIFFSeekBlob(thandle_t image,toff_t offset,int whence)
   return((toff_t) SeekBlob((Image *) image,(MagickOffsetType) offset,whence));
 }
 
-static toff_t TIFFGetBlobSize(thandle_t image)
+#if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
+static TIFFExtendProc
+  tiff_extensions = (TIFFExtendProc) NULL;
+
+static void TIFFTagExtender(TIFF *tiff)
 {
-  return((toff_t) GetBlobSize((Image *) image));
+  static const TIFFFieldInfo
+    TIFFExtensions[] =
+    {
+      { 37724, -3, -3, TIFF_UNDEFINED, FIELD_CUSTOM, 1, 1, "PhotoshopLayerData" }
+    };
+
+  TIFFMergeFieldInfo(tiff,TIFFExtensions,sizeof(TIFFExtensions)/
+    sizeof(*TIFFExtensions));
+  if (tiff_extensions != (TIFFExtendProc) NULL)
+    (*tiff_extensions)(tiff);
 }
+#endif
 
 static void TIFFUnmapBlob(thandle_t image,tdata_t base,toff_t size)
 {
@@ -876,6 +895,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       image_info->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
+#if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
+  if (tiff_extensions == (TIFFExtendProc) NULL)
+    tiff_extensions=TIFFSetTagExtender(TIFFTagExtender);
+#endif
   image=AcquireImage(image_info,exception);
   status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
   if (status == MagickFalse)
@@ -1749,26 +1772,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
 %      size_t RegisterTIFFImage(void)
 %
 */
-
-#if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
-static TIFFExtendProc
-  tiff_extensions = (TIFFExtendProc) NULL;
-
-static void TIFFTagExtender(TIFF *tiff)
-{
-  static const TIFFFieldInfo
-    TIFFExtensions[] =
-    {
-      { 37724, -3, -3, TIFF_UNDEFINED, FIELD_CUSTOM, 1, 1, "PhotoshopLayerData" }
-    };
-
-  TIFFMergeFieldInfo(tiff,TIFFExtensions,sizeof(TIFFExtensions)/
-    sizeof(*TIFFExtensions));
-  if (tiff_extensions != (TIFFExtendProc) NULL)
-    (*tiff_extensions)(tiff);
-}
-#endif
-
 ModuleExport size_t RegisterTIFFImage(void)
 {
 #define TIFFDescription  "Tagged Image File Format"
@@ -1875,10 +1878,6 @@ ModuleExport size_t RegisterTIFFImage(void)
     entry->version=ConstantString(version);
   entry->module=ConstantString("TIFF");
   (void) RegisterMagickInfo(entry);
-#if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
-  if (tiff_extensions == (TIFFExtendProc) NULL)
-    tiff_extensions=TIFFSetTagExtender(TIFFTagExtender);
-#endif
   return(MagickImageCoderSignature);
 }
 
-- 
2.40.0