diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-01-21 04:48:50 +1100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-05 09:00:54 +0100 |
| commit | 01e470f0ab49e458c57b0f28636a517b2bfb1b4a (patch) | |
| tree | e153e55125b3d5682e60425b80568c5e03a3695a /vcl/quartz | |
| parent | 79517c0471aff4abf336bd81834bd28732dad67f (diff) | |
vcl: remove BitmapColor Color() operator
BitmapColor has a Color() operator. However, this is confusing and
tends to hide that the two classes aren't the same. I have converted this
to GetColor().
Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a
Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/salbmp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 2e69610e2d0c..28365159afa7 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -465,7 +465,7 @@ public: } virtual ColorData ReadPixel() override { - return mrPalette[ *pData++ ].operator Color().GetColor(); + return mrPalette[ *pData++ ].GetColor().GetColor(); } virtual void WritePixel( ColorData nColor ) override { @@ -511,7 +511,7 @@ public: const BitmapColor& rColor = mrPalette[( pData[mnX >> 1] >> mnShift) & 0x0f]; mnX++; mnShift ^= 4; - return rColor.operator Color().GetColor(); + return rColor.GetColor().GetColor(); } virtual void WritePixel( ColorData nColor ) override { @@ -552,7 +552,7 @@ public: { const BitmapColor& rColor = mrPalette[ (pData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1]; mnX++; - return rColor.operator Color().GetColor(); + return rColor.GetColor().GetColor(); } virtual void WritePixel( ColorData nColor ) override { |