dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

webpmux: DisplayInfo(): remove unnecessary error checks.

Browse Source 
As WebPMuxCreate() would have succeeded by then, many of the calls
cannot fail.

Change-Id: I3220c59e9aa47c948da9f8741b4098c47b91a8fc
This commit is contained in:
Urvang Joshi 2013-09-18 11:44:24 -07:00
parent 40ae3520b1
commit 54b8e3f6e2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/webpmux.c
View File

@ -146,12 +146,6 @@ static const char* ErrorString(WebPMuxError err) {
return err; \ return err; \
} }
#define RETURN_IF_ERROR2(ERR_MSG, FORMAT_STR) \
if (err != WEBP_MUX_OK) { \
fprintf(stderr, ERR_MSG, FORMAT_STR); \
return err; \
}
#define RETURN_IF_ERROR3(ERR_MSG, FORMAT_STR1, FORMAT_STR2) \ #define RETURN_IF_ERROR3(ERR_MSG, FORMAT_STR1, FORMAT_STR2) \
if (err != WEBP_MUX_OK) { \ if (err != WEBP_MUX_OK) { \
fprintf(stderr, ERR_MSG, FORMAT_STR1, FORMAT_STR2); \ fprintf(stderr, ERR_MSG, FORMAT_STR1, FORMAT_STR2); \
@ -184,7 +178,7 @@ static WebPMuxError DisplayInfo(const WebPMux* mux) {
uint32_t flag; uint32_t flag;
WebPMuxError err = WebPMuxGetCanvasSize(mux, &width, &height); WebPMuxError err = WebPMuxGetCanvasSize(mux, &width, &height);
RETURN_IF_ERROR("Failed to retrieve canvas width/height.\n"); assert(err == WEBP_MUX_OK); // As WebPMuxCreate() was successful earlier.
printf("Canvas size: %d x %d\n", width, height); printf("Canvas size: %d x %d\n", width, height);
err = WebPMuxGetFeatures(mux, &flag); err = WebPMuxGetFeatures(mux, &flag);
@ -217,13 +211,13 @@ static WebPMuxError DisplayInfo(const WebPMux* mux) {
if (is_anim) { if (is_anim) {
WebPMuxAnimParams params; WebPMuxAnimParams params;
err = WebPMuxGetAnimationParams(mux, &params); err = WebPMuxGetAnimationParams(mux, &params);
RETURN_IF_ERROR("Failed to retrieve animation parameters\n"); assert(err == WEBP_MUX_OK);
printf("Background color : 0x%.8X Loop Count : %d\n", printf("Background color : 0x%.8X Loop Count : %d\n",
params.bgcolor, params.loop_count); params.bgcolor, params.loop_count);
} }
err = WebPMuxNumChunks(mux, id, &nFrames); err = WebPMuxNumChunks(mux, id, &nFrames);
RETURN_IF_ERROR2("Failed to retrieve number of %ss\n", type_str); assert(err == WEBP_MUX_OK);
printf("Number of %ss: %d\n", type_str, nFrames); printf("Number of %ss: %d\n", type_str, nFrames);
if (nFrames > 0) { if (nFrames > 0) {
@ -262,21 +256,21 @@ static WebPMuxError DisplayInfo(const WebPMux* mux) {
if (flag & ICCP_FLAG) { if (flag & ICCP_FLAG) {
WebPData icc_profile; WebPData icc_profile;
err = WebPMuxGetChunk(mux, "ICCP", &icc_profile); err = WebPMuxGetChunk(mux, "ICCP", &icc_profile);
RETURN_IF_ERROR("Failed to retrieve the ICC profile\n"); assert(err == WEBP_MUX_OK);
printf("Size of the ICC profile data: %d\n", (int)icc_profile.size); printf("Size of the ICC profile data: %d\n", (int)icc_profile.size);
} }
if (flag & EXIF_FLAG) { if (flag & EXIF_FLAG) {
WebPData exif; WebPData exif;
err = WebPMuxGetChunk(mux, "EXIF", &exif); err = WebPMuxGetChunk(mux, "EXIF", &exif);
RETURN_IF_ERROR("Failed to retrieve the EXIF metadata\n"); assert(err == WEBP_MUX_OK);
printf("Size of the EXIF metadata: %d\n", (int)exif.size); printf("Size of the EXIF metadata: %d\n", (int)exif.size);
} }
if (flag & XMP_FLAG) { if (flag & XMP_FLAG) {
WebPData xmp; WebPData xmp;
err = WebPMuxGetChunk(mux, "XMP ", &xmp); err = WebPMuxGetChunk(mux, "XMP ", &xmp);
RETURN_IF_ERROR("Failed to retrieve the XMP metadata\n"); assert(err == WEBP_MUX_OK);
printf("Size of the XMP metadata: %d\n", (int)xmp.size); printf("Size of the XMP metadata: %d\n", (int)xmp.size);
} }