]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Wed, 28 Apr 2010 22:14:19 +0000 (22:14 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Wed, 28 Apr 2010 22:14:19 +0000 (22:14 +0000)
coders/psd.c
magick/constitute.c

index 2dac0e8edd301901a98017c56d6c00df1d07cb5a..141ff335ac92e6d3a01814343b11764b5ebfcf82 100644 (file)
@@ -1906,7 +1906,7 @@ static void RemoveICCProfileFromResourceBlock(StringInfo *bim_profile)
     p=PushLongPixel(MSBEndian,p,&count);
     if (id == 0x0000040f)
       {
-        (void) CopyMagickMemory(p-16,p+count-16,length-count-(p-datum));
+        (void) CopyMagickMemory(p-16,p+count+12,length-count-(p-datum));
         SetStringInfoLength(bim_profile,PSDQuantum(length-count-16));
         break;
       }
index 0f14cbffededffd33602fce5363ca295aa9a10c3..152cd38a37d8e46de856b4fc98d5038831ee9a5a 100644 (file)
@@ -529,10 +529,9 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       delegate_info=GetDelegateInfo(read_info->magick,(char *) NULL,exception);
       if (delegate_info == (const DelegateInfo *) NULL)
         {
-          if (IsPathAccessible(read_info->filename) != MagickFalse)
-            (void) ThrowMagickException(exception,GetMagickModule(),
-              MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'",
-              read_info->filename);
+          (void) ThrowMagickException(exception,GetMagickModule(),
+            MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'",
+            read_info->filename);
           if (read_info->temporary != MagickFalse)
             (void) RelinquishUniqueFileResource(read_info->filename);
           read_info=DestroyImageInfo(read_info);