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/qa/cppunit/jpeg | |
| 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/qa/cppunit/jpeg')
| -rw-r--r-- | vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx index 024316c9e739..64125245c82a 100644 --- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx +++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx @@ -66,24 +66,24 @@ bool checkRect(Bitmap& rBitmap, int aLayerNumber, long nAreaHeight, long nAreaWi for (long y = firstY; y <= lastY; y++) { - Color aColorFirst = pAccess->GetPixel(y, firstX); + Color aColorFirst = pAccess->GetPixel(y, firstX).GetColor(); delta = deltaColor(aColorFirst, aExpectedColor); if (delta > nMaxDelta) return false; - Color aColorLast = pAccess->GetPixel(y, lastX); + Color aColorLast = pAccess->GetPixel(y, lastX).GetColor(); delta = deltaColor(aColorLast, aExpectedColor); if (delta > nMaxDelta) return false; } for (long x = firstX; x <= lastX; x++) { - Color aColorFirst = pAccess->GetPixel(firstY, x); + Color aColorFirst = pAccess->GetPixel(firstY, x).GetColor(); delta = deltaColor(aColorFirst, aExpectedColor); if (delta > nMaxDelta) return false; - Color aColorLast = pAccess->GetPixel(lastY, x); + Color aColorLast = pAccess->GetPixel(lastY, x).GetColor(); delta = deltaColor(aColorLast, aExpectedColor); if (delta > nMaxDelta) return false; |