vcl/opengl/FixedTextureAtlas.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a7e2d4923b220900f41d0b70904377c771939e6f
Author: krishna keshav <princy.krishnakes...@gmail.com>
Date: Sun May 29 21:04:41 2016 +0530
tdf#94205 Use o3tl::make_unique instead of new + std::move
removed std::unique_ptr and std::move to make_unique in
vcl/opengl/FixedTextureAtlas.cxx
Change-Id: I7cbff152c3daae68a18ec08607cac030a1f4af8e
Reviewed-on: https://gerrit.libreoffice.org/25613
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/opengl/FixedTextureAtlas.cxx b/vcl/opengl/FixedTextureAtlas.cxx
index 87c5bb1..420121d 100644
--- a/vcl/opengl/FixedTextureAtlas.cxx
+++ b/vcl/opengl/FixedTextureAtlas.cxx
@@ -17,6 +17,8 @@
#include "opengl/FixedTextureAtlas.hxx"
+#include <o3tl/make_unique.hxx>
+
struct FixedTexture
{
ImplOpenGLTexture* mpTexture;
@@ -83,11 +85,9 @@ void FixedTextureAtlasManager::CreateNewTexture()
{
int nTextureWidth = mWidthFactor * mSubTextureSize;
int nTextureHeight = mHeightFactor * mSubTextureSize;
- std::unique_ptr<FixedTexture> pFixedTexture(
- new FixedTexture(new
ImplOpenGLTexture(nTextureWidth, nTextureHeight, true),
+ maFixedTextures.push_back(o3tl::make_unique<FixedTexture>(new
ImplOpenGLTexture(nTextureWidth, nTextureHeight, true),
mWidthFactor * mHeightFactor));
- maFixedTextures.push_back(std::move(pFixedTexture));
}
OpenGLTexture FixedTextureAtlasManager::Reserve(int nWidth, int nHeight)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
