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

Rene Engelhard rene at debian.org
Sat Oct 4 03:38:55 PDT 2014


 chart2/source/view/main/OpenGLRender.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit afcb935c935077d9a23a3b140374f8fece7cdf54
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Oct 4 09:57:04 2014 +0000

    fix chart2 build with system-glm again
    
    Change-Id: Iaf40444cef56362e84c72c27328d5ad228c648ac

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 204b2e8..c16bb02 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -352,7 +352,7 @@ void OpenGLRender::SetSize(int width, int height)
 void OpenGLRender::SetSizePixel(int width, int height)
 {
     m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight), -4.f, 3.f);
-    m_Projection = m_Projection * glm::scale((float)width / m_iWidth, -(float)height / m_iHeight, 1.0f);
+    m_Projection = m_Projection * glm::scale(glm::vec3((float)width / m_iWidth, -(float)height / m_iHeight, 1.0f));
 
     m_View       = glm::lookAt(glm::vec3(0,m_iHeight,1),
                                glm::vec3(0,m_iHeight,0),


More information about the Libreoffice-commits mailing list