diff options
| author | Rene Engelhard <rene@debian.org> | 2011-01-02 14:09:11 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-01-02 14:09:11 +0100 |
| commit | 2cb30ad248573a613a3871ac78c5007b633d3d64 (patch) | |
| tree | 7bba4b4b8bd06fa3ecead04fdb319aa6a3b2e545 | |
| parent | 0d235638711dff16eb7116797918145d28fff337 (diff) | |
remove methods added by (apparently bogus) merge
| -rw-r--r-- | slideshow/source/engine/color.cxx | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index 8079cf65100a..dfa8b1409706 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -228,57 +228,6 @@ namespace slideshow return maHSLTriple.mnLuminance; } - double HSLColor::getRed() const - { - if( ::basegfx::fTools::equalZero( getSaturation() ) ) - return getLuminance(); - - return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, - mnMagicValue, - getHue() + 120.0 ); - } - - double HSLColor::getGreen() const - { - if( ::basegfx::fTools::equalZero( getSaturation() ) ) - return getLuminance(); - - return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, - mnMagicValue, - getHue() ); - } - - double HSLColor::getBlue() const - { - if( ::basegfx::fTools::equalZero( getSaturation() ) ) - return getLuminance(); - - return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, - mnMagicValue, - getHue() - 120.0 ); - } - - RGBColor HSLColor::getRGBColor() const - { - RGBColor::RGBTriple aColor( hsl2rgb( getHue(), - getSaturation(), - getLuminance() ) ); - return RGBColor( aColor.mnRed, aColor.mnGreen, aColor.mnBlue ); - } - - RGBColor::RGBColor(const RGBColor& rLHS) - : maRGBTriple( rLHS.maRGBTriple ) - { - } - - RGBColor& RGBColor::operator=( const RGBColor& rLHS ){ - - maRGBTriple.mnRed = rLHS.getRed(); - maRGBTriple.mnGreen = rLHS.getGreen(); - maRGBTriple.mnBlue = rLHS.getBlue(); - return *this; - } - HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS ) { return HSLColor( rLHS.getHue() + rRHS.getHue(), |