[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/opengl

[Tomaž Vajngerl]

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

New commits:
commit 94281392a898d492811e7f6d30c62f63aad98b84
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Mon Jul 6 20:06:31 2015 +0900

    opengl: adjust rect drawing - should be to width (height) - 1
    
    Might be the cause of Rectangle implementation of GetWidth and
    GetHeight which is different to other programs.
    
    X11 backend compensates in the same way for this use case.
    
    Change-Id: Ibc3c1d6f442d616c64b602cccb601bfc33fd4baf
    (cherry picked from commit a1385d37e9ffc84b82e9ee11e505bba6273823dc)
    Reviewed-on: https://gerrit.libreoffice.org/16918
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 3ab4e09..7fe13ce 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1197,8 +1197,8 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeigh
     {
         GLfloat fX1 = OPENGL_COORD_X(nX);
         GLfloat fY1 = OPENGL_COORD_Y(nY);
-        GLfloat fX2 = OPENGL_COORD_X(nX + nWidth);
-        GLfloat fY2 = OPENGL_COORD_Y(nY + nHeight);
+        GLfloat fX2 = OPENGL_COORD_X(nX + nWidth - 1);
+        GLfloat fY2 = OPENGL_COORD_Y(nY + nHeight - 1);
 
         GLfloat pPoints[16];