vcl/opengl/gdiimpl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 3ac975dded6df870969f68ec00e8f3097c5146bf Author: Michael Meeks <michael.me...@collabora.com> Date: Fri Jan 1 12:38:37 2016 +0000 Fix drawTransformedBitmap for NULL pAlphaBitmap #2. Change-Id: Ie4d03a01c557e93a3ba3b5925896e38ed07f9a27 diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 7c6664b..c39d25e 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -1880,7 +1880,7 @@ bool OpenGLSalGraphicsImpl::drawTransformedBitmap( const SalBitmap* pAlphaBitmap) { assert(dynamic_cast<const OpenGLSalBitmap*>(&rSrcBitmap)); - assert(dynamic_cast<const OpenGLSalBitmap*>(pAlphaBitmap)); + assert(!pAlphaBitmap || dynamic_cast<const OpenGLSalBitmap*>(pAlphaBitmap)); OpenGLZone aZone; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits