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

* get_uint32_color() now returns the color as host endian value.

Browse Source 
* Introduced a new get_rgb_color(), that returns an rgb_color from a host endian
  uint32.
* Those two together fix bug #2094.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25031 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-04-18 18:10:44 +00:00
parent 5f2f72a288
commit 5464b10f1a
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/kits/interface/View.cpp
View File

@ -104,7 +104,17 @@ static property_info sViewPropInfo[] = {
static inline uint32 static inline uint32
get_uint32_color(rgb_color color) get_uint32_color(rgb_color color)
{ {
return *(uint32 *)&color; return B_BENDIAN_TO_HOST_INT32(*(uint32 *)&color);
// rgb_color is always in rgba format, no matter what endian;
// we always return the int32 value in host endian.
}
static inline rgb_color
get_rgb_color(uint32 value)
{
value = B_HOST_TO_BENDIAN_INT32(value);
return *(rgb_color *)&value;
} }
@ -406,13 +416,13 @@ BView::BView(BMessage *archive)
| B_FONT_SHEAR | B_FONT_ROTATION); | B_FONT_SHEAR | B_FONT_ROTATION);
} }
rgb_color color; int32 color;
if (archive->FindInt32("_color", 0, (int32 *)&color) == B_OK) if (archive->FindInt32("_color", 0, &color) == B_OK)
SetHighColor(color); SetHighColor(get_rgb_color(color));
if (archive->FindInt32("_color", 1, (int32 *)&color) == B_OK) if (archive->FindInt32("_color", 1, &color) == B_OK)
SetLowColor(color); SetLowColor(get_rgb_color(color));
if (archive->FindInt32("_color", 2, (int32 *)&color) == B_OK) if (archive->FindInt32("_color", 2, &color) == B_OK)
SetViewColor(color); SetViewColor(get_rgb_color(color));
uint32 evMask; uint32 evMask;
uint32 options; uint32 options;
@ -512,10 +522,8 @@ BView::Archive(BMessage *data, bool deep) const
// colors // colors
if (ret == B_OK) if (ret == B_OK)
ret = data->AddInt32("_color", get_uint32_color(HighColor())); ret = data->AddInt32("_color", get_uint32_color(HighColor()));
if (ret == B_OK) if (ret == B_OK)
ret = data->AddInt32("_color", get_uint32_color(LowColor())); ret = data->AddInt32("_color", get_uint32_color(LowColor()));
if (ret == B_OK) if (ret == B_OK)
ret = data->AddInt32("_color", get_uint32_color(ViewColor())); ret = data->AddInt32("_color", get_uint32_color(ViewColor()));