From 3c10f6db7925f55e7f3c3884038b37724628a20c Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Tue, 23 Jun 2009 17:39:14 +0000 Subject: [PATCH] Build fixes after the 2.8->trunk forward port. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/graphicc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index aa3269a4c8..70cd642a7d 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1022,7 +1022,7 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm int bh = bmp.GetHeight(); wxBitmap bmpSource = bmp; // we need a non-const instance m_buffer = new unsigned char[bw*bh*4]; - wxUint32* data = (wxUint32*)buffer; + wxUint32* data = (wxUint32*)m_buffer; // Create a surface object and copy the bitmap pixel data to it. if the // image has alpha (or a mask represented as alpha) then we'll use a @@ -1376,7 +1376,7 @@ void wxCairoContext::PopState() void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp); - DrawGraphicsBitmapInternal(bitmap, x, y, w, h); + DrawBitmap(bitmap, x, y, w, h); }