[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/source vcl/win

[Jan Holesovsky]

 vcl/source/gdi/bitmapex.cxx    |    2 +-
 vcl/win/source/gdi/gdiimpl.cxx |    6 ++++++
 vcl/win/source/gdi/gdiimpl.hxx |    5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 88dba41503d622ef46073bbda20e16741a971a51
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Nov 11 09:00:16 2014 +0100

    windows opengl: Fix build.
    
    Change-Id: I96b1474d82bd7d4c6b59ace0d56fef251b7ec4a2

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 330bd59..687cc94 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -115,7 +115,7 @@ void BitmapEx::loadFromIconTheme( const OUString& rIconName )
 #ifdef DBG_UTIL
         OStringBuffer aErrorStr(
             "BitmapEx::BitmapEx(): could not load image <");
-        aErrorStr.append(OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append("> via icon theme ");
+        aErrorStr.append(OUStringToOString(rIconName, RTL_TEXTENCODING_ASCII_US)).append("> via icon theme ");
         aErrorStr.append(OUStringToOString(aIconTheme, RTL_TEXTENCODING_ASCII_US)).append('.');
         OSL_FAIL(aErrorStr.getStr());
 #endif
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index 453033f..7be39e6 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -2297,6 +2297,12 @@ bool WinSalGraphicsImpl::drawAlphaBitmap(
     return false;
 }
 
+bool WinSalGraphicsImpl::drawAlphaBitmap( const SalTwoRect& /*rTR*/,
+    const SalBitmap& /*rBitmap*/ )
+{
+    return false;
+}
+
 bool WinSalGraphicsImpl::drawTransformedBitmap(
     const basegfx::B2DPoint& rNull,
     const basegfx::B2DPoint& rX,
diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx
index 2a0780f..cfef58a 100644
--- a/vcl/win/source/gdi/gdiimpl.hxx
+++ b/vcl/win/source/gdi/gdiimpl.hxx
@@ -189,6 +189,11 @@ public:
                 const SalBitmap& rSourceBitmap,
                 const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
 
+    /** Render 32-bits bitmap with alpha channel */
+    virtual bool drawAlphaBitmap(
+                const SalTwoRect&,
+                const SalBitmap& rBitmap ) SAL_OVERRIDE;
+
     /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the coordinate system */
     virtual bool drawTransformedBitmap(
                 const basegfx::B2DPoint& rNull,