...
diff --git a/coders/webp.c b/coders/webp.c
index 25ff796..67fba41 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -177,7 +177,7 @@
#define CHUNK_HEADER_SIZE 8
#define MAX_CHUNK_PAYLOAD (~0U-CHUNK_HEADER_SIZE-1)
- size_t
+ ssize_t
offset;
/*
@@ -349,8 +349,8 @@
}
#if defined(MAGICKCORE_WEBPMUX_DELEGATE)
-static int ReadAnimatedWEBPImage(const ImageInfo *image_info, Image *image,
- uint8_t *stream, size_t length, WebPDecoderConfig *configure,
+static int ReadAnimatedWEBPImage(const ImageInfo *image_info,Image *image,
+ uint8_t *stream,size_t length,WebPDecoderConfig *configure,
ExceptionInfo *exception)
{
Image
@@ -491,14 +491,13 @@
if (configure.input.has_animation) {
#if defined(MAGICKCORE_WEBPMUX_DELEGATE)
- webp_status=ReadAnimatedWEBPImage(image_info,image,stream,
- length,&configure,exception);
+ webp_status=ReadAnimatedWEBPImage(image_info,image,stream,length,
+ &configure,exception);
#else
webp_status=VP8_STATUS_UNSUPPORTED_FEATURE;
#endif
} else {
- webp_status=ReadSingleWEBPImage(image, stream,
- length,&configure,exception);
+ webp_status=ReadSingleWEBPImage(image,stream,length,&configure,exception);
}
}
@@ -773,6 +772,10 @@
*current,
*head;
+ size_t
+ effective_delta = 0,
+ frame_timestamp = 0;
+
WebPAnimEncoder
*enc;
@@ -785,9 +788,6 @@
WebPPicture
picture;
- size_t frame_timestamp = 0,
- effective_delta = 0;
-
WebPAnimEncoderOptionsInit(&enc_options);
if (image_info->verbose)
enc_options.verbose = 1;
@@ -809,10 +809,10 @@
effective_delta = image->delay*1000/image->ticks_per_second;
if (effective_delta < 10)
- effective_delta = 100; // Consistent with gif2webp
+ effective_delta = 100; /* Consistent with gif2webp */
frame_timestamp+=effective_delta;
- WebPAnimEncoderAdd(enc, &picture,(int) frame_timestamp,configure);
+ WebPAnimEncoderAdd(enc,&picture,(int) frame_timestamp,configure);
image = GetNextImageInList(image);
current->next=(PictureMemory *) calloc(sizeof(*head), 1);
