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

Stephan Bergmann sbergman at redhat.com
Wed Aug 26 05:41:55 PDT 2015


 vcl/opengl/salbmp.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 975a2bccd9ba4d651dfe76e58b8a23fb10775c04
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 26 14:41:31 2015 +0200

    -Werror,-Wpessimizing-move
    
    Change-Id: Ifb2647b928446f720e93d2d4e4c5ffb1ee7a14c9

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 2e45d73..d6e51d9 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -330,11 +330,11 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const int nWidth, const int
     {
         if (sTextureAtlases.empty())
         {
-            sTextureAtlases.push_back(std::move(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 16))));
-            sTextureAtlases.push_back(std::move(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 24))));
-            sTextureAtlases.push_back(std::move(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 32))));
-            sTextureAtlases.push_back(std::move(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 48))));
-            sTextureAtlases.push_back(std::move(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 64))));
+            sTextureAtlases.push_back(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 16)));
+            sTextureAtlases.push_back(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 24)));
+            sTextureAtlases.push_back(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 32)));
+            sTextureAtlases.push_back(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 48)));
+            sTextureAtlases.push_back(std::unique_ptr<FixedTextureAtlasManager>(new FixedTextureAtlasManager(8, 8, 64)));
         }
         for (size_t i = 0; i < sTextureAtlases.size(); i++)
         {


More information about the Libreoffice-commits mailing list