OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: 4, 2, and 1 bit grayscale images weren't properly supported.

Browse source 
- Fixed: Valgrind uninitialized memory error and a signed/unsigned warning.

SVN r4288 (trunk)
This commit is contained in:
Braden Obrzut 2013-05-26 04:03:47 +00:00
commit dabd48ab81
5 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/textures/pngtexture.cpp
View file

@ -297,17 +297,33 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename
case 0: // Grayscale
if (!bAlphaTexture)
{
BYTE *GrayMapSrc;
switch(BitDepth)
{
default:
GrayMapSrc = GrayMap;
break;
case 4:
GrayMapSrc = GrayMap4bit;
break;
case 2:
GrayMapSrc = GrayMap2bit;
break;
case 1:
GrayMapSrc = GrayMap1bit;
break;
}
if (colortype == 0 && havetRNS && trans[0] != 0)
{
bMasked = true;
PaletteSize = 256;
PaletteMap = new BYTE[256];
memcpy (PaletteMap, GrayMap, 256);
PaletteSize = 1<<BitDepth;
PaletteMap = new BYTE[PaletteSize];
memcpy (PaletteMap, GrayMapSrc, 256);
PaletteMap[trans[0]] = 0;
}
else
{
PaletteMap = GrayMap;
PaletteMap = GrayMapSrc;
}
}
break;