diff options
| author | Michael Jaumann <meta_dev@yahoo.com> | 2015-02-11 12:13:10 +0000 |
|---|---|---|
| committer | Michael Jaumann <meta_dev@yahoo.com> | 2015-03-02 12:42:53 +0000 |
| commit | e95240946c615bd7ebc3bcd6335ab93704734939 (patch) | |
| tree | c3d1bf0a0d8b7b370734d29c752b8ade33e2fcca | |
| parent | c5ad876695951a0df58446ff03b81129ee65c1eb (diff) | |
removed unnecessary conversion
Change-Id: Id5c1c7d9d26bb74d34a652655ddac8dae7568a41
| -rw-r--r-- | canvas/source/opengl/ogl_canvastools.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx index eacac6beb94b..6490cff5bdf0 100644 --- a/canvas/source/opengl/ogl_canvastools.cxx +++ b/canvas/source/opengl/ogl_canvastools.cxx @@ -112,16 +112,14 @@ namespace oglcanvas GLenum eSrcBlend, GLenum eDstBlend) { - float aGLTransform[] = - { + const glm::mat4 aGLTransform = glm::mat4( (float) rTransform.get(0,0), (float) rTransform.get(1,0), 0, 0, (float) rTransform.get(0,1), (float) rTransform.get(1,1), 0, 0, 0, 0, 1, 0, - (float) rTransform.get(0,2), (float) rTransform.get(1,2), 0, 1 - }; + (float) rTransform.get(0,2), (float) rTransform.get(1,2), 0, 1); glEnable(GL_BLEND); glBlendFunc(eSrcBlend, eDstBlend); - return glm::make_mat4(aGLTransform); + return aGLTransform; } void renderOSD( const std::vector<double>& rNumbers, double scale, RenderHelper *renderHelper) |