From c34bb163c38cfa893d1b5b0124ab9c5929dff16c Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sat, 11 May 2019 11:49:21 +0000 Subject: Make BitmapColor inherit from / merge into Color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BitmapColor itself is kept to distingish the Color usage as part of a color palette, which continues to store the offset in the blue value. The original special mbIndex handling is long gone since commit 1fefdd6f3b41 ("Alpha channel in BitmapColor - change bIndex to alpha"), so there is no data difference. This also results in the following changes: * now has a basic_ostream& operator<< (that was my actual starting point... for an other bug fix) * there is a minimal difference for GetLiminance BGR(29,151,76) => BGR(28,151,77) * no more return values for Merge and Invert (previously returning *this) * replaces all GetBlueOrIndex with GetIndex This leaves one "problematic" part: the GetColorError handling. At first glance it should probably be virtual. The Color variant is less strict then the BitmapColor one - for whatever reason. BitmapColor is always used to search for the best match in a Palette. Currently I'm simply leaving both variants. Would be nice to have an explict for functions here. Change-Id: I251ba3024a1d60f2a9d9fde9cd0a60f08e8322a7 Reviewed-on: https://gerrit.libreoffice.org/72181 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl Reviewed-by: Jan-Marek Glogowski --- tools/source/generic/color.cxx | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tools') diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index a06c6e84a964..4640ef85f290 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -64,13 +64,6 @@ void Color::DecreaseContrast(sal_uInt8 nContDec) } } -void Color::Invert() -{ - R = ~R; - G = ~G; - B = ~B; -} - bool Color::IsDark() const { return GetLuminance() <= 60; -- cgit