[Libreoffice-commits] core.git: Branch 'private/moggi/fix-opengl-backend' - chart2/source

[Markus Mohrhard]

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

New commits:
commit 2882fd318387c0458671dc4db56fe003eba60844
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed Jan 1 22:41:15 2014 +0100

    fix temp
    
    Change-Id: I47c78cb86b97f2fa87efc3552b1c0fe9ca2242dd

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index fe16400..14cd9c3 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -534,20 +534,19 @@ void OpenGLRender::renderToBitmap()
 {
     if (m_iArbMultisampleSupported)
     {
+        GLenum status;
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
         glBindFramebuffer(GL_READ_FRAMEBUFFER, m_frameBufferMS);
         status = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
         if (status != GL_FRAMEBUFFER_COMPLETE)
         {
             cout << "The frame buffer status is not complete!" << endl;
-            return -1;
         }
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FboID[m_iFboIdx % 2]);
         status = glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
         if (status != GL_FRAMEBUFFER_COMPLETE)
         {
             cout << "The frame buffer status is not complete!" << endl;
-            return -1;
         }
         glBlitFramebuffer(0, 0 ,m_iWidth, m_iHeight, 0, 0,m_iWidth ,m_iHeight, 
GL_COLOR_BUFFER_BIT, GL_LINEAR);
         glBindFramebuffer(GL_READ_FRAMEBUFFER,0);
@@ -1169,7 +1168,6 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y, 
float directionX, float d
 
 int OpenGLRender::RenderBubble2FBO(int)
 {
-    GLenum status;
     int listNum = m_Bubble2DShapePointList.size();
     for (int i = 0; i < listNum; i++)
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits