dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/cwebp.c
View File

@ -36,8 +36,7 @@
#include "webp/encode.h" #include "webp/encode.h"
#include "stopwatch.h" #include "stopwatch.h"
extern void* VP8GetCPUInfo; // opaque forward declaration.
extern void* VP8GetCPUInfo;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
src/dec/dsp.c
View File

@ -11,10 +11,6 @@
#include "vp8i.h" #include "vp8i.h"
#if defined(__SSE2__)
#include <emmintrin.h>
#endif
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {
#endif #endif

1
src/dec/vp8.c
View File

@ -327,7 +327,6 @@ int VP8GetHeaders(VP8Decoder* const dec, VP8Io* const io) {
return VP8SetError(dec, VP8_STATUS_BITSTREAM_ERROR, return VP8SetError(dec, VP8_STATUS_BITSTREAM_ERROR,
"cannot parse filter header"); "cannot parse filter header");
} }
status = ParsePartitions(dec, buf, buf_size); status = ParsePartitions(dec, buf, buf_size);
if (status != VP8_STATUS_OK) { if (status != VP8_STATUS_OK) {
return VP8SetError(dec, status, "cannot parse partitions"); return VP8SetError(dec, status, "cannot parse partitions");

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