diff options
42 files changed, 48 insertions, 46 deletions
diff --git a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx index 3c0594a1d..48afd5306 100644 --- a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx +++ b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx @@ -47,7 +47,7 @@ #include <fixedmath.h> #include <debug.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include <nuttx/nx/nxglib.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx index cd51229c2..1336ad5e7 100644 --- a/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx @@ -45,7 +45,7 @@ #include <stdint.h> #include <stdbool.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include <nuttx/nx/nxfonts.h> /**************************************************************************** diff --git a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx index f295483a9..85548a381 100644 --- a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx +++ b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx @@ -80,7 +80,7 @@ #include <debug.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "inxwindow.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx index acff11f6a..c304e9281 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx index 5a00ecca9..ae322dcc2 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx index e80966ab7..5969527d9 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx index ee9add5b2..9ea10bde2 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_backspace.cxx b/NxWidgets/libnxwidgets/src/glyph_backspace.cxx index e7cabef29..86c1fb93a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_backspace.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_backspace.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_capslock.cxx b/NxWidgets/libnxwidgets/src/glyph_capslock.cxx index 29281e9df..d9e00bc78 100644 --- a/NxWidgets/libnxwidgets/src/glyph_capslock.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_capslock.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx index 1068b7e45..96dbec9c1 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx index bbf37ddcd..b598e60ce 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_control.cxx b/NxWidgets/libnxwidgets/src/glyph_control.cxx index 028a7197c..cd2e373e6 100644 --- a/NxWidgets/libnxwidgets/src/glyph_control.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_control.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx index 4b0adac84..7983d4566 100644 --- a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx b/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx index e4f043936..6a38b45cb 100644 --- a/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx b/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx index 68c081a28..c83ab7159 100644 --- a/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx index 58888194d..1359c5b96 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx index 4fc90a333..422db01a9 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx index b634af053..04ca63757 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_return.cxx b/NxWidgets/libnxwidgets/src/glyph_return.cxx index 7a8eba024..3989ff89a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_return.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_return.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx b/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx index 495c68cda..e55e0686a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx b/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx index b5c389f9c..e693b7488 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx b/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx index d775d0e50..488315d7a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx b/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx index 7f412345f..7d45dbf93 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_shift.cxx b/NxWidgets/libnxwidgets/src/glyph_shift.cxx index 48515b13c..c1cce8686 100644 --- a/NxWidgets/libnxwidgets/src/glyph_shift.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_shift.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx b/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx index 0600d2537..62d6ee718 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx b/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx index 195002630..b85ed053a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx b/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx index b182a861c..056e27c1c 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx @@ -79,7 +79,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_calculator.cxx b/NxWidgets/nxwm/src/glyph_calculator.cxx index e10bce74f..9bb3f690d 100644 --- a/NxWidgets/nxwm/src/glyph_calculator.cxx +++ b/NxWidgets/nxwm/src/glyph_calculator.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_calibration.cxx b/NxWidgets/nxwm/src/glyph_calibration.cxx index be9d8de0a..df169f556 100644 --- a/NxWidgets/nxwm/src/glyph_calibration.cxx +++ b/NxWidgets/nxwm/src/glyph_calibration.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_cmd.cxx b/NxWidgets/nxwm/src/glyph_cmd.cxx index a424fe6f3..373d8ad5e 100644 --- a/NxWidgets/nxwm/src/glyph_cmd.cxx +++ b/NxWidgets/nxwm/src/glyph_cmd.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_mediaplayer.cxx b/NxWidgets/nxwm/src/glyph_mediaplayer.cxx index 77e933915..ee8c1a873 100644 --- a/NxWidgets/nxwm/src/glyph_mediaplayer.cxx +++ b/NxWidgets/nxwm/src/glyph_mediaplayer.cxx @@ -48,7 +48,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx index 0c45a2f77..31feb268f 100644 --- a/NxWidgets/nxwm/src/glyph_minimize.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx index 505d87733..011f892a2 100644 --- a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx +++ b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx @@ -48,7 +48,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx index 5fa464854..213db54dd 100644 --- a/NxWidgets/nxwm/src/glyph_nsh.cxx +++ b/NxWidgets/nxwm/src/glyph_nsh.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_play24x24.cxx b/NxWidgets/nxwm/src/glyph_play24x24.cxx index e16e3b505..ffe389fc5 100644 --- a/NxWidgets/nxwm/src/glyph_play24x24.cxx +++ b/NxWidgets/nxwm/src/glyph_play24x24.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx index db2ffaf94..ce1bf6a2c 100644 --- a/NxWidgets/nxwm/src/glyph_start.cxx +++ b/NxWidgets/nxwm/src/glyph_start.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx index df7e02268..74836e01d 100644 --- a/NxWidgets/nxwm/src/glyph_stop.cxx +++ b/NxWidgets/nxwm/src/glyph_stop.cxx @@ -45,7 +45,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/video/fb.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/apps/examples/nxconsole/nxcon_internal.h b/apps/examples/nxconsole/nxcon_internal.h index c921bed38..02d84d025 100644 --- a/apps/examples/nxconsole/nxcon_internal.h +++ b/apps/examples/nxconsole/nxcon_internal.h @@ -46,7 +46,7 @@ #include <stdbool.h> #include <semaphore.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include <nuttx/nx/nx.h> #include <nuttx/nx/nxglib.h> diff --git a/apps/examples/nxlines/nxlines.h b/apps/examples/nxlines/nxlines.h index c9101124e..19e809c8b 100644 --- a/apps/examples/nxlines/nxlines.h +++ b/apps/examples/nxlines/nxlines.h @@ -48,7 +48,7 @@ #include <nuttx/nx/nxglib.h> #include <nuttx/nx/nx.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> /**************************************************************************** * Definitions diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c6c3819a4..9928ba3e5 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2172,7 +2172,7 @@ interfaces to read from graphics memory * graphics/nxbe/nxbe_bitmap.c: Fix an error in the error handling that can cause valid bitmaps to fail to render. - * include/nuttx/rgbcolors.h: Fix errors in some 16- and 8-bit color + * include/nuttx/video/rgbcolors.h: Fix errors in some 16- and 8-bit color conversion macros. * tools/incdir.sh: Fix issues when g++ is used as the compiler. It was not being recognized and handled properly. @@ -2192,7 +2192,7 @@ supports using "clusters" of AT24 pages as blocks. This allows bigger block sizes and more efficient use of EEPROM when the AT24 is used to support a file system (such as NXFFS). (Contributed by Hal Glenn). - * include/nuttx/rgbcolors.h: More fixes to RGB color conversion + * include/nuttx/video/rgbcolors.h: More fixes to RGB color conversion macros. * arch/arm/src/common/up_createstack.c and up_usestack.c: For ARM EABI the stack must be aligned to 8-byte boundaries. This is necessary for @@ -6187,4 +6187,6 @@ header file (2013-12-9). * include/nuttx/video/fb.h: Move fb.h to include/nuttx/video/ (2013-12-10). + * include/nuttx/video/rgbcolors.h: Move rgbcolors.h to include/nuttx/video. + (2013-12-10). diff --git a/nuttx/configs/sam3u-ek/src/up_lcd.c b/nuttx/configs/sam3u-ek/src/up_lcd.c index 6cfb08720..780abe049 100644 --- a/nuttx/configs/sam3u-ek/src/up_lcd.c +++ b/nuttx/configs/sam3u-ek/src/up_lcd.c @@ -119,7 +119,7 @@ #include <nuttx/arch.h> #include <nuttx/lcd/lcd.h> -#include <nuttx/rgbcolors.h> +#include <nuttx/video/rgbcolors.h> #include <arch/irq.h> diff --git a/nuttx/include/nuttx/rgbcolors.h b/nuttx/include/nuttx/video/rgbcolors.h index b4b8826d4..a4a9e4ff6 100644 --- a/nuttx/include/nuttx/rgbcolors.h +++ b/nuttx/include/nuttx/video/rgbcolors.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/rgbcolors.h + * include/nuttx/video/rgbcolors.h * User-friendly RGB color definitions * * Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_RGBCOLOR_H -#define __INCLUDE_NUTTX_RGBCOLOR_H +#ifndef __INCLUDE_NUTTX_VIDEO_RGBCOLOR_H +#define __INCLUDE_NUTTX_VIDEO_RGBCOLOR_H /**************************************************************************** * Included Files @@ -313,4 +313,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __INCLUDE_NUTTX_RGBCOLOR_H */ +#endif /* __INCLUDE_NUTTX_VIDEO_RGBCOLOR_H */ |