diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-25 15:21:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-25 15:21:01 +0000 |
| commit | 38c2a5225455acca57f72649460b4a5d12d61ca1 (patch) | |
| tree | cbdee96ca1d85812ee55fdb2b0df94bf54e89ada /nuttx/include | |
| parent | 5b0d579d3cd42d64ff748683297657821ab353ab (diff) | |
| download | px4-nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.tar.gz px4-nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.tar.bz2 px4-nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.zip | |
Fix some errors in 8-bit color conversion macros; Fix tools/incdir.sh when g++ is used; Fix bad cast that caused problems with the background window is released
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4064 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/rgbcolors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/include/nuttx/rgbcolors.h b/nuttx/include/nuttx/rgbcolors.h index d2fcba8f1..93212f6e1 100644 --- a/nuttx/include/nuttx/rgbcolors.h +++ b/nuttx/include/nuttx/rgbcolors.h @@ -70,7 +70,7 @@ /* This macro creates RGB8 (3:3:2) from 8:8:8 RGB */ #define RGBTO8(r,g,b) \ - ((((uint8_t)(r) << 5) & 0xe0) | (((uint8_t)(r) << 2) & 0x1c) | ((uint8_t)(r) & 0x03)) + ((((uint8_t)(r) << 5) & 0xe0) | (((uint8_t)(g) << 2) & 0x1c) | ((uint8_t)(b) & 0x03)) /* And these macros perform the inverse transformation */ |