From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 23 Feb 2014 12:22:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2648
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64bcc415f271884183f91410ed25ba85c86f1fe8;p=imagemagick

---

diff --git a/MagickCore/artifact.c b/MagickCore/artifact.c
index 890714f70..b51c71147 100644
--- a/MagickCore/artifact.c
+++ b/MagickCore/artifact.c
@@ -295,20 +295,10 @@ MagickExport const char *GetImageArtifact(const Image *image,
       if (p != (const char *) NULL)
         return(p);
     }
-  /*
-    Programmer notes:
-
-    CLI IMv7: if no per-image artifact - look for a global option instead CLI
-    IMv6: global options are copied into per-image artifacts In all other
-    cases, if image is not part of an image_info image list this pointer
-    should be NULL, an no global image options are available.
-  */
-  if ((image->image_info != (ImageInfo *)NULL) &&
+  if ((image->image_info != (ImageInfo *) NULL) &&
       (image->image_info->options != (void *) NULL))
-{
     p=(const char *) GetValueFromSplayTree((SplayTreeInfo *)
       image->image_info->options,artifact);
-}
   return(p);
 }
 
diff --git a/coders/tiff.c b/coders/tiff.c
index b79d1c2cc..63bdb43a8 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2565,40 +2565,40 @@ static void TIFFSetProperties(TIFF *tiff,Image *image,ExceptionInfo *exception)
   const char
     *value;
 
-  value=GetImageArtifact(image,"tiff:document",exception);
+  value=GetImageArtifact(image,"tiff:document");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_DOCUMENTNAME,value);
-  value=GetImageArtifact(image,"tiff:hostcomputer",exception);
+  value=GetImageArtifact(image,"tiff:hostcomputer");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_HOSTCOMPUTER,value);
-  value=GetImageArtifact(image,"tiff:artist",exception);
+  value=GetImageArtifact(image,"tiff:artist");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_ARTIST,value);
-  value=GetImageArtifact(image,"tiff:timestamp",exception);
+  value=GetImageArtifact(image,"tiff:timestamp");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_DATETIME,value);
-  value=GetImageArtifact(image,"tiff:make",exception);
+  value=GetImageArtifact(image,"tiff:make");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_MAKE,value);
-  value=GetImageArtifact(image,"tiff:model",exception);
+  value=GetImageArtifact(image,"tiff:model");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_MODEL,value);
-  value=GetImageArtifact(image,"tiff:software",exception);
+  value=GetImageArtifact(image,"tiff:software");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_SOFTWARE,value);
-  value=GetImageArtifact(image,"tiff:copyright",exception);
+  value=GetImageArtifact(image,"tiff:copyright");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_COPYRIGHT,value);
-  value=GetImageArtifact(image,"kodak-33423",exception);
+  value=GetImageArtifact(image,"kodak-33423");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,33423,value);
-  value=GetImageArtifact(image,"kodak-36867",exception);
+  value=GetImageArtifact(image,"kodak-36867");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,36867,value);
-  value=GetImageArtifact(image,"label",exception);
+  value=GetImageArtifact(image,"label");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_PAGENAME,value);
-  value=GetImageArtifact(image,"comment",exception);
+  value=GetImageArtifact(image,"comment");
   if (value != (const char *) NULL)
     (void) TIFFSetField(tiff,TIFFTAG_IMAGEDESCRIPTION,value);
 }