(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 40dc59c2d2268d96bbce0647910b6d673cd65503..52f646651bd15b3c11ba6e47022d668104c8f7aa 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -778,13 +778,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       */
       SetGeometryInfo(&geometry_info);
       flags=NoValue;
-      value=GetImageArtifact(composite_image,"compose:args");
-      if (value != (char *) NULL)
+      value=GetImageArtifact(image,"compose:args");
+      if (value != (const char *) NULL)
         flags=ParseGeometry(value,&geometry_info);
-      if ((flags & WidthValue) == 0 ) {
-          (void) ThrowMagickException(exception,GetMagickModule(),
-               OptionWarning,"InvalidSetting","'%s' '%s'",
-               "compose:args",value);
+      if ((flags & WidthValue) == 0)
+        {
+          (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
+            "InvalidSetting","'%s' '%s'","compose:args",value);
           composite_image=DestroyImage(composite_image);
           destination_image=DestroyImage(destination_image);
           return(MagickFalse);

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 81db9341cebde6e4b0696c8ece171822922c6dd9..e2b5ba10e0386ae5c4bb920d5118d3e21ff0af26 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -17,7 +17,7 @@
 %                            September 1994                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %

diff --git a/MagickCore/image.c b/MagickCore/image.c
index ab6baa2eb395cd711a9bcf0e933984da6af64aa7..eaa6e0d496ec4b263ca1ec93f73bc6b441c70ce1 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -281,13 +281,14 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
   image->client_data=image_info->client_data;
   if (image_info->cache != (void *) NULL)
     ClonePixelCacheMethods(image->cache,image_info->cache);
-
-  /* Set all global options that map to per-image settings */
+  /*
+    Set all global options that map to per-image settings.
+  */
   (void) SyncImageSettings(image_info,image,exception);
-  /* At this point the image is not yet part of this image_info structure */
-  image->image_info = (ImageInfo *) NULL;
-
-  /* global options that are only set for new images */
+  /*
+    Global options that are only set for new images.
+  */
+  image->image_info=(ImageInfo *) NULL;
   option=GetImageOption(image_info,"delay");
   if (option != (const char *) NULL)
     {
@@ -1572,8 +1573,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
 #endif
         if (image != (Image *) NULL)
           value=GetImageProperty(image,pattern,exception);
-        if ((value == (const char *) NULL) &&
-            (image != (Image *) NULL))
+        if ((value == (const char *) NULL) && (image != (Image *) NULL))
           value=GetImageArtifact(image,pattern);
         if ((value == (const char *) NULL) &&
             (image_info != (ImageInfo *) NULL))
@@ -3973,7 +3973,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
      being removed from a image_info image list (or yet to be added to such),
      should have this pointer reset to NULL.
   */
-  image->image_info = image_info;
+  image->image_info=image_info;
 #endif
   return(MagickTrue);
 }

diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index e51e974ab4722e1d172d012f4be94588137bec97..5dfc99fc476ad005e3cfc521942860759a915b18 100644 (file)
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -22,7 +22,7 @@
 %                               October 1998                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %

diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index 6c993b3cb1509d69ff84a6aaecacf409b87ede21..450badc5eaf8c73e89ac37f3153cdbf3723861bd 100644 (file)
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -22,7 +22,7 @@
 %                               October 1998                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %

diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
index 3ea3068c92c1d6542742dc05fca431e753134484..14cd3593806e97d4afd9584fb7b3234a5ab778f7 100644 (file)
--- a/MagickCore/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
 
   You may not use this file except in compliance with the License.

diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index d77d120d84eb046cc618b247759940bf59ff1318..36897c40648d3581db328fc279230971e0012483 100644 (file)
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -16,7 +16,7 @@
 %                               October 1998                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %

diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h
index 18a6c0bb864471a355d80a82d78c4519f33efa16..32a2220fa44f00d45cfa5fe6a976dd34e7a20bca 100644 (file)
--- a/MagickCore/quantum.h
+++ b/MagickCore/quantum.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
 
   You may not use this file except in compliance with the License.

diff --git a/MagickCore/type.c b/MagickCore/type.c
index 13be5f71e959653c4cbf0cf5a43d6e97274695fb..66c382a40097f2bcfa8fdec55763e5c0539470cc 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -17,7 +17,7 @@
 %                                 May 2001                                    %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2007 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 17db95c12128cb7d682d4ca1e99d7f9c3cdf97f6..0acf651903ee40da115948ff8559e574ee40abd6 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4599,7 +4599,7 @@ WandExport void CLINoImageOperator(MagickCLI *cli_wand,
             value=InterpretImageProperties(_image_info,_images,arg2,_exception);
             if (value == (char *) NULL)
               CLIWandExceptionBreak(OptionWarning,"InterpretPropertyFailure",
-                    option);
+                option);
             (void) SetImageOption(_image_info,arg1+7,value);
             value=DestroyString(value);
             break;

diff --git a/coders/bgr.c b/coders/bgr.c
index a800ff2e414eb4b8afc4a4fa0209209f7385407e..933b43ad0572b6e5fd1862bc0edbccc6028546a8 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %