averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-31 11:18:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix previous image references in OptimizeImageLayers (#983)

Browse Source 
The code used CloneImage with columns and rows arguments to create
previous image references.

However, the documentation of CloneImage says:
> If the specified columns and rows is 0, an exact copy of the image is
> returned, otherwise the pixel data is undefined and must be initialized
> with the QueueAuthenticPixels() and SyncAuthenticPixels() methods.  On
> failure, a NULL image is returned and exception describes the reason for the
> failure.

Therfore, the pixel data given by such a statement was undefined, which is
not expected.

This alters those arguments to 0, or replaces CloneImage with
ReferenceImage if it is enough.
This commit is contained in:
Akihiko Odaki
2018-02-13 23:57:07 +09:00
committed by ImageMagick
parent 5960b92b65
commit 79e2db2114
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagickCore/layer.c
+3 -6
View File
@@ -1096,8 +1096,7 @@ static Image *OptimizeLayerFrames(const Image *image,
dup_bounds.width=dup_bounds.height=0; /* no dup, no pixel added */
if ( add_frames )
{
dup_image=CloneImage(curr->previous,curr->previous->page.width,
curr->previous->page.height,MagickTrue,exception);
dup_image=CloneImage(curr->previous,0,0,MagickTrue,exception);
if (dup_image == (Image *) NULL)
{
bounds=(RectangleInfo *) RelinquishMagickMemory(bounds);
@@ -1124,8 +1123,7 @@ static Image *OptimizeLayerFrames(const Image *image,
/*
Now compare against a simple background disposal
*/
bgnd_image=CloneImage(curr->previous,curr->previous->page.width,
curr->previous->page.height,MagickTrue,exception);
bgnd_image=CloneImage(curr->previous,0,0,MagickTrue,exception);
if (bgnd_image == (Image *) NULL)
{
bounds=(RectangleInfo *) RelinquishMagickMemory(bounds);
@@ -1280,8 +1278,7 @@ static Image *OptimizeLayerFrames(const Image *image,
bgnd_image=DestroyImage(bgnd_image);
if ( disposals[i-1] == NoneDispose )
{
prev_image=CloneImage(curr->previous,curr->previous->page.width,
curr->previous->page.height,MagickTrue,exception);
prev_image=ReferenceImage(curr->previous);
if (prev_image == (Image *) NULL)
{
bounds=(RectangleInfo *) RelinquishMagickMemory(bounds);