Skip to content
Permalink
Browse files

https://github.com/ImageMagick/ImageMagick/issues/1588

  • Loading branch information...
Cristy
Cristy committed Jun 16, 2019
1 parent 68192c0 commit f6ffc702c6eecd963587273a429dcd608c648984
Showing with 11 additions and 4 deletions.
  1. +3 −0 magick/annotate.c
  2. +8 −4 magick/fourier.c
@@ -266,6 +266,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
{
annotate_info=DestroyDrawInfo(annotate_info);
annotate=DestroyDrawInfo(annotate);
text=DestroyString(text);
return(MagickFalse);
}
p=text;
@@ -300,6 +301,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
annotate_info=DestroyDrawInfo(annotate_info);
annotate=DestroyDrawInfo(annotate);
textlist=(char **) RelinquishMagickMemory(textlist);
text=DestroyString(text);
return(MagickFalse);
}
if (IsGrayColorspace(image->colorspace) != MagickFalse)
@@ -517,6 +519,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
annotate_info=DestroyDrawInfo(annotate_info);
annotate=DestroyDrawInfo(annotate);
textlist=(char **) RelinquishMagickMemory(textlist);
text=DestroyString(text);
return(status);
}

@@ -245,10 +245,14 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,

if (status == MagickFalse)
continue;
Ar=GetCacheViewVirtualPixels(Ar_view,0,y,Ar_image->columns,1,exception);
Ai=GetCacheViewVirtualPixels(Ai_view,0,y,Ai_image->columns,1,exception);
Br=GetCacheViewVirtualPixels(Br_view,0,y,Br_image->columns,1,exception);
Bi=GetCacheViewVirtualPixels(Bi_view,0,y,Bi_image->columns,1,exception);
Ar=GetCacheViewVirtualPixels(Ar_view,0,y,
MagickMax(Ar_image->columns,Cr_image->columns),1,exception);
Ai=GetCacheViewVirtualPixels(Ai_view,0,y,
MagickMax(Ai_image->columns,Ci_image->columns),1,exception);
Br=GetCacheViewVirtualPixels(Br_view,0,y,
MagickMax(Br_image->columns,Cr_image->columns),1,exception);
Bi=GetCacheViewVirtualPixels(Bi_view,0,y,
MagickMax(Bi_image->columns,Ci_image->columns),1,exception);
Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,Cr_image->columns,1,exception);
Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,Ci_image->columns,1,exception);
if ((Ar == (const PixelPacket *) NULL) ||

0 comments on commit f6ffc70

Please sign in to comment.
You can’t perform that action at this time.