From 6c8315752484ace0c67529cd6ba32d0137ef8364 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 13 Oct 2014 13:46:13 +0200 Subject: [PATCH] correct WebPMemoryWriterClear ABI check this function was introduced in 0x0204; fix checks related to this to be > 0x0203 instead of 0x0202, pointed out on ffmpeg-devel. Change-Id: I52cd2b98304baf1eb9a83094e2374f2120a1546b --- examples/cwebp.c | 2 +- examples/gif2webp_util.c | 6 +++--- src/enc/vp8enci.h | 2 +- src/webp/encode.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/cwebp.c b/examples/cwebp.c index fc3302c3..e75f3457 100644 --- a/examples/cwebp.c +++ b/examples/cwebp.c @@ -1126,7 +1126,7 @@ int main(int argc, const char *argv[]) { return_value = 0; Error: -#if WEBP_ENCODER_ABI_VERSION > 0x0202 +#if WEBP_ENCODER_ABI_VERSION > 0x0203 WebPMemoryWriterClear(&memory_writer); #else free(memory_writer.mem); diff --git a/examples/gif2webp_util.c b/examples/gif2webp_util.c index 697df0b4..966dc068 100644 --- a/examples/gif2webp_util.c +++ b/examples/gif2webp_util.c @@ -475,7 +475,7 @@ static WebPEncodingError SetFrame(const WebPConfig* const config, // TODO(later): Perhaps a rough SSIM/PSNR produced by the encoder should // also be a criteria, in addition to sizes. if (mem1.size <= mem2.size) { -#if WEBP_ENCODER_ABI_VERSION > 0x0202 +#if WEBP_ENCODER_ABI_VERSION > 0x0203 WebPMemoryWriterClear(&mem2); #else free(mem2.mem); @@ -483,7 +483,7 @@ static WebPEncodingError SetFrame(const WebPConfig* const config, #endif GetEncodedData(&mem1, encoded_data); } else { -#if WEBP_ENCODER_ABI_VERSION > 0x0202 +#if WEBP_ENCODER_ABI_VERSION > 0x0203 WebPMemoryWriterClear(&mem1); #else free(mem1.mem); @@ -497,7 +497,7 @@ static WebPEncodingError SetFrame(const WebPConfig* const config, return error_code; Err: -#if WEBP_ENCODER_ABI_VERSION > 0x0202 +#if WEBP_ENCODER_ABI_VERSION > 0x0203 WebPMemoryWriterClear(&mem1); WebPMemoryWriterClear(&mem2); #else diff --git a/src/enc/vp8enci.h b/src/enc/vp8enci.h index b5bb87b4..224a494e 100644 --- a/src/enc/vp8enci.h +++ b/src/enc/vp8enci.h @@ -571,7 +571,7 @@ int WebPPictureAllocYUVA(WebPPicture* const picture, int width, int height); //------------------------------------------------------------------------------ -#if WEBP_ENCODER_ABI_VERSION <= 0x0202 +#if WEBP_ENCODER_ABI_VERSION <= 0x0203 void WebPMemoryWriterClear(WebPMemoryWriter* writer); #endif diff --git a/src/webp/encode.h b/src/webp/encode.h index dd600568..653671ed 100644 --- a/src/webp/encode.h +++ b/src/webp/encode.h @@ -231,14 +231,14 @@ struct WebPMemoryWriter { // The following must be called first before any use. WEBP_EXTERN(void) WebPMemoryWriterInit(WebPMemoryWriter* writer); -#if WEBP_ENCODER_ABI_VERSION > 0x0202 +#if WEBP_ENCODER_ABI_VERSION > 0x0203 // The following must be called to deallocate writer->mem memory. The 'writer' // object itself is not deallocated. WEBP_EXTERN(void) WebPMemoryWriterClear(WebPMemoryWriter* writer); #endif // The custom writer to be used with WebPMemoryWriter as custom_ptr. Upon // completion, writer.mem and writer.size will hold the coded data. -#if WEBP_ENCODER_ABI_VERSION > 0x0202 +#if WEBP_ENCODER_ABI_VERSION > 0x0203 // writer.mem must be freed by calling WebPMemoryWriterClear. #else // writer.mem must be freed by calling 'free(writer.mem)'.