removed redefinition of cp and mem.

Was causing problems on windows.  (Its odd that it worked on gcc without
warnings)

Thanks to damiles.

Kent
This commit is contained in:
Kent Mein
2006-11-07 18:32:25 +00:00
parent 387f3b6a07
commit a221ddcf9b

View File

@@ -604,7 +604,9 @@ struct ImBuf *imb_loadtarga(unsigned char *mem, int flags)
rect = ibuf->rect;
for (size = ibuf->x * ibuf->y; size > 0; --size, ++rect){
col = *rect;
uchar *cp = (uchar*)rect, *mem = (uchar*)&col;
cp = (uchar*)rect;
mem = (uchar*)&col;
cp[3] = ((mem[1] << 1) & 0xf8);
cp[2] = ((mem[0] & 0xe0) >> 2) + ((mem[1] & 0x03) << 6);
cp[1] = ((mem[0] << 3) & 0xf8);