From 9838e5d5ff14210acfd6298f5dcf7ed3491b479c Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 17 Jul 2012 15:01:30 -0700 Subject: [PATCH] decode.h: remove '* const' from function parameters makes the public interface consistent and more readable Change-Id: I067eb5ecc1094216ef6aecc65f636f69873de8f9 --- src/dec/buffer.c | 4 ++-- src/dec/idec.c | 24 ++++++++++++------------ src/dec/webp.c | 6 +++--- src/webp/decode.h | 34 ++++++++++++++++------------------ 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/dec/buffer.c b/src/dec/buffer.c index 4f6d83a2..d0f7c82e 100644 --- a/src/dec/buffer.c +++ b/src/dec/buffer.c @@ -166,14 +166,14 @@ VP8StatusCode WebPAllocateDecBuffer(int w, int h, //------------------------------------------------------------------------------ // constructors / destructors -int WebPInitDecBufferInternal(WebPDecBuffer* const buffer, int version) { +int WebPInitDecBufferInternal(WebPDecBuffer* buffer, int version) { if (version != WEBP_DECODER_ABI_VERSION) return 0; // version mismatch if (buffer == NULL) return 0; memset(buffer, 0, sizeof(*buffer)); return 1; } -void WebPFreeDecBuffer(WebPDecBuffer* const buffer) { +void WebPFreeDecBuffer(WebPDecBuffer* buffer) { if (buffer != NULL) { if (!buffer->is_external_memory) free(buffer->private_memory); diff --git a/src/dec/idec.c b/src/dec/idec.c index 8ae9cbe1..c7ab6f6e 100644 --- a/src/dec/idec.c +++ b/src/dec/idec.c @@ -533,7 +533,7 @@ static VP8StatusCode IDecode(WebPIDecoder* idec) { //------------------------------------------------------------------------------ // Public functions -WebPIDecoder* WebPINewDecoder(WebPDecBuffer* const output_buffer) { +WebPIDecoder* WebPINewDecoder(WebPDecBuffer* output_buffer) { WebPIDecoder* idec = (WebPIDecoder*)calloc(1, sizeof(WebPIDecoder)); if (idec == NULL) { return NULL; @@ -554,7 +554,7 @@ WebPIDecoder* WebPINewDecoder(WebPDecBuffer* const output_buffer) { } WebPIDecoder* WebPIDecode(const uint8_t* data, size_t data_size, - WebPDecoderConfig* const config) { + WebPDecoderConfig* config) { WebPIDecoder* idec; // Parse the bitstream's features, if requested: @@ -575,7 +575,7 @@ WebPIDecoder* WebPIDecode(const uint8_t* data, size_t data_size, return idec; } -void WebPIDelete(WebPIDecoder* const idec) { +void WebPIDelete(WebPIDecoder* idec) { if (idec == NULL) return; if (idec->dec_ != NULL) { if (!idec->is_lossless_) { @@ -638,8 +638,8 @@ static VP8StatusCode IDecCheckStatus(const WebPIDecoder* const idec) { return VP8_STATUS_SUSPENDED; } -VP8StatusCode WebPIAppend(WebPIDecoder* const idec, - const uint8_t* const data, size_t data_size) { +VP8StatusCode WebPIAppend(WebPIDecoder* idec, + const uint8_t* data, size_t data_size) { VP8StatusCode status; if (idec == NULL || data == NULL) { return VP8_STATUS_INVALID_PARAM; @@ -659,8 +659,8 @@ VP8StatusCode WebPIAppend(WebPIDecoder* const idec, return IDecode(idec); } -VP8StatusCode WebPIUpdate(WebPIDecoder* const idec, - const uint8_t* const data, size_t data_size) { +VP8StatusCode WebPIUpdate(WebPIDecoder* idec, + const uint8_t* data, size_t data_size) { VP8StatusCode status; if (idec == NULL || data == NULL) { return VP8_STATUS_INVALID_PARAM; @@ -692,9 +692,9 @@ static const WebPDecBuffer* GetOutputBuffer(const WebPIDecoder* const idec) { return idec->params_.output; } -const WebPDecBuffer* WebPIDecodedArea(const WebPIDecoder* const idec, - int* const left, int* const top, - int* const width, int* const height) { +const WebPDecBuffer* WebPIDecodedArea(const WebPIDecoder* idec, + int* left, int* top, + int* width, int* height) { const WebPDecBuffer* const src = GetOutputBuffer(idec); if (left) *left = 0; if (top) *top = 0; @@ -709,7 +709,7 @@ const WebPDecBuffer* WebPIDecodedArea(const WebPIDecoder* const idec, return src; } -uint8_t* WebPIDecGetRGB(const WebPIDecoder* const idec, int* last_y, +uint8_t* WebPIDecGetRGB(const WebPIDecoder* idec, int* last_y, int* width, int* height, int* stride) { const WebPDecBuffer* const src = GetOutputBuffer(idec); if (!src) return NULL; @@ -725,7 +725,7 @@ uint8_t* WebPIDecGetRGB(const WebPIDecoder* const idec, int* last_y, return src->u.RGBA.rgba; } -uint8_t* WebPIDecGetYUV(const WebPIDecoder* const idec, int* last_y, +uint8_t* WebPIDecGetYUV(const WebPIDecoder* idec, int* last_y, uint8_t** u, uint8_t** v, int* width, int* height, int *stride, int* uv_stride) { const WebPDecBuffer* const src = GetOutputBuffer(idec); diff --git a/src/dec/webp.c b/src/dec/webp.c index b5399f17..21744e91 100644 --- a/src/dec/webp.c +++ b/src/dec/webp.c @@ -649,7 +649,7 @@ int WebPGetInfo(const uint8_t* data, size_t data_size, //------------------------------------------------------------------------------ // Advance decoding API -int WebPInitDecoderConfigInternal(WebPDecoderConfig* const config, +int WebPInitDecoderConfigInternal(WebPDecoderConfig* config, int version) { if (version != WEBP_DECODER_ABI_VERSION) { return 0; // version mismatch @@ -664,7 +664,7 @@ int WebPInitDecoderConfigInternal(WebPDecoderConfig* const config, } VP8StatusCode WebPGetFeaturesInternal(const uint8_t* data, size_t data_size, - WebPBitstreamFeatures* const features, + WebPBitstreamFeatures* features, int version) { VP8StatusCode status; if (version != WEBP_DECODER_ABI_VERSION) { @@ -682,7 +682,7 @@ VP8StatusCode WebPGetFeaturesInternal(const uint8_t* data, size_t data_size, } VP8StatusCode WebPDecode(const uint8_t* data, size_t data_size, - WebPDecoderConfig* const config) { + WebPDecoderConfig* config) { WebPDecParams params; VP8StatusCode status; diff --git a/src/webp/decode.h b/src/webp/decode.h index 04760ce3..c61849e7 100644 --- a/src/webp/decode.h +++ b/src/webp/decode.h @@ -179,17 +179,17 @@ typedef struct { } WebPDecBuffer; // Internal, version-checked, entry point -WEBP_EXTERN(int) WebPInitDecBufferInternal(WebPDecBuffer* const, int); +WEBP_EXTERN(int) WebPInitDecBufferInternal(WebPDecBuffer*, int); // Initialize the structure as empty. Must be called before any other use. // Returns false in case of version mismatch -static WEBP_INLINE int WebPInitDecBuffer(WebPDecBuffer* const buffer) { +static WEBP_INLINE int WebPInitDecBuffer(WebPDecBuffer* buffer) { return WebPInitDecBufferInternal(buffer, WEBP_DECODER_ABI_VERSION); } // Free any memory associated with the buffer. Must always be called last. // Note: doesn't free the 'buffer' structure itself. -WEBP_EXTERN(void) WebPFreeDecBuffer(WebPDecBuffer* const buffer); +WEBP_EXTERN(void) WebPFreeDecBuffer(WebPDecBuffer* buffer); //------------------------------------------------------------------------------ // Enumeration of the status codes @@ -239,7 +239,7 @@ typedef struct WebPIDecoder WebPIDecoder; // is kept, which means that the lifespan of 'output_buffer' must be larger than // that of the returned WebPIDecoder object. // Returns NULL if the allocation failed. -WEBP_EXTERN(WebPIDecoder*) WebPINewDecoder(WebPDecBuffer* const output_buffer); +WEBP_EXTERN(WebPIDecoder*) WebPINewDecoder(WebPDecBuffer* output_buffer); // This function allocates and initializes an incremental-decoder object, which // will output the r/g/b(/a) samples specified by 'mode' into a preallocated @@ -264,13 +264,13 @@ WEBP_EXTERN(WebPIDecoder*) WebPINewYUV( // Deletes the WebPIDecoder object and associated memory. Must always be called // if WebPINewDecoder, WebPINewRGB or WebPINewYUV succeeded. -WEBP_EXTERN(void) WebPIDelete(WebPIDecoder* const idec); +WEBP_EXTERN(void) WebPIDelete(WebPIDecoder* idec); // Copies and decodes the next available data. Returns VP8_STATUS_OK when // the image is successfully decoded. Returns VP8_STATUS_SUSPENDED when more // data is expected. Returns error in other cases. WEBP_EXTERN(VP8StatusCode) WebPIAppend( - WebPIDecoder* const idec, const uint8_t* const data, size_t data_size); + WebPIDecoder* idec, const uint8_t* data, size_t data_size); // A variant of the above function to be used when data buffer contains // partial data from the beginning. In this case data buffer is not copied @@ -278,7 +278,7 @@ WEBP_EXTERN(VP8StatusCode) WebPIAppend( // Note that the value of the 'data' pointer can change between calls to // WebPIUpdate, for instance when the data buffer is resized to fit larger data. WEBP_EXTERN(VP8StatusCode) WebPIUpdate( - WebPIDecoder* const idec, const uint8_t* const data, size_t data_size); + WebPIDecoder* idec, const uint8_t* data, size_t data_size); // Returns the r/g/b/(a) image decoded so far. Returns NULL if output params // are not initialized yet. The r/g/b/(a) output type corresponds to the mode @@ -287,13 +287,13 @@ WEBP_EXTERN(VP8StatusCode) WebPIUpdate( // (*last_y, *width etc.) can be NULL if corresponding information is not // needed. WEBP_EXTERN(uint8_t*) WebPIDecGetRGB( - const WebPIDecoder* const idec, int* last_y, + const WebPIDecoder* idec, int* last_y, int* width, int* height, int* stride); // Same as above function to get YUV image. Returns pointer to the luma plane // or NULL in case of error. WEBP_EXTERN(uint8_t*) WebPIDecGetYUV( - const WebPIDecoder* const idec, int* last_y, + const WebPIDecoder* idec, int* last_y, uint8_t** u, uint8_t** v, int* width, int* height, int* stride, int* uv_stride); @@ -304,9 +304,7 @@ WEBP_EXTERN(uint8_t*) WebPIDecGetYUV( // Otherwise returns the pointer to the internal representation. This structure // is read-only, tied to WebPIDecoder's lifespan and should not be modified. WEBP_EXTERN(const WebPDecBuffer*) WebPIDecodedArea( - const WebPIDecoder* const idec, - int* const left, int* const top, - int* const width, int* const height); + const WebPIDecoder* idec, int* left, int* top, int* width, int* height); //------------------------------------------------------------------------------ // Advanced decoding parametrization @@ -355,7 +353,7 @@ typedef struct { // Internal, version-checked, entry point WEBP_EXTERN(VP8StatusCode) WebPGetFeaturesInternal( - const uint8_t*, size_t, WebPBitstreamFeatures* const, int); + const uint8_t*, size_t, WebPBitstreamFeatures*, int); // Retrieve features from the bitstream. The *features structure is filled // with information gathered from the bitstream. @@ -363,7 +361,7 @@ WEBP_EXTERN(VP8StatusCode) WebPGetFeaturesInternal( // In case of error, features->bitstream_status will reflect the error code. static WEBP_INLINE VP8StatusCode WebPGetFeatures( const uint8_t* data, size_t data_size, - WebPBitstreamFeatures* const features) { + WebPBitstreamFeatures* features) { return WebPGetFeaturesInternal(data, data_size, features, WEBP_DECODER_ABI_VERSION); } @@ -391,12 +389,12 @@ typedef struct { } WebPDecoderConfig; // Internal, version-checked, entry point -WEBP_EXTERN(int) WebPInitDecoderConfigInternal(WebPDecoderConfig* const, int); +WEBP_EXTERN(int) WebPInitDecoderConfigInternal(WebPDecoderConfig*, int); // Initialize the configuration as empty. This function must always be // called first, unless WebPGetFeatures() is to be called. // Returns false in case of mismatched version. -static WEBP_INLINE int WebPInitDecoderConfig(WebPDecoderConfig* const config) { +static WEBP_INLINE int WebPInitDecoderConfig(WebPDecoderConfig* config) { return WebPInitDecoderConfigInternal(config, WEBP_DECODER_ABI_VERSION); } @@ -410,13 +408,13 @@ static WEBP_INLINE int WebPInitDecoderConfig(WebPDecoderConfig* const config) { // Returns NULL in case of error (and config->status will then reflect // the error condition). WEBP_EXTERN(WebPIDecoder*) WebPIDecode(const uint8_t* data, size_t data_size, - WebPDecoderConfig* const config); + WebPDecoderConfig* config); // Non-incremental version. This version decodes the full data at once, taking // 'config' into account. Return decoding status (VP8_STATUS_OK if decoding // was successful). WEBP_EXTERN(VP8StatusCode) WebPDecode(const uint8_t* data, size_t data_size, - WebPDecoderConfig* const config); + WebPDecoderConfig* config); #if defined(__cplusplus) || defined(c_plusplus) } // extern "C"