[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/opengl

Michael Meeks michael.meeks at collabora.com
Fri Nov 7 06:33:44 PST 2014


 vcl/opengl/gdiimpl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9084d7be36f3955725e2395ae176d2af1ceac358
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Nov 7 14:33:48 2014 +0000

    vcl: vertically invert line and point positions
    
    Change-Id: I306e44cfe287b573c9664662c170f96d3fb09e6a

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 6d794ef..2d520ea 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -252,7 +252,7 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
     GLushort pPoint[2];
 
     pPoint[0] = nX;
-    pPoint[1] = nY;
+    pPoint[1] = GetHeight() - nY;
 
     glEnableVertexAttribArray( GL_ATTRIB_POS );
     glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_UNSIGNED_SHORT, GL_FALSE, 0, pPoint );
@@ -265,9 +265,9 @@ void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
     GLfloat pPoints[4];
 
     pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
-    pPoints[1] = (2 * nY1) / GetHeight() - 1.0;
+    pPoints[1] = (2 * (GetHeight() - nY1)) / GetHeight() - 1.0;
     pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
-    pPoints[3] = (2 * nY2) / GetHeight() - 1.0;
+    pPoints[3] = (2 * (GetHeight() - nY2)) / GetHeight() - 1.0;
 
     glEnableVertexAttribArray( GL_ATTRIB_POS );
     glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_FLOAT, GL_FALSE, 0, pPoints );


More information about the Libreoffice-commits mailing list