Skip to content

Commit 025e77f

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/issues/1615
1 parent d4fc44b commit 025e77f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Diff for: MagickCore/statistic.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,17 @@ static PixelChannels **AcquirePixelThreadSet(const Image *images)
163163

164164
size_t
165165
columns,
166-
number_threads;
166+
rows;
167167

168-
number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
169-
pixels=(PixelChannels **) AcquireQuantumMemory(number_threads,
170-
sizeof(*pixels));
168+
rows=MagickMax(GetImageListLength(images),
169+
(size_t) GetMagickResourceLimit(ThreadResource));
170+
pixels=(PixelChannels **) AcquireQuantumMemory(rows,sizeof(*pixels));
171171
if (pixels == (PixelChannels **) NULL)
172172
return((PixelChannels **) NULL);
173-
(void) memset(pixels,0,number_threads*sizeof(*pixels));
174-
columns=images->columns;
173+
columns=MaxPixelChannels;
175174
for (next=images; next != (Image *) NULL; next=next->next)
176175
columns=MagickMax(next->columns,columns);
177-
for (i=0; i < (ssize_t) number_threads; i++)
176+
for (i=0; i < (ssize_t) rows; i++)
178177
{
179178
register ssize_t
180179
j;

0 commit comments

Comments
 (0)