[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - slideshow/source

[Caolán McNamara]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f87ed463dabb2600de8600fd84c18c8cb867e643
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 30 14:22:53 2016 +0000

    glDrawArrays takes num of indices, not size of storage
    
    this stops the strange missing corner seen during the diamond
    transition
    
    (cherry picked from commit 579feb4d841ea80de699f4124378d0701034833e)
    Reviewed-on: https://gerrit.libreoffice.org/31426
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 75627b4dc1a821142419ed50d247c2d0e621c78b)
    
    Change-Id: If806a0a3303eb38644bb6d3a479cadbd5fe9ca25
    Reviewed-on: https://gerrit.libreoffice.org/31544
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 669f68a..8b508c6 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -366,7 +366,7 @@ void Primitive::display(GLint primitiveTransformLocation, double nTime, double W
     CHECK_GL_ERROR();
     glVertexPointer( 3, GL_FLOAT, sizeof(Vertex), &Vertices[0] );
     CHECK_GL_ERROR();
-    glDrawArrays( GL_TRIANGLES, 0, getVerticesSize() );
+    glDrawArrays( GL_TRIANGLES, 0, Vertices.size() );
     CHECK_GL_ERROR();
     glPopClientAttrib();