diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-17 07:28:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 20:16:50 +0100 |
| commit | 49a0278601ec73ee052086824536fa3d9796e5d3 (patch) | |
| tree | fe7fe240703acecc3b8a7d9825d772d8567cc2fe /drawinglayer | |
| parent | c3359bd7e662e905fdb85d8f6b3455018b31cf09 (diff) | |
Made conversion from BitmapColor to Color more explicit...
by using operator Color()
(cherry picked from commit 08275c1207f2c66dc69f815941fa9c39c47b629a)
Change-Id: I26350c3d47e37064b5a8674f75c9822753994a17
Corrected color conversion from BitmapColor to Color
(cherry picked from commit b0b8e3854f679383fe3ff2e436bfbe3573f34088)
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/texture/texture3d.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index 2e46508dbd71..085fea3cc08d 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -125,9 +125,9 @@ namespace drawinglayer } case TRANSPARENT_COLOR: { - const Color aColor(mpReadBitmap->GetColor(rY, rX)); + const BitmapColor aBitmapColor(mpReadBitmap->GetColor(rY, rX)); - if(maBitmapEx.GetTransparentColor() == aColor) + if(maBitmapEx.GetTransparentColor() == aBitmapColor.operator Color()) { return 255; } |