From: cristy Date: Sun, 10 Feb 2013 17:15:30 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4267 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a78095355e735d713d5994eb662b36037ce69f2;p=imagemagick --- diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 40dc59c2d..52f646651 100644 --- 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 81db9341c..e2b5ba10e 100644 --- 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 ab6baa2eb..eaa6e0d49 100644 --- 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 e51e974ab..5dfc99fc4 100644 --- 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 6c993b3cb..450badc5e 100644 --- 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 3ea3068c9..14cd35938 100644 --- 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 d77d120d8..36897c406 100644 --- 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 18a6c0bb8..32a2220fa 100644 --- 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 13be5f71e..66c382a40 100644 --- 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 17db95c12..0acf65190 100644 --- 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 a800ff2e4..933b43ad0 100644 --- 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 %