dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-17 14:29:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge problems

Browse Source 
Change-Id: I6d0763734139d2852896872c80c5e7fa7889945a
This commit is contained in:
Pascal Massimino
2011-04-26 11:02:38 -07:00
parent 8fd42b3a81
commit f7d9e261c5
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/webp/decode.h
View File

@ -178,10 +178,11 @@ VP8StatusCode WebPIAppend(WebPIDecoder* const idec, const uint8_t* data,
VP8StatusCode WebPIUpdate(WebPIDecoder* const idec, const uint8_t* data,
uint32_t data_size);
// Returns the RGB image decoded so far. Returns NULL if output params are not
// initialized yet. *last_y is the index of last decoded row in raster scan
// order. Some pointers (*last_y, *width etc.) can be NULL if corresponding
// information is not needed.
// 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
// specified in WebPINew()/WebPINewRGB(). *last_y is the index of last decoded
// row in raster scan order. Some pointers (*last_y, *width etc.) can be NULL if
// corresponding information is not needed.
uint8_t* WebPIDecGetRGB(const WebPIDecoder* const idec, int *last_y,
int* width, int* height, int* stride);