Make BitmapColor inherit from / merge into Color

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<charT, traits>& 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 <quikee@gmail.com>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index c47151f137b7..12daa7567f42 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -421,7 +421,7 @@ public:
 
             // Caution(!) rPalette.GetEntryCount() may be != (depth^^2)-1 (!)
             if(nIndex < mnPaletteCount)
-                return mrPalette[nIndex].GetColor();
+                return mrPalette[nIndex];
             else
                 return COL_BLACK;
         }
@@ -471,7 +471,7 @@ public:
             mnShift ^= 4;
 
             if(nIndex < mnPaletteCount)
-                return mrPalette[nIndex].GetColor();
+                return mrPalette[nIndex];
             else
                 return COL_BLACK;
         }
@@ -516,7 +516,7 @@ public:
             mnX++;
 
             if(nIndex < mnPaletteCount)
-                return mrPalette[nIndex].GetColor();
+                return mrPalette[nIndex];
             else
                 return COL_BLACK;
         }