quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ingar/alphahack_crashfix', fixes #1714

Browse Source
This commit is contained in:
Rudolf Polzer 2013-07-06 18:59:03 +02:00
parent 8487b92dc2 2f72e166b2
commit 32201f62a3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/quake3/q3map2/image.c
View File

@ -402,7 +402,8 @@ image_t *ImageLoad( const char *filename ){
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
if ( size > 0 ) {
if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) {
Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels );
// On error, LoadJPGBuff might store a pointer to the error message in image->pixels
Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) image->pixels );
}
alphaHack = qtrue;
}
@ -460,15 +461,19 @@ image_t *ImageLoad( const char *filename ){
if ( size > 0 ) {
unsigned char *pixels;
int width, height;
if ( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 && pixels != NULL ) {
Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels );
if ( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 ) {
if (pixels) {
// On error, LoadJPGBuff might store a pointer to the error message in pixels
Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) pixels );
}
if ( pixels && width == image->width && height == image->height ) {
} else {
if ( width == image->width && height == image->height ) {
int i;
for ( i = 0; i < width * height; ++i )
image->pixels[4 * i + 3] = pixels[4 * i + 2]; // copy alpha from blue channel
}
free( pixels );
}
free( buffer );
}
}