mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/color.cpp: Fix compiler warnings (-Wconversion)

Browse Source
This commit is contained in:
M. Liebmann
2014-02-07 02:01:45 +01:00
parent b3cfd88569
commit 176460cf80
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

@@ -39,9 +39,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 = int( float(255./100.)*float(r) ); unsigned char red = (unsigned char)( float(2.55)*float(r) );
unsigned char green = int( float(255./100.)*float(g) ); unsigned char green = (unsigned char)( float(2.55)*float(g) );
unsigned char blue = int( float(255./100.)*float(b) ); unsigned char blue = (unsigned char)( float(2.55)*float(b) );
return (red << 16) | (green << 8) | blue; return (red << 16) | (green << 8) | blue;
} }
@@ -50,8 +50,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 = 100 - alpha; unsigned char a = (unsigned char)(100 - alpha);
int ret = int( float(0xFF/100.)*float(a) ); int ret = int( float(2.55)*float(a) );
return ret; return ret;
} }
@@ -66,7 +66,7 @@ void recalcColor(unsigned char &orginal, int fade)
color=255; color=255;
if(color<0) if(color<0)
color=0; color=0;
orginal = color; orginal = (unsigned char)color;
} }
void protectColor( unsigned char &r, unsigned char &g, unsigned char &b, bool protect ) void protectColor( unsigned char &r, unsigned char &g, unsigned char &b, bool protect )