diff options
| author | David Tardon <dtardon@redhat.com> | 2016-12-01 08:57:46 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-12-02 15:17:52 +0100 |
| commit | 8ca055f56ffbc3229c211903adb9fee7049385cf (patch) | |
| tree | e00092c9e9402df165e1846a02ea0e1574e80798 /slideshow | |
| parent | 9d902e264f8535fcf54cca6044f7bc32a60579b4 (diff) | |
rename to avoid further misunderstandings
Change-Id: Ibcfae1b3ec118d74921312a80eb56c97c623f4a9
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index a2b11c34c949..d1faed2e8a3a 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -111,7 +111,7 @@ static std::vector<int> uploadPrimitives(const Primitives_t& primitives) { int size = 0; for (const Primitive& primitive: primitives) - size += primitive.getVerticesSize(); + size += primitive.getVerticesByteSize(); CHECK_GL_ERROR(); glBufferData(GL_ARRAY_BUFFER, size, nullptr, GL_STATIC_DRAW); @@ -1998,7 +1998,7 @@ void GlitterTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int3 // Upload the center of each hexagon. const Primitive& primitive = getScene().getLeavingSlide()[0]; - int nbVertices = primitive.getVerticesSize() / sizeof(Vertex); + int nbVertices = primitive.getVerticesByteSize() / sizeof(Vertex); std::vector<ThreeFloats> vertices; for (int i = 2; i < nbVertices; i += 18) { const glm::vec3& center = primitive.getVertex(i); diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx index 66ecb6b61a0c..3f8449508dea 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.hxx +++ b/slideshow/source/engine/opengl/TransitionImpl.hxx @@ -340,7 +340,7 @@ public: @return the size in bytes of the Vertices data */ - int getVerticesSize() const {return Vertices.size() * sizeof(Vertex);} + int getVerticesByteSize() const {return Vertices.size() * sizeof(Vertex);} /** copies all vertices to the C array passed |