From 91c0925840e9291fe390417721e29b38ed5d1679 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 14 Feb 2011 00:00:33 +0000 Subject: [PATCH] --- ChangeLog | 6 +++++- magick/constitute.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79dd47c79..a29e7ec45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-02-14 6.6.7-8 Cristy + * Use implicit image format when explicit format is bogus (e.g. + 02.13.11-18:43:58.png now writes as PNG). + 2011-02-13 6.6.7-7 Anthony Thyssen * Fixed Variable blur to handle small (< 1.0 sigma) blurs generated by the blur map being used, rather than just 'cutoff' suddenly. @@ -437,7 +441,7 @@ * Nicolas Robidoux with the assistance of Chantal Racette contribute an approximation of the sinc function over the interval [-3,3]. * Eliminate a small memory leak in LevelizeImageChannel() (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16951). + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16951). * Recognize -fx logtwo (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16958). diff --git a/magick/constitute.c b/magick/constitute.c index 060c9b552..d79bb1554 100644 --- a/magick/constitute.c +++ b/magick/constitute.c @@ -1072,7 +1072,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, } (void) SyncImageProfiles(image); option=GetImageOption(image_info,"delegate:bimodal"); - if ((option != (const char *) NULL) && + if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse) && (write_info->page == (char *) NULL) && (GetPreviousImageInList(image) == (Image *) NULL) && @@ -1172,7 +1172,14 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, if ((magick_info == (const MagickInfo *) NULL) || (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL)) { - magick_info=GetMagickInfo(image->magick,&image->exception); + char + extension[MaxTextExtent]; + + GetPathComponent(image->filename,ExtensionPath,extension); + if (*extension != '\0') + magick_info=GetMagickInfo(extension,&image->exception); + else + magick_info=GetMagickInfo(image->magick,&image->exception); (void) CopyMagickString(image->filename,filename,MaxTextExtent); } if ((magick_info == (const MagickInfo *) NULL) || -- 2.40.0