[Bf-blender-cvs] [527302b] master: Fix 8bit BMP palette reading
Campbell Barton
noreply at git.blender.org
Wed Mar 11 11:28:48 CET 2015
Commit: 527302bc0b0693b2f5d1ccb567fb532923cd393a
Author: Campbell Barton
Date: Wed Mar 11 21:26:29 2015 +1100
Branches: master
https://developer.blender.org/rB527302bc0b0693b2f5d1ccb567fb532923cd393a
Fix 8bit BMP palette reading
part of D1173 by @rdb, load BGR -> RGB
===================================================================
M source/blender/imbuf/intern/bmp.c
===================================================================
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c
index f8cf116..bc1ca47 100644
--- a/source/blender/imbuf/intern/bmp.c
+++ b/source/blender/imbuf/intern/bmp.c
@@ -186,9 +186,10 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags, char co
}
for (j = x; j > 0; j--) {
const char *pcol = palette[bmp[0]];
- rect[0] = pcol[0];
+ /* intentionally BGR -> RGB */
+ rect[0] = pcol[2];
rect[1] = pcol[1];
- rect[2] = pcol[2];
+ rect[2] = pcol[0];
rect[3] = 255;
rect += 4; bmp += 1;
More information about the Bf-blender-cvs
mailing list