gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 20:10:29 +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

42
wrlib/load_ppm.c
View File

@@ -47,48 +47,48 @@
* implied warranty.
*/
char pm_getc(FILE * const fileP)
char pm_getc(FILE *const fileP, const char *filename)
{
int ich;
char ch;
ich = getc(fileP);
if (ich == EOF)
fprintf(stderr, "EOF / read error reading a byte\n");
fprintf(stderr, _("wrlib: EOF / read error reading a byte from PPM file \"%s\"\n"), filename);
ch = (char)ich;
if (ch == '#') {
do {
ich = getc(fileP);
if (ich == EOF)
fprintf(stderr, "EOF / read error reading a byte\n");
fprintf(stderr, _("wrlib: EOF / read error reading a byte from PPM file \"%s\"\n"), filename);
ch = (char)ich;
} while (ch != '\n' && ch != '\r');
}
return ch;
}
unsigned char pm_getrawbyte(FILE * const file)
unsigned char pm_getrawbyte(FILE *const file, const char *filename)
{
int iby;
iby = getc(file);
if (iby == EOF)
fprintf(stderr, "EOF / read error reading a one-byte sample\n");
fprintf(stderr, _("wrlib: EOF / read error reading a byte from PPM file \"%s\"\n"), filename);
return (unsigned char)iby;
}
int pm_getuint(FILE * const ifP)
int pm_getuint(FILE *const ifP, const char *filename)
{
char ch;
unsigned int i;
do {
ch = pm_getc(ifP);
ch = pm_getc(ifP, filename);
} while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
if (ch < '0' || ch > '9') {
fprintf(stderr, "junk in file where an unsigned integer should be\n");
fprintf(stderr, _("wrlib: junk in PPM file \"%s\", expected an unsigned integer but got 0x%02X\n"), filename, (int)ch);
return -1;
}
@@ -97,20 +97,20 @@ int pm_getuint(FILE * const ifP)
unsigned int const digitVal = ch - '0';
if (i > INT_MAX / 10) {
fprintf(stderr, "ASCII decimal integer in file is too large to be processed\n");
fprintf(stderr, _("wrlib: ASCII decimal integer in PPM file \"%s\" is too large to be processed\n"), filename);
return -1;
}
i *= 10;
if (i > INT_MAX - digitVal) {
fprintf(stderr, "ASCII decimal integer in file is too large to be processed\n");
fprintf(stderr, _("wrlib: ASCII decimal integer in PPM file \"%s\" is too large to be processed\n"), filename);
return -1;
}
i += digitVal;
ch = pm_getc(ifP);
ch = pm_getc(ifP, filename);
} while (ch >= '0' && ch <= '9');
return i;
@@ -119,7 +119,7 @@ int pm_getuint(FILE * const ifP)
/******************************************************************************************/
/* PGM: support for portable graymap ascii and binary encoding */
static RImage *load_graymap(FILE * file, int w, int h, int max, int raw)
static RImage *load_graymap(FILE *file, int w, int h, int max, int raw, const char *filename)
{
RImage *image;
unsigned char *ptr;
@@ -143,7 +143,7 @@ static RImage *load_graymap(FILE * file, int w, int h, int max, int raw)
for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) {
val = pm_getuint(file);
val = pm_getuint(file, filename);
if (val > max || val < 0) {
RErrorCode = RERR_BADIMAGEFILE;
@@ -189,7 +189,7 @@ static RImage *load_graymap(FILE * file, int w, int h, int max, int raw)
}
/* PPM: support for portable pixmap ascii and binary encoding */
static RImage *load_pixmap(FILE * file, int w, int h, int max, int raw)
static RImage *load_pixmap(FILE *file, int w, int h, int max, int raw, const char *filename)
{
RImage *image;
int i;
@@ -214,7 +214,7 @@ static RImage *load_pixmap(FILE * file, int w, int h, int max, int raw)
for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) {
for (i = 0; i < 3; i++) {
val = pm_getuint(file);
val = pm_getuint(file, filename);
if (val > max || val < 0) {
RErrorCode = RERR_BADIMAGEFILE;
@@ -249,7 +249,7 @@ static RImage *load_pixmap(FILE * file, int w, int h, int max, int raw)
}
/* PBM: support for portable bitmap ascii and binary encoding */
static RImage *load_bitmap(FILE * file, int w, int h, int max, int raw)
static RImage *load_bitmap(FILE *file, int w, int h, int max, int raw, const char *filename)
{
RImage *image;
int val;
@@ -271,7 +271,7 @@ static RImage *load_bitmap(FILE * file, int w, int h, int max, int raw)
int i = 0;
while (i < w * h) {
val = pm_getuint(file);
val = pm_getuint(file, filename);
if (val > max || val < 0) {
RErrorCode = RERR_BADIMAGEFILE;
@@ -295,7 +295,7 @@ static RImage *load_bitmap(FILE * file, int w, int h, int max, int raw)
bitshift = -1;
for (x = 0; x < w; x++) {
if (bitshift == -1) {
buf = pm_getrawbyte(file);
buf = pm_getrawbyte(file, filename);
bitshift = 7;
}
val = (buf >> bitshift) & 1;
@@ -380,13 +380,13 @@ RImage *RLoadPPM(const char *file_name)
if (type == '1' || type == '4') {
/* Portable Bit Map: P1 is for 'plain' (ascii, rare), P4 for 'regular' (binary) */
image = load_bitmap(file, w, h, m, type);
image = load_bitmap(file, w, h, m, type, file_name);
} else if (type == '2' || type == '5') {
/* Portable Gray Map: P2 is for 'plain' (ascii, rare), P5 for 'regular' (binary) */
image = load_graymap(file, w, h, m, type);
image = load_graymap(file, w, h, m, type, file_name);
} else if (type == '3' || type == '6') {
/* Portable Pix Map: P3 is for 'plain' (ascii, rare), P6 for 'regular' (binary) */
image = load_pixmap(file, w, h, m, type);
image = load_pixmap(file, w, h, m, type, file_name);
}
fclose(file);