diff options
| author | Max Horn | 2003-10-02 23:09:54 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-02 23:09:54 +0000 |
| commit | bb5351f0a8680845eb975a60eab961aa15e08729 (patch) | |
| tree | eaaf42cfcf81fbf4550d0b57ddcb0f0145538089 /common | |
| parent | bb6765f85d6272f736fa9bbe0981582fa7679ef5 (diff) | |
| download | scummvm-rg350-bb5351f0a8680845eb975a60eab961aa15e08729.tar.gz scummvm-rg350-bb5351f0a8680845eb975a60eab961aa15e08729.tar.bz2 scummvm-rg350-bb5351f0a8680845eb975a60eab961aa15e08729.zip | |
according to tsuteiuQ, this helps MSVC6 (seems it can cope with the enums but not with static consts)
svn-id: r10551
Diffstat (limited to 'common')
| -rw-r--r-- | common/scaler/intern.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/common/scaler/intern.h b/common/scaler/intern.h index 982386e54e..e0076d93a0 100644 --- a/common/scaler/intern.h +++ b/common/scaler/intern.h @@ -44,22 +44,26 @@ struct ColorMasks { template<> struct ColorMasks<565> { - static const int highBits = 0xF7DEF7DE; - static const int lowBits = 0x08210821; - static const int qhighBits = 0xE79CE79C; - static const int qlowBits = 0x18631863; - static const int redblueMask = 0xF81F; - static const int greenMask = 0x07E0; + enum { + highBits = 0xF7DEF7DE, + lowBits = 0x08210821, + qhighBits = 0xE79CE79C, + qlowBits = 0x18631863, + redblueMask = 0xF81F, + greenMask = 0x07E0 + }; }; template<> struct ColorMasks<555> { - static const int highBits = 0x04210421; - static const int lowBits = 0x04210421; - static const int qhighBits = 0x739C739C; - static const int qlowBits = 0x0C630C63; - static const int redblueMask = 0x7C1F; - static const int greenMask = 0x03E0; + enum { + highBits = 0x7BDE7BDE, + lowBits = 0x04210421, + qhighBits = 0x739C739C, + qlowBits = 0x0C630C63, + redblueMask = 0x7C1F, + greenMask = 0x03E0 + }; }; #define highBits ColorMasks<bitFormat>::highBits |