[Libreoffice-commits] core.git: chart2/source

[Fridrich Å trba]

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

New commits:
commit 38deb7e53b01e3636b8049ba016f4cb903526ad4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 19 12:36:26 2014 +0200

    Fix chart2 with system libglm (explicit constructors)
    
    Change-Id: I582095b6b47eaff7800f6aaa68f176f06d64a34e

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index e8ac3ac..6cdb5fd 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -108,7 +108,7 @@ int OpenGLRender::InitOpenGL()
 
     //Init the Projection matrix
     m_Projection = glm::ortho(0.f, float(m_iWidth), -float(m_iHeight), 0.f, -1.f, 1.f);
-    m_Projection = m_Projection * glm::scale(1.0f, -1.0f, 1.0f);
+    m_Projection = m_Projection * glm::scale(glm::vec3(1.0f, -1.0f, 1.0f));
     m_View       = glm::lookAt(glm::vec3(0,0,1), // Camera is at (4,3,-3), in World Space
                                glm::vec3(0,0,0), // and looks at the origin
                                glm::vec3(0,1,0)  // Head is up (set to 0,-1,0 to look upside-down)
@@ -358,7 +358,7 @@ void OpenGLRender::SetSize(int width, int height)
     m_iWidth = width;
     m_iHeight = height;
     m_Projection = glm::ortho(0.f, float(m_iWidth), -float(m_iHeight), 0.f, -4.f, 3.f);
-    m_Projection = m_Projection * glm::scale(1.0f, -1.0f, 1.0f);
+    m_Projection = m_Projection * glm::scale(glm::vec3(1.0f, -1.0f, 1.0f));
 }
 
 void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b, sal_uInt8 nAlpha)