Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
ff75f68e
Commit
ff75f68e
authored
9 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
Another warning found to tools/testbuild.sh
parent
ab37a759
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libnx/nxglib/nxglib_rgbblend.c
+9
-0
9 additions, 0 deletions
libnx/nxglib/nxglib_rgbblend.c
with
9 additions
and
0 deletions
libnx/nxglib/nxglib_rgbblend.c
+
9
−
0
View file @
ff75f68e
...
...
@@ -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
,
ub8_t
frac1
)
{
...
...
@@ -101,6 +104,8 @@ static uint8_t nxglib_blend_component(uint8_t component1, uint8_t component2,
return
(
uint8_t
)
blend
;
}
#endif
/****************************************************************************
* 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)
uint32_t
nxglib_rgb24_blend
(
uint32_t
color1
,
uint32_t
color2
,
ub16_t
frac1
)
{
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
)
;
}
#endif
#ifndef CONFIG_NX_DISABLE_16BPP
uint16_t
nxglib_rgb565_blend
(
uint16_t
color1
,
uint16_t
color2
,
ub16_t
frac1
)
{
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
)
;
}
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment