Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Another warning found to tools/testbuild.sh

Browse Source
This commit is contained in:
Gregory Nutt
2015-07-22 15:04:17 -06:00
parent ab37a759d8
commit ff75f68eeb
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libnx/nxglib/nxglib_rgbblend.c
+9
View File
@@ -70,6 +70,9 @@
* *
****************************************************************************/ ****************************************************************************/
#if !defined(CONFIG_NX_DISABLE_16BPP) || !defined(CONFIG_NX_DISABLE_24BPP) || \
!defined(CONFIG_NX_DISABLE_32BPP)
static uint8_t nxglib_blend_component(uint8_t component1, uint8_t component2, static uint8_t nxglib_blend_component(uint8_t component1, uint8_t component2,
ub8_t frac1) ub8_t frac1)
{ {
@@ -101,6 +104,8 @@ static uint8_t nxglib_blend_component(uint8_t component1, uint8_t component2,
return (uint8_t)blend; return (uint8_t)blend;
} }
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@@ -131,6 +136,7 @@ static uint8_t nxglib_blend_component(uint8_t component1, uint8_t component2,
****************************************************************************/ ****************************************************************************/
#if !defined(CONFIG_NX_DISABLE_24BPP) || !defined(CONFIG_NX_DISABLE_32BPP) #if !defined(CONFIG_NX_DISABLE_24BPP) || !defined(CONFIG_NX_DISABLE_32BPP)
uint32_t nxglib_rgb24_blend(uint32_t color1, uint32_t color2, ub16_t frac1) uint32_t nxglib_rgb24_blend(uint32_t color1, uint32_t color2, ub16_t frac1)
{ {
uint8_t r; uint8_t r;
@@ -177,9 +183,11 @@ uint32_t nxglib_rgb24_blend(uint32_t color1, uint32_t color2, ub16_t frac1)
return RGBTO24(r,g,b) ; return RGBTO24(r,g,b) ;
} }
#endif #endif
#ifndef CONFIG_NX_DISABLE_16BPP #ifndef CONFIG_NX_DISABLE_16BPP
uint16_t nxglib_rgb565_blend(uint16_t color1, uint16_t color2, ub16_t frac1) uint16_t nxglib_rgb565_blend(uint16_t color1, uint16_t color2, ub16_t frac1)
{ {
uint8_t r; uint8_t r;
@@ -221,4 +229,5 @@ uint16_t nxglib_rgb565_blend(uint16_t color1, uint16_t color2, ub16_t frac1)
return RGBTO24(r,g,b) ; return RGBTO24(r,g,b) ;
} }
#endif #endif