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

webpmux returns error strings rather than numbers

Browse Source 
Change-Id: Ifc8d8aaf0f6c03ecb1508ec7fbc34c918bf69c61
This commit is contained in:
Urvang Joshi 2012-06-27 16:55:01 +05:30
parent fcec059322
commit d11f6fcc82
1 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
examples/webpmux.c
View File

@ -116,6 +116,17 @@ static int CountOccurrences(const char* arglist[], int list_length,
return num_occurences; return num_occurences;
} }
static const char* const kErrorMessages[] = {
"WEBP_MUX_ERROR", "WEBP_MUX_NOT_FOUND", "WEBP_MUX_INVALID_ARGUMENT",
"WEBP_MUX_INVALID_PARAMETER", "WEBP_MUX_BAD_DATA", "WEBP_MUX_MEMORY_ERROR",
"WEBP_MUX_NOT_ENOUGH_DATA"
};
static const char* ErrorString(WebPMuxError err) {
assert(err <= WEBP_MUX_ERROR && err >= WEBP_MUX_NOT_ENOUGH_DATA);
return kErrorMessages[-err];
}
static int IsNotCompatible(int count1, int count2) { static int IsNotCompatible(int count1, int count2) {
return (count1 > 0) != (count2 > 0); return (count1 > 0) != (count2 > 0);
} }
@ -337,7 +348,7 @@ static int WriteWebP(WebPMux* const mux, const char* filename) {
WebPData webp_data; WebPData webp_data;
const WebPMuxError err = WebPMuxAssemble(mux, &webp_data); const WebPMuxError err = WebPMuxAssemble(mux, &webp_data);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
fprintf(stderr, "Error (%d) assembling the WebP file.\n", err); fprintf(stderr, "Error (%s) assembling the WebP file.\n", ErrorString(err));
return 0; return 0;
} }
ok = WriteData(filename, &webp_data); ok = WriteData(filename, &webp_data);
@ -696,24 +707,27 @@ static int GetFrameTile(const WebPMux* mux,
err = WebPMuxGetFrame(mux, num, &bitstream, err = WebPMuxGetFrame(mux, num, &bitstream,
&x_offset, &y_offset, &duration); &x_offset, &y_offset, &duration);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO3("ERROR#%d: Could not get frame %ld.\n", err, num, ErrGet); ERROR_GOTO3("ERROR (%s): Could not get frame %ld.\n",
ErrorString(err), num, ErrGet);
} }
} else { } else {
err = WebPMuxGetTile(mux, num, &bitstream, &x_offset, &y_offset); err = WebPMuxGetTile(mux, num, &bitstream, &x_offset, &y_offset);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO3("ERROR#%d: Could not get frame %ld.\n", err, num, ErrGet); ERROR_GOTO3("ERROR (%s): Could not get frame %ld.\n",
ErrorString(err), num, ErrGet);
} }
} }
mux_single = WebPMuxNew(); mux_single = WebPMuxNew();
if (mux_single == NULL) { if (mux_single == NULL) {
err = WEBP_MUX_MEMORY_ERROR; err = WEBP_MUX_MEMORY_ERROR;
ERROR_GOTO2("ERROR#%d: Could not allocate a mux object.\n", err, ErrGet); ERROR_GOTO2("ERROR (%s): Could not allocate a mux object.\n",
ErrorString(err), ErrGet);
} }
err = WebPMuxSetImage(mux_single, &bitstream, 1); err = WebPMuxSetImage(mux_single, &bitstream, 1);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not create single image mux object.\n", err, ERROR_GOTO2("ERROR (%s): Could not create single image mux object.\n",
ErrGet); ErrorString(err), ErrGet);
} }
ok = WriteWebP(mux_single, config->output_); ok = WriteWebP(mux_single, config->output_);
@ -750,14 +764,16 @@ static int Process(const WebPMuxConfig* config) {
case FEATURE_ICCP: case FEATURE_ICCP:
err = WebPMuxGetColorProfile(mux, &webpdata); err = WebPMuxGetColorProfile(mux, &webpdata);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not get color profile.\n", err, Err2); ERROR_GOTO2("ERROR (%s): Could not get color profile.\n",
ErrorString(err), Err2);
} }
ok = WriteData(config->output_, &webpdata); ok = WriteData(config->output_, &webpdata);
break; break;
case FEATURE_XMP: case FEATURE_XMP:
err = WebPMuxGetMetadata(mux, &webpdata); err = WebPMuxGetMetadata(mux, &webpdata);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not get XMP metadata.\n", err, Err2); ERROR_GOTO2("ERROR (%s): Could not get XMP metadata.\n",
ErrorString(err), Err2);
} }
ok = WriteData(config->output_, &webpdata); ok = WriteData(config->output_, &webpdata);
break; break;
@ -773,8 +789,8 @@ static int Process(const WebPMuxConfig* config) {
case FEATURE_FRM: case FEATURE_FRM:
mux = WebPMuxNew(); mux = WebPMuxNew();
if (mux == NULL) { if (mux == NULL) {
ERROR_GOTO2("ERROR#%d: Could not allocate a mux object.\n", ERROR_GOTO2("ERROR (%s): Could not allocate a mux object.\n",
WEBP_MUX_MEMORY_ERROR, Err2); ErrorString(WEBP_MUX_MEMORY_ERROR), Err2);
} }
for (index = 0; index < feature->arg_count_; ++index) { for (index = 0; index < feature->arg_count_; ++index) {
if (feature->args_[index].subtype_ == SUBTYPE_LOOP) { if (feature->args_[index].subtype_ == SUBTYPE_LOOP) {
@ -784,7 +800,8 @@ static int Process(const WebPMuxConfig* config) {
} }
err = WebPMuxSetLoopCount(mux, num); err = WebPMuxSetLoopCount(mux, num);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not set loop count.\n", err, Err2); ERROR_GOTO2("ERROR (%s): Could not set loop count.\n",
ErrorString(err), Err2);
} }
} else if (feature->args_[index].subtype_ == SUBTYPE_FRM) { } else if (feature->args_[index].subtype_ == SUBTYPE_FRM) {
uint32_t duration; uint32_t duration;
@ -801,8 +818,8 @@ static int Process(const WebPMuxConfig* config) {
duration, 1); duration, 1);
WebPDataClear(&webpdata); WebPDataClear(&webpdata);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO3("ERROR#%d: Could not add a frame at index %d.\n", ERROR_GOTO3("ERROR (%s): Could not add a frame at index %d.\n",
err, index, Err2); ErrorString(err), index, Err2);
} }
} else { } else {
ERROR_GOTO1("ERROR: Invalid subtype for 'frame'", Err2); ERROR_GOTO1("ERROR: Invalid subtype for 'frame'", Err2);
@ -813,8 +830,8 @@ static int Process(const WebPMuxConfig* config) {
case FEATURE_TILE: case FEATURE_TILE:
mux = WebPMuxNew(); mux = WebPMuxNew();
if (mux == NULL) { if (mux == NULL) {
ERROR_GOTO2("ERROR#%d: Could not allocate a mux object.\n", ERROR_GOTO2("ERROR (%s): Could not allocate a mux object.\n",
WEBP_MUX_MEMORY_ERROR, Err2); ErrorString(WEBP_MUX_MEMORY_ERROR), Err2);
} }
for (index = 0; index < feature->arg_count_; ++index) { for (index = 0; index < feature->arg_count_; ++index) {
ok = ReadFileToWebPData(feature->args_[index].filename_, &webpdata); ok = ReadFileToWebPData(feature->args_[index].filename_, &webpdata);
@ -828,8 +845,8 @@ static int Process(const WebPMuxConfig* config) {
err = WebPMuxPushTile(mux, &webpdata, x_offset, y_offset, 1); err = WebPMuxPushTile(mux, &webpdata, x_offset, y_offset, 1);
WebPDataClear(&webpdata); WebPDataClear(&webpdata);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO3("ERROR#%d: Could not add a tile at index %d.\n", ERROR_GOTO3("ERROR (%s): Could not add a tile at index %d.\n",
err, index, Err2); ErrorString(err), index, Err2);
} }
} }
break; break;
@ -842,7 +859,8 @@ static int Process(const WebPMuxConfig* config) {
err = WebPMuxSetColorProfile(mux, &color_profile, 1); err = WebPMuxSetColorProfile(mux, &color_profile, 1);
free((void*)color_profile.bytes_); free((void*)color_profile.bytes_);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not set color profile.\n", err, Err2); ERROR_GOTO2("ERROR (%s): Could not set color profile.\n",
ErrorString(err), Err2);
} }
break; break;
@ -854,7 +872,8 @@ static int Process(const WebPMuxConfig* config) {
err = WebPMuxSetMetadata(mux, &metadata, 1); err = WebPMuxSetMetadata(mux, &metadata, 1);
free((void*)metadata.bytes_); free((void*)metadata.bytes_);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not set XMP metadata.\n", err, Err2); ERROR_GOTO2("ERROR (%s): Could not set XMP metadata.\n",
ErrorString(err), Err2);
} }
break; break;
@ -872,15 +891,15 @@ static int Process(const WebPMuxConfig* config) {
case FEATURE_ICCP: case FEATURE_ICCP:
err = WebPMuxDeleteColorProfile(mux); err = WebPMuxDeleteColorProfile(mux);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not delete color profile.\n", err, ERROR_GOTO2("ERROR (%s): Could not delete color profile.\n",
Err2); ErrorString(err), Err2);
} }
break; break;
case FEATURE_XMP: case FEATURE_XMP:
err = WebPMuxDeleteMetadata(mux); err = WebPMuxDeleteMetadata(mux);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO2("ERROR#%d: Could not delete XMP metadata.\n", err, ERROR_GOTO2("ERROR (%s): Could not delete XMP metadata.\n",
Err2); ErrorString(err), Err2);
} }
break; break;
default: default: