ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #411 from Triang3l/TGAGreyscaleRLE 

Support grayscale RLE TGA images
This commit is contained in:
Timothee "TTimo" Besset 2017-02-26 10:40:03 -06:00 committed by GitHub
parent 121e2d2d60 f8ad8f2550
commit d91edda475
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/image/lbmlib.cpp
View File

@ -464,9 +464,10 @@ void LoadTGA( const char *name, byte ** pic, int *width, int *height ){
bool bAlphaOK = false; bool bAlphaOK = false;
if ( targa_header.image_type != 2 && targa_header.image_type != 10 && targa_header.image_type != 3 ) { if ( targa_header.image_type != 2 && targa_header.image_type != 10
&& targa_header.image_type != 3 && targa_header.image_type != 11 ) {
Sys_Printf( "LoadTGA: TGA type %d not supported\n", targa_header.image_type ); Sys_Printf( "LoadTGA: TGA type %d not supported\n", targa_header.image_type );
Sys_Printf( "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n" ); Sys_Printf( "LoadTGA: Only type 2 (RGB), 3 (gray), 10 (RGB), and 11 (gray) TGA images supported\n" );
return; return;
} }
@ -475,9 +476,11 @@ void LoadTGA( const char *name, byte ** pic, int *width, int *height ){
return; return;
} }
if ( ( targa_header.pixel_size != 32 && targa_header.pixel_size != 24 ) if ( ( ( targa_header.image_type == 2 || targa_header.image_type == 10 ) &&
&& targa_header.image_type != 3 ) { targa_header.pixel_size != 32 && targa_header.pixel_size != 24 ) ||
Sys_Printf( "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n" ); ( ( targa_header.image_type == 3 || targa_header.image_type == 11 ) &&
targa_header.pixel_size != 8 ) ) {
Sys_Printf( "LoadTGA: Only 32, 24 or 8 bit images supported (no colormaps)\n" );
return; return;
} }
@ -570,7 +573,8 @@ void LoadTGA( const char *name, byte ** pic, int *width, int *height ){
} }
} }
} }
else if ( targa_header.image_type == 10 ) { // Runlength encoded RGB images else if ( targa_header.image_type == 10 || targa_header.image_type == 11 ) {
// Runlength encoded RGB or gray scale images
unsigned char red, green, blue, alphabyte, packetHeader, packetSize, j; unsigned char red, green, blue, alphabyte, packetHeader, packetSize, j;
red = 0; red = 0;
@ -588,6 +592,12 @@ void LoadTGA( const char *name, byte ** pic, int *width, int *height ){
if ( packetHeader & 0x80 ) { // run-length packet if ( packetHeader & 0x80 ) { // run-length packet
switch ( targa_header.pixel_size ) switch ( targa_header.pixel_size )
{ {
case 8:
blue = *buf_p++;
green = blue;
red = blue;
alphabyte = 255;
break;
case 24: case 24:
blue = *buf_p++; blue = *buf_p++;
green = *buf_p++; green = *buf_p++;
@ -638,6 +648,15 @@ void LoadTGA( const char *name, byte ** pic, int *width, int *height ){
{ {
switch ( targa_header.pixel_size ) switch ( targa_header.pixel_size )
{ {
case 8:
blue = *buf_p++;
green = blue;
red = blue;
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
*pixbuf++ = 255;
break;
case 24: case 24:
blue = *buf_p++; blue = *buf_p++;
green = *buf_p++; green = *buf_p++;