[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Dec 23 19:51:47 PST 2013


 chart2/source/view/main/OpenGLRender.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 25158c98a003318ed7d52bf3478a095045f81944
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Dec 24 04:50:42 2013 +0100

    fix regression from last warning cleaning
    
    Change-Id: Id4f758a6d27670ff03d4e0c32a45ca66cc74d0c6

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 92489c3..2ff2017 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -654,19 +654,19 @@ int OpenGLRender::RenderLine2FBO(int wholeFlag)
     BitmapEx aBmp;
     aBmp.SetSizePixel(Size(m_iWidth, m_iHeight));
 
-    Bitmap aBitmap( aBmp.GetBitmap() );
-    Bitmap aAlpha( aBmp.GetAlpha().GetBitmap() );
+    Bitmap aBitmap( Size( m_iWidth, m_iHeight), 24 );
+    Bitmap aAlpha( Size( m_iWidth, m_iHeight), 24 );
 
     Bitmap::ScopedWriteAccess pWriteAccess( aBitmap );
     Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha );
 
     size_t nCurPos = 0;
-    for( int y = 0; y < m_iHeight; ++y)
+    for( size_t y = 0; y < m_iHeight; ++y)
     {
         Scanline pScan = pWriteAccess->GetScanline(y);
         Scanline pAlphaScan = pAlphaWriteAccess->GetScanline(y);
 
-        for( int x = 0; x < m_iWidth; ++x )
+        for( size_t x = 0; x < m_iWidth; ++x )
         {
             *pScan++ = buf[nCurPos];
             *pScan++ = buf[nCurPos+1];


More information about the Libreoffice-commits mailing list