summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-10-17 07:28:48 +0000
committerArmin Le Grand <alg@apache.org>2012-10-17 07:28:48 +0000
commit08275c1207f2c66dc69f815941fa9c39c47b629a (patch)
treeee8528ea2d032369d96623704fdd88b84f2dfc8d /drawinglayer
parent51788964960e1e225170b8fcc7ef453c09c46ca7 (diff)
Made conversion from BitmapColor to Color more explicit by using operator Color()
Notes
Notes: merged as: 49a0278601ec73ee052086824536fa3d9796e5d3
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/texture/texture3d.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 27cd94984953..ab1ecc7b87a8 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -132,9 +132,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() == Color(aBitmapColor))
{
return 255;
}