i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Static variables should have the s prefix.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22509 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2007-10-11 13:43:07 +00:00
parent 65e63b987d
commit fc6a714ec0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ColorConversion.cpp
+9 -9
View File
@@ -529,8 +529,8 @@ PaletteConverter::GrayColorForIndex(uint8 index) const
} }
static BLocker gPaletteConverterLock("PalConvLock"); static BLocker sPaletteConverterLock("PalConvLock");
static PaletteConverter gPaletteConverter; static PaletteConverter sPaletteConverter;
/*! \brief Initialize the global instance of PaletteConverter using the system color palette. /*! \brief Initialize the global instance of PaletteConverter using the system color palette.
@@ -540,14 +540,14 @@ static PaletteConverter gPaletteConverter;
status_t status_t
PaletteConverter::InitializeDefault(bool useServer) PaletteConverter::InitializeDefault(bool useServer)
{ {
if (gPaletteConverterLock.Lock()) { if (sPaletteConverterLock.Lock()) {
if (gPaletteConverter.InitCheck() != B_OK) { if (sPaletteConverter.InitCheck() != B_OK) {
if (useServer) if (useServer)
gPaletteConverter.SetTo(system_colors()); sPaletteConverter.SetTo(system_colors());
else else
gPaletteConverter.SetTo(kSystemPalette); sPaletteConverter.SetTo(kSystemPalette);
} }
gPaletteConverterLock.Unlock(); sPaletteConverterLock.Unlock();
} }
return B_OK; return B_OK;
} }
@@ -620,7 +620,7 @@ ReadGray1(const uint8 **source, int32 index)
void void
WriteCMAP8(uint8 **dest, uint8 *data, int32 index) WriteCMAP8(uint8 **dest, uint8 *data, int32 index)
{ {
**dest = gPaletteConverter.IndexForRGB15(*(uint16 *)data); **dest = sPaletteConverter.IndexForRGB15(*(uint16 *)data);
(*dest)++; (*dest)++;
} }
@@ -628,7 +628,7 @@ WriteCMAP8(uint8 **dest, uint8 *data, int32 index)
uint32 uint32
ReadCMAP8(const uint8 **source, int32 index) ReadCMAP8(const uint8 **source, int32 index)
{ {
uint32 result = gPaletteConverter.RGBA32ColorForIndex(**source); uint32 result = sPaletteConverter.RGBA32ColorForIndex(**source);
(*source)++; (*source)++;
return result; return result;
} }