From: cristy Date: Wed, 28 Apr 2010 22:14:19 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9569 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a7b2b8f195aae900a00f0c92d326e4b78e7b9c1;p=imagemagick --- diff --git a/coders/psd.c b/coders/psd.c index 2dac0e8ed..141ff335a 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -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; } diff --git a/magick/constitute.c b/magick/constitute.c index 0f14cbffe..152cd38a3 100644 --- a/magick/constitute.c +++ b/magick/constitute.c @@ -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);