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

load_jpeg.c Removed goto

Browse Source 
This patch removes the goto call. I copied the code after the bye: label and
I paste it in the goto-calls.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
This commit is contained in:
Rodolfo García Peñas (kix)
2019-06-20 00:40:08 +02:00
committed by Carlos R. Mafra
parent de09ac5dad
commit a2cc89dd3d
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wrlib/load_jpeg.c
View File

@@ -134,14 +134,24 @@ RImage *RLoadJPEG(const char *file_name)
if (cinfo.image_width < 1 || cinfo.image_height < 1) { if (cinfo.image_width < 1 || cinfo.image_height < 1) {
buffer[0] = NULL; /* Initialize pointer to avoid spurious free in cleanup code */ buffer[0] = NULL; /* Initialize pointer to avoid spurious free in cleanup code */
RErrorCode = RERR_BADIMAGEFILE; RErrorCode = RERR_BADIMAGEFILE;
goto bye; jpeg_destroy_decompress(&cinfo);
fclose(file);
if (buffer[0])
free(buffer[0]);
return image;
} }
buffer[0] = (JSAMPROW) malloc(cinfo.image_width * cinfo.num_components); buffer[0] = (JSAMPROW) malloc(cinfo.image_width * cinfo.num_components);
if (!buffer[0]) { if (!buffer[0]) {
RErrorCode = RERR_NOMEMORY; RErrorCode = RERR_NOMEMORY;
goto bye; jpeg_destroy_decompress(&cinfo);
fclose(file);
if (buffer[0])
free(buffer[0]);
return image;
} }
if (cinfo.jpeg_color_space == JCS_GRAYSCALE) { if (cinfo.jpeg_color_space == JCS_GRAYSCALE) {
@@ -157,7 +167,12 @@ RImage *RLoadJPEG(const char *file_name)
if (!image) { if (!image) {
RErrorCode = RERR_NOMEMORY; RErrorCode = RERR_NOMEMORY;
goto bye; jpeg_destroy_decompress(&cinfo);
fclose(file);
if (buffer[0])
free(buffer[0]);
return image;
} }
jpeg_start_decompress(&cinfo); jpeg_start_decompress(&cinfo);
@@ -183,12 +198,8 @@ RImage *RLoadJPEG(const char *file_name)
} }
jpeg_finish_decompress(&cinfo); jpeg_finish_decompress(&cinfo);
bye:
jpeg_destroy_decompress(&cinfo); jpeg_destroy_decompress(&cinfo);
fclose(file); fclose(file);
if (buffer[0]) if (buffer[0])
free(buffer[0]); free(buffer[0]);