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

[Michael Jaumann]

 canvas/source/opengl/ogl_canvascustomsprite.cxx |    1 -
 canvas/source/opengl/ogl_renderHelper.cxx       |    2 +-
 canvas/source/opengl/ogl_renderHelper.hxx       |    6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 90bf2ef6bd1ef90111dc8e4655b52307bcbbbf15
Author: Michael Jaumann <meta_dev at yahoo.com>
Date:   Wed Oct 22 09:21:27 2014 +0000

    moving includes
    
    Change-Id: I2101d84a74a7f2b5dd06c546b9618e537b39ed36

diff --git a/canvas/source/opengl/ogl_renderHelper.cxx b/canvas/source/opengl/ogl_renderHelper.cxx
index c3d6a87..5447a54 100644
--- a/canvas/source/opengl/ogl_renderHelper.cxx
+++ b/canvas/source/opengl/ogl_renderHelper.cxx
@@ -1,12 +1,12 @@
 #include <GL/glew.h>
 #include "ogl_renderHelper.hxx"
+#include <vcl/opengl/OpenGLHelper.hxx>
 namespace oglcanvas
 {
     RenderHelper::RenderHelper()
     {
         InitOpenGL();
     }
-
     void RenderHelper::InitOpenGL()
     {
         //Load Shaders //
diff --git a/canvas/source/opengl/ogl_renderHelper.hxx b/canvas/source/opengl/ogl_renderHelper.hxx
index 60698ce..454b3ff 100644
--- a/canvas/source/opengl/ogl_renderHelper.hxx
+++ b/canvas/source/opengl/ogl_renderHelper.hxx
@@ -1,5 +1,4 @@
 #include <GL/glew.h>
-#include <vcl/opengl/OpenGLHelper.hxx>
 namespace oglcanvas
 {
     class RenderHelper
commit f24e4c52d503ecfe5c884206dc742b35f65ef12a
Author: Michael Jaumann <meta_dev at yahoo.com>
Date:   Wed Oct 22 09:14:33 2014 +0000

    fixes a ressource leak
    
    Change-Id: I7a27be09e377c2c6306e768dbaf8e8239da2c86e

diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index a9c127b..812ab73 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -47,7 +47,6 @@ namespace oglcanvas
         ::canvas::tools::setIdentityAffineMatrix2D(maTransformation);
         maCanvasHelper.init( *rRefDevice.get(),
                              rDeviceHelper );
-        mRenderHelper =  RenderHelper();
     }
 
     void CanvasCustomSprite::disposeThis()
diff --git a/canvas/source/opengl/ogl_renderHelper.hxx b/canvas/source/opengl/ogl_renderHelper.hxx
index ea368a7..60698ce 100644
--- a/canvas/source/opengl/ogl_renderHelper.hxx
+++ b/canvas/source/opengl/ogl_renderHelper.hxx
@@ -5,12 +5,15 @@ namespace oglcanvas
     class RenderHelper
     {
     public:
-        RenderHelper();
+
         void renderVertexConstColor(GLfloat vertices[] , GLfloat color[4], GLenum mode) const ;
         void renderVertexUVTex(GLfloat vertices[], GLfloat uvCoordinates[], GLfloat color[4], GLenum mode) const ;
         void renderVertexTex(GLfloat vertices[], GLfloat, GLfloat, GLfloat color[4], GLenum mode) const;
         void dispose();
+        RenderHelper();
     private:
+        RenderHelper&  operator = (const RenderHelper& other);
+        RenderHelper(const RenderHelper& other);
         void  InitOpenGL();
         GLuint                                            m_vertexBuffer;
         GLuint                                            m_uvBuffer;