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 a3a5cc1 commit 5e409ae
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions magick/statistic.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,11 @@ static MagickPixelPacket **DestroyPixelThreadSet(MagickPixelPacket **pixels)
return(pixels);
}

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

MagickPixelPacket
**pixels;

Expand All @@ -159,6 +162,7 @@ static MagickPixelPacket **AcquirePixelThreadSet(const Image *image)
j;

size_t
columns,
number_threads;

number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
Expand All @@ -167,14 +171,17 @@ static MagickPixelPacket **AcquirePixelThreadSet(const Image *image)
if (pixels == (MagickPixelPacket **) NULL)
return((MagickPixelPacket **) 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++)
{
pixels[i]=(MagickPixelPacket *) AcquireQuantumMemory(image->columns,
pixels[i]=(MagickPixelPacket *) AcquireQuantumMemory(columns,
sizeof(**pixels));
if (pixels[i] == (MagickPixelPacket *) NULL)
return(DestroyPixelThreadSet(pixels));
for (j=0; j < (ssize_t) image->columns; j++)
GetMagickPixelPacket(image,&pixels[i][j]);
for (j=0; j < (ssize_t) columns; j++)
GetMagickPixelPacket(images,&pixels[i][j]);
}
return(pixels);
}
Expand Down

0 comments on commit 5e409ae

Please sign in to comment.