diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 21:59:21 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 22:00:09 +0100 |
| commit | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch) | |
| tree | 03c296d1f89859aae35336dfe2f58df09d256fd3 /src/resources/dye.h | |
| parent | fa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff) | |
| parent | 347452b9b69ef3af29c577b7751082822e900c01 (diff) | |
| download | mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2 mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip | |
Merge branch 'aethyra/master'
Conflicts:
Many files.
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 3cef334a..d0d010bc 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -28,7 +28,7 @@ /** * Class for performing a linear interpolation between colors. */ -class Palette +class DyePalette { public: @@ -37,7 +37,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. @@ -89,7 +89,7 @@ class Dye * * Red, Green, Yellow, Blue, Magenta, White (or rather gray). */ - Palette *mPalettes[7]; + DyePalette *mDyePalettes[7]; }; #endif |