From a7e2d4923b220900f41d0b70904377c771939e6f Mon Sep 17 00:00:00 2001 From: krishna keshav Date: Sun, 29 May 2016 21:04:41 +0530 Subject: 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 Reviewed-by: Stephan Bergmann --- vcl/opengl/FixedTextureAtlas.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/opengl') diff --git a/vcl/opengl/FixedTextureAtlas.cxx b/vcl/opengl/FixedTextureAtlas.cxx index 87c5bb1ff2ac..420121d91475 100644 --- a/vcl/opengl/FixedTextureAtlas.cxx +++ b/vcl/opengl/FixedTextureAtlas.cxx @@ -17,6 +17,8 @@ #include "opengl/FixedTextureAtlas.hxx" +#include + struct FixedTexture { ImplOpenGLTexture* mpTexture; @@ -83,11 +85,9 @@ void FixedTextureAtlasManager::CreateNewTexture() { int nTextureWidth = mWidthFactor * mSubTextureSize; int nTextureHeight = mHeightFactor * mSubTextureSize; - std::unique_ptr pFixedTexture( - new FixedTexture(new ImplOpenGLTexture(nTextureWidth, nTextureHeight, true), + maFixedTextures.push_back(o3tl::make_unique(new ImplOpenGLTexture(nTextureWidth, nTextureHeight, true), mWidthFactor * mHeightFactor)); - maFixedTextures.push_back(std::move(pFixedTexture)); } OpenGLTexture FixedTextureAtlasManager::Reserve(int nWidth, int nHeight) -- cgit