mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: avoid float for color calculations

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9b1cca88a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-12-25 23:21:07 +01:00
committed by Jacek Jendrzej
parent b4b8c4c77e
commit 8604dacb43
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/color.cpp
View File

@@ -43,9 +43,9 @@
int convertSetupColor2RGB(const unsigned char r, const unsigned char g, const unsigned char b) int convertSetupColor2RGB(const unsigned char r, const unsigned char g, const unsigned char b)
{ {
unsigned char red = (unsigned char)( float(2.55)*float(r) ); unsigned char red = (int)r * 255 / 100;
unsigned char green = (unsigned char)( float(2.55)*float(g) ); unsigned char green = (int)g * 255 / 100;
unsigned char blue = (unsigned char)( float(2.55)*float(b) ); unsigned char blue = (int)b * 255 / 100;
return (red << 16) | (green << 8) | blue; return (red << 16) | (green << 8) | blue;
} }
@@ -54,8 +54,8 @@ int convertSetupAlpha2Alpha(unsigned char alpha)
{ {
if(alpha == 0) return 0xFF; if(alpha == 0) return 0xFF;
else if(alpha >= 100) return 0; else if(alpha >= 100) return 0;
unsigned char a = (unsigned char)(100 - alpha); int a = 100 - alpha;
int ret = int( float(2.55)*float(a) ); int ret = a * 0xFF / 100;
return ret; return ret;
} }
@@ -65,7 +65,7 @@ void recalcColor(unsigned char &orginal, int fade)
{ {
return; return;
} }
int color = int( float( float(orginal) * float( float(fade) / 100.0)) ); int color = orginal * fade / 100;
if(color>255) if(color>255)
color=255; color=255;
if(color<0) if(color<0)