diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/Color.cc | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/Color.cc')
| -rw-r--r-- | src/FbTk/Color.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc index 2cd4278..b2d61ec 100644 --- a/src/FbTk/Color.cc +++ b/src/FbTk/Color.cc | |||
| @@ -37,7 +37,7 @@ inline unsigned char maxValue(unsigned short colval) { | |||
| 37 | return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF); | 37 | return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | }; | 40 | } |
| 41 | 41 | ||
| 42 | namespace FbTk { | 42 | namespace FbTk { |
| 43 | 43 | ||
| @@ -184,4 +184,4 @@ void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue | |||
| 184 | m_blue = blue; | 184 | m_blue = blue; |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | }; | 187 | } |