Skip to content

Commit 7c2c5ba

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/issues/1588
1 parent ab91bfd commit 7c2c5ba

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Diff for: MagickCore/annotate.c

+3
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
277277
{
278278
annotate_info=DestroyDrawInfo(annotate_info);
279279
annotate=DestroyDrawInfo(annotate);
280+
text=DestroyString(text);
280281
return(MagickFalse);
281282
}
282283
p=text;
@@ -311,6 +312,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
311312
annotate_info=DestroyDrawInfo(annotate_info);
312313
annotate=DestroyDrawInfo(annotate);
313314
textlist=(char **) RelinquishMagickMemory(textlist);
315+
text=DestroyString(text);
314316
return(MagickFalse);
315317
}
316318
if (IsGrayColorspace(image->colorspace) != MagickFalse)
@@ -529,6 +531,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
529531
annotate_info=DestroyDrawInfo(annotate_info);
530532
annotate=DestroyDrawInfo(annotate);
531533
textlist=(char **) RelinquishMagickMemory(textlist);
534+
text=DestroyString(text);
532535
return(status);
533536
}
534537

Diff for: MagickCore/fourier.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,14 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
245245

246246
if (status == MagickFalse)
247247
continue;
248-
Ar=GetCacheViewVirtualPixels(Ar_view,0,y,Ar_image->columns,1,exception);
249-
Ai=GetCacheViewVirtualPixels(Ai_view,0,y,Ai_image->columns,1,exception);
250-
Br=GetCacheViewVirtualPixels(Br_view,0,y,Br_image->columns,1,exception);
251-
Bi=GetCacheViewVirtualPixels(Bi_view,0,y,Bi_image->columns,1,exception);
248+
Ar=GetCacheViewVirtualPixels(Ar_view,0,y,
249+
MagickMax(Ar_image->columns,Cr_image->columns),1,exception);
250+
Ai=GetCacheViewVirtualPixels(Ai_view,0,y,
251+
MagickMax(Ai_image->columns,Ci_image->columns),1,exception);
252+
Br=GetCacheViewVirtualPixels(Br_view,0,y,
253+
MagickMax(Br_image->columns,Cr_image->columns),1,exception);
254+
Bi=GetCacheViewVirtualPixels(Bi_view,0,y,
255+
MagickMax(Bi_image->columns,Ci_image->columns),1,exception);
252256
Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,Cr_image->columns,1,exception);
253257
Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,Ci_image->columns,1,exception);
254258
if ((Ar == (const Quantum *) NULL) || (Ai == (const Quantum *) NULL) ||

0 commit comments

Comments
 (0)