commit | d1935bcf805dd5bf2b83eec3cc1f1af2a88992bb | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Sun Nov 15 12:05:55 2009 -0800 |
committer | Jean-Baptiste Queru <jbq@google.com> | Sun Nov 15 12:05:55 2009 -0800 |
tree | b98e2b81198a37bacd603c2328eddfa2d26f8d24 | |
parent | 9e8ea14087bf3715d2f19a8a850100b1e25a9987 [diff] | |
parent | a6567963ad9040df76b53fac9279e74e0864fc70 [diff] |
merge from eclair
diff --git a/jmorecfg.h b/jmorecfg.h index d699a2c..236bbcb 100644 --- a/jmorecfg.h +++ b/jmorecfg.h
@@ -20,7 +20,7 @@ #define ANDROID_RGB #ifdef ANDROID_RGB -#define PACK_SHORT_565(r,g,b) ((((r)<<8)&0xf800)|(((g)<<3)&0x7C0)|((b)>>3)) +#define PACK_SHORT_565(r,g,b) ((((r)<<8)&0xf800)|(((g)<<3)&0x7E0)|((b)>>3)) #define PACK_TWO_PIXELS(l,r) ((r<<16) | l) #define PACK_NEED_ALIGNMENT(ptr) (((int)(ptr))&3) #define WRITE_TWO_PIXELS(addr, pixels) do { \