mirror of
https://github.com/webmproject/libwebp.git
synced 2024-12-27 22:28:22 +01:00
mux: add some missing casts
+ fix a return value + fix a param type Change-Id: I8bb7a4dc4c76b11140f8693c909aeb10f660e6e5
This commit is contained in:
parent
617d93480e
commit
05aacf77c2
@ -414,7 +414,7 @@ static WebPMuxError GetImageInfo(const WebPMuxImage* const wpi,
|
|||||||
// Get width and height from VP8/VP8L chunk.
|
// Get width and height from VP8/VP8L chunk.
|
||||||
if (width != NULL) *width = wpi->width_;
|
if (width != NULL) *width = wpi->width_;
|
||||||
if (height != NULL) *height = wpi->height_;
|
if (height != NULL) *height = wpi->height_;
|
||||||
return 1;
|
return WEBP_MUX_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static WebPMuxError GetImageCanvasWidthHeight(
|
static WebPMuxError GetImageCanvasWidthHeight(
|
||||||
|
@ -70,7 +70,7 @@ WebPChunk* ChunkRelease(WebPChunk* const chunk) {
|
|||||||
CHUNK_INDEX ChunkGetIndexFromTag(uint32_t tag) {
|
CHUNK_INDEX ChunkGetIndexFromTag(uint32_t tag) {
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; kChunks[i].tag != NIL_TAG; ++i) {
|
for (i = 0; kChunks[i].tag != NIL_TAG; ++i) {
|
||||||
if (tag == kChunks[i].tag) return i;
|
if (tag == kChunks[i].tag) return (CHUNK_INDEX)i;
|
||||||
}
|
}
|
||||||
return IDX_UNKNOWN;
|
return IDX_UNKNOWN;
|
||||||
}
|
}
|
||||||
@ -451,7 +451,7 @@ static int IsNotCompatible(int feature, int num_items) {
|
|||||||
// On success returns WEBP_MUX_OK and stores the chunk count in *num.
|
// On success returns WEBP_MUX_OK and stores the chunk count in *num.
|
||||||
static WebPMuxError ValidateChunk(const WebPMux* const mux, CHUNK_INDEX idx,
|
static WebPMuxError ValidateChunk(const WebPMux* const mux, CHUNK_INDEX idx,
|
||||||
WebPFeatureFlags feature,
|
WebPFeatureFlags feature,
|
||||||
WebPFeatureFlags vp8x_flags,
|
uint32_t vp8x_flags,
|
||||||
int max, int* num) {
|
int max, int* num) {
|
||||||
const WebPMuxError err =
|
const WebPMuxError err =
|
||||||
WebPMuxNumChunks(mux, kChunks[idx].id, num);
|
WebPMuxNumChunks(mux, kChunks[idx].id, num);
|
||||||
|
@ -505,7 +505,7 @@ WebPMuxError WebPMuxGetAnimationParams(const WebPMux* mux,
|
|||||||
static CHUNK_INDEX ChunkGetIndexFromId(WebPChunkId id) {
|
static CHUNK_INDEX ChunkGetIndexFromId(WebPChunkId id) {
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; kChunks[i].id != WEBP_CHUNK_NIL; ++i) {
|
for (i = 0; kChunks[i].id != WEBP_CHUNK_NIL; ++i) {
|
||||||
if (id == kChunks[i].id) return i;
|
if (id == kChunks[i].id) return (CHUNK_INDEX)i;
|
||||||
}
|
}
|
||||||
return IDX_NIL;
|
return IDX_NIL;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user