[Libreoffice-commits] core.git: drawinglayer/source

[Armin Le Grand]

 drawinglayer/source/texture/texture3d.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 49a0278601ec73ee052086824536fa3d9796e5d3
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Oct 17 07:28:48 2012 +0000

    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)

diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 2e46508..085fea3 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;
                     }