No commit message

ImageMagick · Dec 27, 2014 · 2cf7bfe · 2cf7bfe
1 parent dca560a
commit 2cf7bfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,5 @@
 2014-12-27  6.9.0-2 Cristy  <quetzlzacatenango@image...>
-  * New version 6.9.0-2, SVN revision 17465.
+  * New version 6.9.0-2, SVN revision 17466.
 
 2014-12-14  6.9.0-1 Dirk Lemstra <dirk@snakeware...>
   * Added support for reading EXR files to the Windows distribution.

diff --git a/magick/image.c b/magick/image.c
@@ -2578,7 +2578,8 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
         }
     }
   *extension='\0';
-  GetPathComponent(image_info->filename,ExtensionPath,extension);
+  if (*image_info->magick == '\0')
+    GetPathComponent(image_info->filename,ExtensionPath,extension);
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
   if (*extension != '\0')
     if ((LocaleCompare(extension,"gz") == 0) ||