From a221ddcf9bb44d81037fa1cff3fddb70e4e3f521 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Tue, 7 Nov 2006 18:32:25 +0000 Subject: removed redefinition of cp and mem. Was causing problems on windows. (Its odd that it worked on gcc without warnings) Thanks to damiles. Kent --- source/blender/imbuf/intern/targa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/imbuf/intern/targa.c') diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index a9e83a22a8c..ce54556d306 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -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); -- cgit v1.2.3