From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 23 Dec 2017 13:32:30 +0000 (-0500)
Subject: Leverage user_data member for progress
X-Git-Tag: 7.0.7-16~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf4ad30c52b487691b39385d4434978e23318602;p=imagemagick

Leverage user_data member for progress
---

diff --git a/coders/webp.c b/coders/webp.c
index 901338d2d..a3e64d6ba 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -554,7 +554,7 @@ static int WebPEncodeProgress(int percent,const WebPPicture* picture)
   MagickBooleanType
     status;
 
-  image=(Image *) picture->custom_ptr;
+  image=(Image *) picture->user_data;
   status=SetImageProgress(image,EncodeImageTag,percent-1,100);
   return(status == MagickFalse ? 0 : 1);
 }
@@ -626,13 +626,14 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
 #if !defined(MAGICKCORE_WEBPMUX_DELEGATE)
   picture.writer=WebPEncodeWriter;
   picture.custom_ptr=(void *) image;
-#if WEBP_DECODER_ABI_VERSION >= 0x0100
-  picture.progress_hook=WebPEncodeProgress;
-#endif
 #else
   WebPMemoryWriterInit(&writer_info);
   picture.writer=WebPMemoryWrite;
   picture.custom_ptr=(&writer_info);
+#endif
+#if WEBP_DECODER_ABI_VERSION >= 0x0100
+  picture.progress_hook=WebPEncodeProgress;
+  picture.user_data=(void *) image;
 #endif
   picture.stats=(&statistics);
   picture.width=(int) image->columns;