Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Someone forgot to initialize fUpdate15 and fColor15 when adding 15bit color

Browse Source 
support some 7 years ago...
CID 10246, 10245, 10244, 9471, 9454 and 9453 all concerning that (in the
different constructors / assignements).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39983 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2010-12-28 15:59:07 +00:00
parent 14a12acc76
commit aa8219391f
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/servers/app/RGBColor.cpp
View File

@ -218,8 +218,10 @@ RGBColor::RGBColor(const RGBColor &color)
{ {
fColor32 = color.fColor32; fColor32 = color.fColor32;
fColor16 = color.fColor16; fColor16 = color.fColor16;
fColor15 = color.fColor15;
fColor8 = color.fColor8; fColor8 = color.fColor8;
fUpdate8 = color.fUpdate8; fUpdate8 = color.fUpdate8;
fUpdate15 = color.fUpdate15;
fUpdate16 = color.fUpdate16; fUpdate16 = color.fUpdate16;
} }
@ -307,7 +309,7 @@ RGBColor::SetColor(uint8 r, uint8 g, uint8 b, uint8 a)
fColor32.blue = b; fColor32.blue = b;
fColor32.alpha = a; fColor32.alpha = a;
fUpdate8 = fUpdate16 = true; fUpdate8 = fUpdate15 = fUpdate16 = true;
} }
@ -326,7 +328,7 @@ RGBColor::SetColor(int r, int g, int b, int a)
fColor32.blue = (uint8)b; fColor32.blue = (uint8)b;
fColor32.alpha = (uint8)a; fColor32.alpha = (uint8)a;
fUpdate8 = fUpdate16 = true; fUpdate8 = fUpdate15 = fUpdate16 = true;
} }
#if 0 #if 0
@ -338,9 +340,10 @@ void
RGBColor::SetColor(uint16 col16) RGBColor::SetColor(uint16 col16)
{ {
fColor16 = col16; fColor16 = col16;
SetRGBColor(&fColor32,col16); SetRGBColor(&fColor32, col16);
fUpdate8 = true; fUpdate8 = true;
fUpdate15 = true;
fUpdate16 = false; fUpdate16 = false;
} }
#endif #endif
@ -357,6 +360,7 @@ RGBColor::SetColor(uint8 col8)
fColor32 = SystemPalette()[col8]; fColor32 = SystemPalette()[col8];
fUpdate8 = false; fUpdate8 = false;
fUpdate15 = true;
fUpdate16 = true; fUpdate16 = true;
} }
@ -369,7 +373,7 @@ void
RGBColor::SetColor(const rgb_color &color) RGBColor::SetColor(const rgb_color &color)
{ {
fColor32 = color; fColor32 = color;
fUpdate8 = fUpdate16 = true; fUpdate8 = fUpdate15 = fUpdate16 = true;
} }
@ -382,8 +386,10 @@ RGBColor::SetColor(const RGBColor &color)
{ {
fColor32 = color.fColor32; fColor32 = color.fColor32;
fColor16 = color.fColor16; fColor16 = color.fColor16;
fColor15 = color.fColor15;
fColor8 = color.fColor8; fColor8 = color.fColor8;
fUpdate8 = color.fUpdate8; fUpdate8 = color.fUpdate8;
fUpdate15 = color.fUpdate15;
fUpdate16 = color.fUpdate16; fUpdate16 = color.fUpdate16;
} }
@ -397,8 +403,10 @@ RGBColor::operator=(const RGBColor &color)
{ {
fColor32 = color.fColor32; fColor32 = color.fColor32;
fColor16 = color.fColor16; fColor16 = color.fColor16;
fColor15 = color.fColor15;
fColor8 = color.fColor8; fColor8 = color.fColor8;
fUpdate8 = color.fUpdate8; fUpdate8 = color.fUpdate8;
fUpdate15 = color.fUpdate15;
fUpdate16 = color.fUpdate16; fUpdate16 = color.fUpdate16;
return *this; return *this;
@ -413,7 +421,7 @@ const RGBColor&
RGBColor::operator=(const rgb_color &color) RGBColor::operator=(const rgb_color &color)
{ {
fColor32 = color; fColor32 = color;
fUpdate8 = fUpdate16 = true; fUpdate8 = fUpdate15 = fUpdate16 = true;
return *this; return *this;
} }