ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-23 20:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix error handling in RE_SaveJPGToBuffer().

Browse source
This commit is contained in:
SmileTheory 2015-12-21 01:05:55 -08:00
parent d8fd07b69a
commit e25035672d
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/renderercommon/tr_image_jpg.c
View file

@ -61,7 +61,7 @@ static void R_JPGErrorExit(j_common_ptr cinfo)
(*cinfo->err->format_message) (cinfo, buffer); (*cinfo->err->format_message) (cinfo, buffer);
ri.Printf(PRINT_ALL, "R_LoadJPG() error: %s", buffer); ri.Printf(PRINT_ALL, "Error: %s", buffer);
/* Return control to the setjmp point */ /* Return control to the setjmp point */
longjmp(jerr->setjmp_buffer, 1); longjmp(jerr->setjmp_buffer, 1);
@ -142,7 +142,7 @@ void R_LoadJPG(const char *filename, unsigned char **pic, int *width, int *heigh
ri.FS_FreeFile(fbuffer.v); ri.FS_FreeFile(fbuffer.v);
/* Append the filename to the error for easier debugging */ /* Append the filename to the error for easier debugging */
ri.Printf(PRINT_ALL, ", file %s\n", filename); ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
return; return;
} }
@ -388,17 +388,29 @@ size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, int quality,
int image_width, int image_height, byte *image_buffer, int padding) int image_width, int image_height, byte *image_buffer, int padding)
{ {
struct jpeg_compress_struct cinfo; struct jpeg_compress_struct cinfo;
struct jpeg_error_mgr jerr; q_jpeg_error_mgr_t jerr;
JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
my_dest_ptr dest; my_dest_ptr dest;
int row_stride; /* physical row width in image buffer */ int row_stride; /* physical row width in image buffer */
size_t outcount; size_t outcount;
/* Step 1: allocate and initialize JPEG compression object */ /* Step 1: allocate and initialize JPEG compression object */
cinfo.err = jpeg_std_error(&jerr); cinfo.err = jpeg_std_error(&jerr.pub);
cinfo.err->error_exit = R_JPGErrorExit; cinfo.err->error_exit = R_JPGErrorExit;
cinfo.err->output_message = R_JPGOutputMessage; cinfo.err->output_message = R_JPGOutputMessage;
/* Establish the setjmp return context for R_JPGErrorExit to use. */
if (setjmp(jerr.setjmp_buffer))
{
/* If we get here, the JPEG code has signaled an error.
* We need to clean up the JPEG object and return.
*/
jpeg_destroy_compress(&cinfo);
ri.Printf(PRINT_ALL, "\n");
return 0;
}
/* Now we can initialize the JPEG compression object. */ /* Now we can initialize the JPEG compression object. */
jpeg_create_compress(&cinfo); jpeg_create_compress(&cinfo);