[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/source

Michael Jaumann meta_dev at yahoo.com
Mon Mar 2 03:47:06 PST 2015


 canvas/source/opengl/ogl_canvastools.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 1ff87af2bb8939562c8735056a6c6010ee7d76ab
Author: Michael Jaumann <meta_dev at yahoo.com>
Date:   Mon Mar 2 08:37:57 2015 +0000

    unecessary check, will be covered before
    
    Change-Id: Idcad49eae7ae1ab272babec6dc8b00e8e55f275e

diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx
index 3c09f96..6490cff 100644
--- a/canvas/source/opengl/ogl_canvastools.cxx
+++ b/canvas/source/opengl/ogl_canvastools.cxx
@@ -48,8 +48,7 @@ namespace oglcanvas
                 vertices.push_back(glm::vec2(rPt.getX(),rPt.getY()));
             }
 
-            if(vertices.size() !=0)
-                renderHelper->renderVertexConstColor(vertices, color, GL_TRIANGLES);
+            renderHelper->renderVertexConstColor(vertices, color, GL_TRIANGLES);
         }
     }
 
@@ -73,8 +72,7 @@ namespace oglcanvas
                 const ::basegfx::B2DPoint& rPt( rTriangulatedPolygon.getB2DPoint(i) );
                 vertices.push_back(glm::vec2(rPt.getX(),rPt.getY()));
             }
-            if(vertices.size()!=0)
-                renderHelper->renderTextureTransform( vertices, nWidth, nHeight,  color, GL_TRIANGLES, transform);
+            renderHelper->renderTextureTransform( vertices, nWidth, nHeight,  color, GL_TRIANGLES, transform);
         }
     }
 
@@ -104,8 +102,7 @@ namespace oglcanvas
                     const ::basegfx::B2DPoint& rPt( rPolygon.getB2DPoint( j % nPts ) );
                     vertices.push_back(glm::vec2(rPt.getX(),rPt.getY()));
                 }
-                if(vertices.size()!=0)
-                    renderHelper->renderVertexConstColor(vertices, color, GL_LINE_STRIP);
+                renderHelper->renderVertexConstColor(vertices, color, GL_LINE_STRIP);
             }
         }
 


More information about the Libreoffice-commits mailing list