sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typo RBG -> RGB in several macros

Browse Source
This commit is contained in:
Gregory Nutt 2014-05-12 13:00:48 -06:00
parent df6e0bd33a
commit ba9e38f79a
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -427,3 +427,6 @@
1.12 2014-xx-xx Gregory Nutt <gnutt@nuttx.org> 1.12 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
* libnxwidgets/include/nxconfig.hxx and libnxwidgets/src/cscaledbitmap.cxx:
Fix typo RBG -> RGB. This makes NxWidgets incompatible with versions of
NuttX 7.2 and below.

24
libnxwidgets/include/nxconfig.hxx
View File

@ -284,9 +284,9 @@
# endif # endif
# define CONFIG_NXWIDGETS_FMT FB_FMT_RGB8_332 # define CONFIG_NXWIDGETS_FMT FB_FMT_RGB8_332
# define MKRGB RGBTO8 # define MKRGB RGBTO8
# define RGB2RED RBG8RED # define RGB2RED RGB8RED
# define RGB2GREEN RBG8GREEN # define RGB2GREEN RGB8GREEN
# define RGB2BLUE RBG8BLUE # define RGB2BLUE RGB8BLUE
# define FONT_RENDERER nxf_convert_8bpp # define FONT_RENDERER nxf_convert_8bpp
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# ifdef CONFIG_NX_DISABLE_16BPP # ifdef CONFIG_NX_DISABLE_16BPP
@ -294,9 +294,9 @@
# endif # endif
# define CONFIG_NXWIDGETS_FMT FB_FMT_RGB16_565 # define CONFIG_NXWIDGETS_FMT FB_FMT_RGB16_565
# define MKRGB RGBTO16 # define MKRGB RGBTO16
# define RGB2RED RBG16RED # define RGB2RED RGB16RED
# define RGB2GREEN RBG16GREEN # define RGB2GREEN RGB16GREEN
# define RGB2BLUE RBG16BLUE # define RGB2BLUE RGB16BLUE
# define FONT_RENDERER nxf_convert_16bpp # define FONT_RENDERER nxf_convert_16bpp
#elif CONFIG_NXWIDGETS_BPP == 24 #elif CONFIG_NXWIDGETS_BPP == 24
# ifdef CONFIG_NX_DISABLE_24BPP # ifdef CONFIG_NX_DISABLE_24BPP
@ -304,9 +304,9 @@
# endif # endif
# define CONFIG_NXWIDGETS_FMT FB_FMT_RGB24 # define CONFIG_NXWIDGETS_FMT FB_FMT_RGB24
# define MKRGB RGBTO24 # define MKRGB RGBTO24
# define RGB2RED RBG24RED # define RGB2RED RGB24RED
# define RGB2GREEN RBG24GREEN # define RGB2GREEN RGB24GREEN
# define RGB2BLUE RBG24BLUE # define RGB2BLUE RGB24BLUE
# define FONT_RENDERER nxf_convert_24bpp # define FONT_RENDERER nxf_convert_24bpp
#elif CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 32
# ifdef CONFIG_NX_DISABLE_32BPP # ifdef CONFIG_NX_DISABLE_32BPP
@ -314,9 +314,9 @@
# endif # endif
# define CONFIG_NXWIDGETS_FMT FB_FMT_RGB32 # define CONFIG_NXWIDGETS_FMT FB_FMT_RGB32
# define MKRGB RGBTO24 # define MKRGB RGBTO24
# define RGB2RED RBG24RED # define RGB2RED RGB24RED
# define RGB2GREEN RBG24GREEN # define RGB2GREEN RGB24GREEN
# define RGB2BLUE RBG24BLUE # define RGB2BLUE RGB24BLUE
# define FONT_RENDERER nxf_convert_32bpp # define FONT_RENDERER nxf_convert_32bpp
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"

36
libnxwidgets/src/cscaledbitmap.cxx
View File

@ -511,32 +511,32 @@ bool CScaledBitmap::rowColor(FAR uint8_t *row, b16_t column,
#if CONFIG_NXWIDGETS_FMT == FB_FMT_RGB8_332 #if CONFIG_NXWIDGETS_FMT == FB_FMT_RGB8_332
uint8_t color = row[col1]; uint8_t color = row[col1];
color1.r = RBG8RED(color); color1.r = RGB8RED(color);
color1.g = RBG8GREEN(color); color1.g = RGB8GREEN(color);
color1.b = RBG8BLUE(color); color1.b = RGB8BLUE(color);
transparent1 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR); transparent1 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR);
color = row[col2]; color = row[col2];
color2.r = RBG8RED(color); color2.r = RGB8RED(color);
color2.g = RBG8GREEN(color); color2.g = RGB8GREEN(color);
color2.b = RBG8BLUE(color); color2.b = RGB8BLUE(color);
transparent2 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR); transparent2 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR);
#elif CONFIG_NXWIDGETS_FMT == FB_FMT_RGB16_565 #elif CONFIG_NXWIDGETS_FMT == FB_FMT_RGB16_565
FAR uint16_t *row16 = (FAR uint16_t*)row; FAR uint16_t *row16 = (FAR uint16_t*)row;
uint16_t color = row16[col1]; uint16_t color = row16[col1];
color1.r = RBG16RED(color); color1.r = RGB16RED(color);
color1.g = RBG16GREEN(color); color1.g = RGB16GREEN(color);
color1.b = RBG16BLUE(color); color1.b = RGB16BLUE(color);
transparent1 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR); transparent1 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR);
color = row16[col2]; color = row16[col2];
color2.r = RBG16RED(color); color2.r = RGB16RED(color);
color2.g = RBG16GREEN(color); color2.g = RGB16GREEN(color);
color2.b = RBG16BLUE(color); color2.b = RGB16BLUE(color);
transparent2 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR); transparent2 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR);
@ -560,16 +560,16 @@ bool CScaledBitmap::rowColor(FAR uint8_t *row, b16_t column,
#elif CONFIG_NXWIDGETS_FMT == FB_FMT_RGB32 #elif CONFIG_NXWIDGETS_FMT == FB_FMT_RGB32
FAR uint32_t *row32 = (FAR uint32_t*)row; FAR uint32_t *row32 = (FAR uint32_t*)row;
uint32_t color = row32[col1]; uint32_t color = row32[col1];
color1.r = RBG24RED(color); color1.r = RGB24RED(color);
color1.g = RBG24GREEN(color); color1.g = RGB24GREEN(color);
color1.b = RBG24BLUE(color); color1.b = RGB24BLUE(color);
transparent1 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR); transparent1 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR);
color = row32[col2]; color = row32[col2];
color2.r = RBG24RED(color); color2.r = RGB24RED(color);
color2.g = RBG24GREEN(color); color2.g = RGB24GREEN(color);
color2.b = RBG24BLUE(color); color2.b = RGB24BLUE(color);
transparent2 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR); transparent2 = (color == CONFIG_NXWIDGETS_TRANSPARENT_COLOR);