diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-11-07 21:32:25 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-11-07 21:32:25 +0300 |
| commit | a221ddcf9bb44d81037fa1cff3fddb70e4e3f521 (patch) | |
| tree | 4177193c317e5f11bb37d349d9f2b3cf19934f1e /source | |
| parent | 387f3b6a07acbd64fd6b0314babbd5b8b6ff01e2 (diff) | |
removed redefinition of cp and mem.
Was causing problems on windows. (Its odd that it worked on gcc without
warnings)
Thanks to damiles.
Kent
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/imbuf/intern/targa.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |