get vertices count without jumping through hoops

Change-Id: I0cab6b2f9fffc8cf9fc5059b8dc48fa9407e42b5

2 files changed, 8 insertions, 2 deletions

diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx
index d1faed2e8a3a..df753c6a784b 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -1998,9 +1998,8 @@ void GlitterTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int3
 
     // Upload the center of each hexagon.
     const Primitive& primitive = getScene().getLeavingSlide()[0];
-    int nbVertices = primitive.getVerticesByteSize() / sizeof(Vertex);
     std::vector<ThreeFloats> vertices;
-    for (int i = 2; i < nbVertices; i += 18) {
+    for (int i = 2; i < primitive.getVerticesCount(); i += 18) {
         const glm::vec3& center = primitive.getVertex(i);
         for (int j = 0; j < 18; ++j)
             vertices.push_back({center.x, center.y, center.z});
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx
index 3f8449508dea..f27fd7743e72 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -33,6 +33,7 @@
 
 #include <GL/glew.h>
 
+#include <limits>
 #include <memory>
 #include <vector>
 
@@ -335,6 +336,12 @@ public:
     */
     const glm::vec3& getVertex(int n) const {return Vertices[n].position;}
 
+    int getVerticesCount() const
+    {
+        assert(Vertices.size() < std::numeric_limits<int>::max());
+        return int(unsigned(Vertices.size()));
+    }
+
     /** accessor for the size of the vertices data
 
         @return