summaryrefslogtreecommitdiff
path: root/apps/graphics
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-12-01 16:18:43 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-12-03 16:48:05 -0600
commit64e0b29eafd429b21483153af871d2bf4a618e17 (patch)
tree870a878f35542549493f5ed5593903dbd75d1f17 /apps/graphics
parentbd6542081652705e24162921d16d433ce0d05012 (diff)
downloadnuttx-64e0b29eafd429b21483153af871d2bf4a618e17.tar.gz
nuttx-64e0b29eafd429b21483153af871d2bf4a618e17.tar.bz2
nuttx-64e0b29eafd429b21483153af871d2bf4a618e17.zip
Making a place for color transformations
Diffstat (limited to 'apps/graphics')
-rw-r--r--apps/graphics/traveler/include/trv_color.h3
-rwxr-xr-xapps/graphics/traveler/src/trv_graphics.c7
-rwxr-xr-xapps/graphics/traveler/src/trv_main.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/graphics/traveler/include/trv_color.h b/apps/graphics/traveler/include/trv_color.h
index 0a2cf78bb..8252b6b9b 100644
--- a/apps/graphics/traveler/include/trv_color.h
+++ b/apps/graphics/traveler/include/trv_color.h
@@ -70,7 +70,8 @@ struct trv_color_lum_s
* Public Function Prototypes
****************************************************************************/
-bool trv_color_allocate(FAR struct trv_palette_s *pinfo);
+void trv_color_allocate(FAR struct trv_palette_s *pinfo);
+void trv_color_endmapping(void);
void trv_color_free(FAR struct trv_palette_s *pinfo);
trv_pixel_t trv_color_rgb2pixel(FAR struct trv_color_rgb_s *pixel);
void trv_color_pixel2lum(trv_pixel_t pixel, FAR struct trv_color_lum_s *lum);
diff --git a/apps/graphics/traveler/src/trv_graphics.c b/apps/graphics/traveler/src/trv_graphics.c
index 6742147aa..405c90422 100755
--- a/apps/graphics/traveler/src/trv_graphics.c
+++ b/apps/graphics/traveler/src/trv_graphics.c
@@ -459,12 +459,7 @@ int trv_graphics_initialize(FAR struct trv_graphics_info_s *ginfo)
/* Allocate color mapping information */
- ret = trv_color_allocate(&ginfo->palette);
- if (ret < 0)
- {
- trv_abort("ERROR trv_color_allocate failed: %d");
- }
-
+ trv_color_allocate(&ginfo->palette);
trv_vdebug("%d colors allocated\n", ginfo->palette.ncolors);
return OK;
}
diff --git a/apps/graphics/traveler/src/trv_main.c b/apps/graphics/traveler/src/trv_main.c
index fc9de19f6..7bd02458c 100755
--- a/apps/graphics/traveler/src/trv_main.c
+++ b/apps/graphics/traveler/src/trv_main.c
@@ -222,6 +222,10 @@ int traveler_main(int argc, char *argv[])
world_filename, ret);
}
+ /* Release color mapping tables */
+
+ trv_color_endmapping();
+
/* Set the player's POV in the new world */
trv_pov_reset();