gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

WRaster: Improve error messages to provide useful information to user

Browse Source 
The original error messages tended to be a bit sparse, now they try to be
a little bit more helpful, and translatable in user's language.

In xutil.c:122, took opportunity fix a problem because calling 'perror'
after other function which are likely to have changed the errno is likely
to provide a wrong error string.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2021-05-17 16:32:15 +02:00
committed by Carlos R. Mafra
parent e5f7ef23a6
commit bcb53700d6
4 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
wrlib/load_webp.c
View File

@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <webp/decode.h>
@@ -33,6 +34,34 @@
#include "wr_i18n.h"
/*
* webp_message_from_status
*
* return the text message from a VP8 status code
*/
static const char *webp_message_from_status(VP8StatusCode status)
{
static const char *const known_message[] = {
/* Known codes as per libWebP 0.4.1 */
[VP8_STATUS_OUT_OF_MEMORY] = N_("out of memory"),
[VP8_STATUS_INVALID_PARAM] = N_("invalid parameter"),
[VP8_STATUS_BITSTREAM_ERROR] = N_("error in the bitstream"),
[VP8_STATUS_UNSUPPORTED_FEATURE] = N_("feature is not supported"),
[VP8_STATUS_SUSPENDED] = N_("operation suspended"),
[VP8_STATUS_USER_ABORT] = N_("aborted by user"),
[VP8_STATUS_NOT_ENOUGH_DATA] = N_("not enough data")
};
static char custom_message[128];
if (status >= 0 && status < sizeof(known_message) / sizeof(known_message[0]))
if (known_message[status] != NULL)
return known_message[status];
snprintf(custom_message, sizeof(custom_message),
_("unknow status code %d"), status);
return custom_message;
}
RImage *RLoadWEBP(const char *file_name)
{
FILE *file;
@@ -41,6 +70,7 @@ RImage *RLoadWEBP(const char *file_name)
int raw_data_size;
int r;
uint8_t *raw_data;
VP8StatusCode status;
WebPBitstreamFeatures features;
uint8_t *ret = NULL;
@@ -73,7 +103,8 @@ RImage *RLoadWEBP(const char *file_name)
raw_data_size = ftell(file);
if (raw_data_size <= 0) {
fprintf(stderr, "wrlib: Failed to find the WEBP file size for \"%s\"\n", file_name);
fprintf(stderr, _("wrlib: could not get size of WebP file \"%s\", %s\n"),
file_name, strerror(errno));
RErrorCode = RERR_BADIMAGEFILE;
fclose(file);
return NULL;
@@ -97,8 +128,10 @@ RImage *RLoadWEBP(const char *file_name)
return NULL;
}
if (WebPGetFeatures(raw_data, raw_data_size, &features) != VP8_STATUS_OK) {
fprintf(stderr, "wrlib: WebPGetFeatures has failed on \"%s\"\n", file_name);
status = WebPGetFeatures(raw_data, raw_data_size, &features);
if (status != VP8_STATUS_OK) {
fprintf(stderr, _("wrlib: could not get features from WebP file \"%s\", %s\n"),
file_name, webp_message_from_status(status));
RErrorCode = RERR_BADIMAGEFILE;
free(raw_data);
return NULL;