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

Move black/white color constant definitions to header.

Browse Source 
Previously, there were two instances of the actual variables, named in
ControlLook.cpp and Utilities.cpp. This caused clashes on gcc4 builds, leading
to various crashes during initialization. Instead we now declare them as
static constants in the header itself as is done for various other interface
color constants elsewhere. Fixes ticket #8358.
This commit is contained in:
Rene Gollent 2012-03-02 20:39:12 -05:00
parent 7c89d968b5
commit 4183675895
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kits/interface/ControlLook.cpp
View File

@ -22,8 +22,6 @@ namespace BPrivate {
static const float kEdgeBevelLightTint = 0.59;
static const float kEdgeBevelShadowTint = 1.0735;
const rgb_color kWhite = (rgb_color){255, 255, 255, 255};
const rgb_color kBlack = (rgb_color){0, 0, 0, 255};
BControlLook::BControlLook():

3
src/kits/tracker/Utilities.cpp
View File

@ -81,9 +81,6 @@ namespace BPrivate {
const float kExactMatchScore = INFINITY;
const rgb_color kBlack = {0, 0, 0, 255};
const rgb_color kWhite = {255, 255, 255, 255};
bool gLocalizedNamePreferred;

4
src/kits/tracker/Utilities.h
View File

@ -72,8 +72,8 @@ class BPose;
class BPoseView;
// global variables
extern const rgb_color kBlack;
extern const rgb_color kWhite;
static const rgb_color kBlack = {0, 0, 0, 255};
static const rgb_color kWhite = {255, 255, 255 ,255};
const int64 kHalfKBSize = 512;
const int64 kKBSize = 1024;