dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-04 16:06:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

decode.h: remove '* const' from function parameters

Browse Source 
makes the public interface consistent and more readable

Change-Id: I067eb5ecc1094216ef6aecc65f636f69873de8f9
This commit is contained in:
James Zern 2012-07-17 15:01:30 -07:00
parent 9ff00cae72
commit 9838e5d5ff
4 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dec/buffer.c
View File

@ -166,14 +166,14 @@ VP8StatusCode WebPAllocateDecBuffer(int w, int h,
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// constructors / destructors // 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 (version != WEBP_DECODER_ABI_VERSION) return 0; // version mismatch
if (buffer == NULL) return 0; if (buffer == NULL) return 0;
memset(buffer, 0, sizeof(*buffer)); memset(buffer, 0, sizeof(*buffer));
return 1; return 1;
} }
void WebPFreeDecBuffer(WebPDecBuffer* const buffer) { void WebPFreeDecBuffer(WebPDecBuffer* buffer) {
if (buffer != NULL) { if (buffer != NULL) {
if (!buffer->is_external_memory) if (!buffer->is_external_memory)
free(buffer->private_memory); free(buffer->private_memory);

24
src/dec/idec.c
View File

@ -533,7 +533,7 @@ static VP8StatusCode IDecode(WebPIDecoder* idec) {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Public functions // Public functions
WebPIDecoder* WebPINewDecoder(WebPDecBuffer* const output_buffer) { WebPIDecoder* WebPINewDecoder(WebPDecBuffer* output_buffer) {
WebPIDecoder* idec = (WebPIDecoder*)calloc(1, sizeof(WebPIDecoder)); WebPIDecoder* idec = (WebPIDecoder*)calloc(1, sizeof(WebPIDecoder));
if (idec == NULL) { if (idec == NULL) {
return NULL; return NULL;
@ -554,7 +554,7 @@ WebPIDecoder* WebPINewDecoder(WebPDecBuffer* const output_buffer) {
} }
WebPIDecoder* WebPIDecode(const uint8_t* data, size_t data_size, WebPIDecoder* WebPIDecode(const uint8_t* data, size_t data_size,
WebPDecoderConfig* const config) { WebPDecoderConfig* config) {
WebPIDecoder* idec; WebPIDecoder* idec;
// Parse the bitstream's features, if requested: // Parse the bitstream's features, if requested:
@ -575,7 +575,7 @@ WebPIDecoder* WebPIDecode(const uint8_t* data, size_t data_size,
return idec; return idec;
} }
void WebPIDelete(WebPIDecoder* const idec) { void WebPIDelete(WebPIDecoder* idec) {
if (idec == NULL) return; if (idec == NULL) return;
if (idec->dec_ != NULL) { if (idec->dec_ != NULL) {
if (!idec->is_lossless_) { if (!idec->is_lossless_) {
@ -638,8 +638,8 @@ static VP8StatusCode IDecCheckStatus(const WebPIDecoder* const idec) {
return VP8_STATUS_SUSPENDED; return VP8_STATUS_SUSPENDED;
} }
VP8StatusCode WebPIAppend(WebPIDecoder* const idec, VP8StatusCode WebPIAppend(WebPIDecoder* idec,
const uint8_t* const data, size_t data_size) { const uint8_t* data, size_t data_size) {
VP8StatusCode status; VP8StatusCode status;
if (idec == NULL || data == NULL) { if (idec == NULL || data == NULL) {
return VP8_STATUS_INVALID_PARAM; return VP8_STATUS_INVALID_PARAM;
@ -659,8 +659,8 @@ VP8StatusCode WebPIAppend(WebPIDecoder* const idec,
return IDecode(idec); return IDecode(idec);
} }
VP8StatusCode WebPIUpdate(WebPIDecoder* const idec, VP8StatusCode WebPIUpdate(WebPIDecoder* idec,
const uint8_t* const data, size_t data_size) { const uint8_t* data, size_t data_size) {
VP8StatusCode status; VP8StatusCode status;
if (idec == NULL || data == NULL) { if (idec == NULL || data == NULL) {
return VP8_STATUS_INVALID_PARAM; return VP8_STATUS_INVALID_PARAM;
@ -692,9 +692,9 @@ static const WebPDecBuffer* GetOutputBuffer(const WebPIDecoder* const idec) {
return idec->params_.output; return idec->params_.output;
} }
const WebPDecBuffer* WebPIDecodedArea(const WebPIDecoder* const idec, const WebPDecBuffer* WebPIDecodedArea(const WebPIDecoder* idec,
int* const left, int* const top, int* left, int* top,
int* const width, int* const height) { int* width, int* height) {
const WebPDecBuffer* const src = GetOutputBuffer(idec); const WebPDecBuffer* const src = GetOutputBuffer(idec);
if (left) *left = 0; if (left) *left = 0;
if (top) *top = 0; if (top) *top = 0;
@ -709,7 +709,7 @@ const WebPDecBuffer* WebPIDecodedArea(const WebPIDecoder* const idec,
return src; 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) { int* width, int* height, int* stride) {
const WebPDecBuffer* const src = GetOutputBuffer(idec); const WebPDecBuffer* const src = GetOutputBuffer(idec);
if (!src) return NULL; if (!src) return NULL;
@ -725,7 +725,7 @@ uint8_t* WebPIDecGetRGB(const WebPIDecoder* const idec, int* last_y,
return src->u.RGBA.rgba; 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, uint8_t** u, uint8_t** v,
int* width, int* height, int *stride, int* uv_stride) { int* width, int* height, int *stride, int* uv_stride) {
const WebPDecBuffer* const src = GetOutputBuffer(idec); const WebPDecBuffer* const src = GetOutputBuffer(idec);

6
src/dec/webp.c
View File

@ -649,7 +649,7 @@ int WebPGetInfo(const uint8_t* data, size_t data_size,
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Advance decoding API // Advance decoding API
int WebPInitDecoderConfigInternal(WebPDecoderConfig* const config, int WebPInitDecoderConfigInternal(WebPDecoderConfig* config,
int version) { int version) {
if (version != WEBP_DECODER_ABI_VERSION) { if (version != WEBP_DECODER_ABI_VERSION) {
return 0; // version mismatch return 0; // version mismatch
@ -664,7 +664,7 @@ int WebPInitDecoderConfigInternal(WebPDecoderConfig* const config,
} }
VP8StatusCode WebPGetFeaturesInternal(const uint8_t* data, size_t data_size, VP8StatusCode WebPGetFeaturesInternal(const uint8_t* data, size_t data_size,
WebPBitstreamFeatures* const features, WebPBitstreamFeatures* features,
int version) { int version) {
VP8StatusCode status; VP8StatusCode status;
if (version != WEBP_DECODER_ABI_VERSION) { 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, VP8StatusCode WebPDecode(const uint8_t* data, size_t data_size,
WebPDecoderConfig* const config) { WebPDecoderConfig* config) {
WebPDecParams params; WebPDecParams params;
VP8StatusCode status; VP8StatusCode status;

34
src/webp/decode.h
View File

@ -179,17 +179,17 @@ typedef struct {
} WebPDecBuffer; } WebPDecBuffer;
// Internal, version-checked, entry point // 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. // Initialize the structure as empty. Must be called before any other use.
// Returns false in case of version mismatch // 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); return WebPInitDecBufferInternal(buffer, WEBP_DECODER_ABI_VERSION);
} }
// Free any memory associated with the buffer. Must always be called last. // Free any memory associated with the buffer. Must always be called last.
// Note: doesn't free the 'buffer' structure itself. // 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 // 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 // is kept, which means that the lifespan of 'output_buffer' must be larger than
// that of the returned WebPIDecoder object. // that of the returned WebPIDecoder object.
// Returns NULL if the allocation failed. // 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 // This function allocates and initializes an incremental-decoder object, which
// will output the r/g/b(/a) samples specified by 'mode' into a preallocated // 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 // Deletes the WebPIDecoder object and associated memory. Must always be called
// if WebPINewDecoder, WebPINewRGB or WebPINewYUV succeeded. // 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 // Copies and decodes the next available data. Returns VP8_STATUS_OK when
// the image is successfully decoded. Returns VP8_STATUS_SUSPENDED when more // the image is successfully decoded. Returns VP8_STATUS_SUSPENDED when more
// data is expected. Returns error in other cases. // data is expected. Returns error in other cases.
WEBP_EXTERN(VP8StatusCode) WebPIAppend( 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 // 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 // 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 // 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. // WebPIUpdate, for instance when the data buffer is resized to fit larger data.
WEBP_EXTERN(VP8StatusCode) WebPIUpdate( 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 // 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 // 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 // (*last_y, *width etc.) can be NULL if corresponding information is not
// needed. // needed.
WEBP_EXTERN(uint8_t*) WebPIDecGetRGB( WEBP_EXTERN(uint8_t*) WebPIDecGetRGB(
const WebPIDecoder* const idec, int* last_y, const WebPIDecoder* idec, int* last_y,
int* width, int* height, int* stride); int* width, int* height, int* stride);
// Same as above function to get YUV image. Returns pointer to the luma plane // Same as above function to get YUV image. Returns pointer to the luma plane
// or NULL in case of error. // or NULL in case of error.
WEBP_EXTERN(uint8_t*) WebPIDecGetYUV( WEBP_EXTERN(uint8_t*) WebPIDecGetYUV(
const WebPIDecoder* const idec, int* last_y, const WebPIDecoder* idec, int* last_y,
uint8_t** u, uint8_t** v, uint8_t** u, uint8_t** v,
int* width, int* height, int* stride, int* uv_stride); 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 // Otherwise returns the pointer to the internal representation. This structure
// is read-only, tied to WebPIDecoder's lifespan and should not be modified. // is read-only, tied to WebPIDecoder's lifespan and should not be modified.
WEBP_EXTERN(const WebPDecBuffer*) WebPIDecodedArea( WEBP_EXTERN(const WebPDecBuffer*) WebPIDecodedArea(
const WebPIDecoder* const idec, const WebPIDecoder* idec, int* left, int* top, int* width, int* height);
int* const left, int* const top,
int* const width, int* const height);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Advanced decoding parametrization // Advanced decoding parametrization
@ -355,7 +353,7 @@ typedef struct {
// Internal, version-checked, entry point // Internal, version-checked, entry point
WEBP_EXTERN(VP8StatusCode) WebPGetFeaturesInternal( 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 // Retrieve features from the bitstream. The *features structure is filled
// with information gathered from the bitstream. // 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. // In case of error, features->bitstream_status will reflect the error code.
static WEBP_INLINE VP8StatusCode WebPGetFeatures( static WEBP_INLINE VP8StatusCode WebPGetFeatures(
const uint8_t* data, size_t data_size, const uint8_t* data, size_t data_size,
WebPBitstreamFeatures* const features) { WebPBitstreamFeatures* features) {
return WebPGetFeaturesInternal(data, data_size, features, return WebPGetFeaturesInternal(data, data_size, features,
WEBP_DECODER_ABI_VERSION); WEBP_DECODER_ABI_VERSION);
} }
@ -391,12 +389,12 @@ typedef struct {
} WebPDecoderConfig; } WebPDecoderConfig;
// Internal, version-checked, entry point // 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 // Initialize the configuration as empty. This function must always be
// called first, unless WebPGetFeatures() is to be called. // called first, unless WebPGetFeatures() is to be called.
// Returns false in case of mismatched version. // 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); 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 // Returns NULL in case of error (and config->status will then reflect
// the error condition). // the error condition).
WEBP_EXTERN(WebPIDecoder*) WebPIDecode(const uint8_t* data, size_t data_size, 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 // Non-incremental version. This version decodes the full data at once, taking
// 'config' into account. Return decoding status (VP8_STATUS_OK if decoding // 'config' into account. Return decoding status (VP8_STATUS_OK if decoding
// was successful). // was successful).
WEBP_EXTERN(VP8StatusCode) WebPDecode(const uint8_t* data, size_t data_size, WEBP_EXTERN(VP8StatusCode) WebPDecode(const uint8_t* data, size_t data_size,
WebPDecoderConfig* const config); WebPDecoderConfig* config);
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} // extern "C" } // extern "C"