diff options
author | William Wilgus <me.theuser@yahoo.com> | 2018-10-08 19:52:01 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2018-10-08 19:59:50 -0400 |
commit | 046cc497ad15222974201bef443109165973e3b9 (patch) | |
tree | e3d505e01b63727fe77480db8ca8e7cf176eb3c0 /apps/plugins/lua/include_lua/color.lua | |
parent | c0682e094414d0748456d0b01000727039ff701c (diff) | |
download | rockbox-046cc497ad15222974201bef443109165973e3b9.tar.gz rockbox-046cc497ad15222974201bef443109165973e3b9.zip |
Fix red rocklib_img 32-24 bit targets
int is an incompatible type for targets that have 32bit fb_data
need to use FB_SCALARPACK for them
Change-Id: Ib3b5ff19c54d8d1bb76af33d0538a17a71301514
Diffstat (limited to 'apps/plugins/lua/include_lua/color.lua')
-rw-r--r-- | apps/plugins/lua/include_lua/color.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/lua/include_lua/color.lua b/apps/plugins/lua/include_lua/color.lua index fd321edd9d..7266c090f3 100644 --- a/apps/plugins/lua/include_lua/color.lua +++ b/apps/plugins/lua/include_lua/color.lua | |||
@@ -44,7 +44,7 @@ local _clr = {} do | |||
44 | local _NIL = nil -- _NIL placeholder | 44 | local _NIL = nil -- _NIL placeholder |
45 | 45 | ||
46 | local maxstate = (bit.lshift(1, rb.LCD_DEPTH) - 1) | 46 | local maxstate = (bit.lshift(1, rb.LCD_DEPTH) - 1) |
47 | 47 | ||
48 | if rb.LCD_DEPTH > 24 then -- no alpha channels | 48 | if rb.LCD_DEPTH > 24 then -- no alpha channels |
49 | maxstate = (bit.lshift(1, 24) - 1) | 49 | maxstate = (bit.lshift(1, 24) - 1) |
50 | end | 50 | end |
@@ -89,7 +89,7 @@ local _clr = {} do | |||
89 | r, g, b = (r or 0), (g or 0), (b or 0) | 89 | r, g, b = (r or 0), (g or 0), (b or 0) |
90 | ru = ru + r; gu = gu + g; bu = bu + b | 90 | ru = ru + r; gu = gu + g; bu = bu + b |
91 | else | 91 | else |
92 | ru = ru + inc; gu = gu + inc; bu = bu + inc | 92 | ru = ru + inc; gu = gu + inc; bu = bu + inc |
93 | end | 93 | end |
94 | 94 | ||
95 | color = rb.lcd_rgbpack(ru, gu, bu) | 95 | color = rb.lcd_rgbpack(ru, gu, bu) |