diff options
| author | Steve Cotton <steve@s.cotton.clara.co.uk> | 2009-03-16 18:35:22 +0000 |
|---|---|---|
| committer | Steve Cotton <steve@s.cotton.clara.co.uk> | 2009-03-16 19:06:44 +0000 |
| commit | e90b7ba7d85edf9e5e020f3781f45ac318e7ea22 (patch) | |
| tree | 4044dd22df73bc2720dbc970f70dfd2e8267531a /src/resources/dye.h | |
| parent | 13b064998c0f7142a134817c9dde08ad29db97fe (diff) | |
| download | mana-e90b7ba7d85edf9e5e020f3781f45ac318e7ea22.tar.gz mana-e90b7ba7d85edf9e5e020f3781f45ac318e7ea22.tar.bz2 mana-e90b7ba7d85edf9e5e020f3781f45ac318e7ea22.tar.xz mana-e90b7ba7d85edf9e5e020f3781f45ac318e7ea22.zip | |
Rename the old Palette class to DyePalette
Having two classes called Palette makes the program crash,
when compiled without optimisation.
Diffstat (limited to 'src/resources/dye.h')
| -rw-r--r-- | src/resources/dye.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/dye.h b/src/resources/dye.h index ef867058..f39ba043 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -29,7 +29,7 @@ /** * Class for performing a linear interpolation between colors. */ -class Palette +class DyePalette { public: @@ -38,7 +38,7 @@ class Palette * The string is either a file name or a sequence of hexadecimal RGB * values separated by ',' and starting with '#'. */ - Palette(const std::string &pallete); + DyePalette(const std::string &pallete); /** * Gets a pixel color depending on its intensity. @@ -90,7 +90,7 @@ class Dye * * Red, Green, Yellow, Blue, Magenta, White (or rather gray). */ - Palette *mPalettes[7]; + DyePalette *mDyePalettes[7]; }; #endif |