Skip to content

Commit

Permalink
https://github.com/ImageMagick/ImageMagick/issues/1586
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Jun 16, 2019
1 parent 93b0af3 commit a906fe9
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions MagickCore/statistic.c
Expand Up @@ -150,15 +150,19 @@ static PixelChannels **DestroyPixelThreadSet(PixelChannels **pixels)
return(pixels);
}

static PixelChannels **AcquirePixelThreadSet(const Image *image)
static PixelChannels **AcquirePixelThreadSet(const Image *images)
{
const Image
*next;

PixelChannels
**pixels;

register ssize_t
i;

size_t
columns,
number_threads;

number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
Expand All @@ -167,16 +171,18 @@ static PixelChannels **AcquirePixelThreadSet(const Image *image)
if (pixels == (PixelChannels **) NULL)
return((PixelChannels **) NULL);
(void) memset(pixels,0,number_threads*sizeof(*pixels));
columns=images->columns;
for (next=images; next != (Image *) NULL; next=next->next)
columns=MagickMax(next->columns,columns);
for (i=0; i < (ssize_t) number_threads; i++)
{
register ssize_t
j;

pixels[i]=(PixelChannels *) AcquireQuantumMemory(image->columns,
sizeof(**pixels));
pixels[i]=(PixelChannels *) AcquireQuantumMemory(columns,sizeof(**pixels));
if (pixels[i] == (PixelChannels *) NULL)
return(DestroyPixelThreadSet(pixels));
for (j=0; j < (ssize_t) image->columns; j++)
for (j=0; j < (ssize_t) columns; j++)
{
register ssize_t
k;
Expand Down

0 comments on commit a906fe9

Please sign in to comment.