From 0214aa8ce427905477602dbf1d55278c4959fcac Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Tue, 10 May 2016 20:01:29 +0900 Subject: opengl: Check if texture is valid before asking for Id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6482ca005df385d79bcd55f3b1db3559021ab371 Reviewed-on: https://gerrit.libreoffice.org/24835 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl --- vcl/inc/opengl/AccumulatedTextures.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/inc/opengl/AccumulatedTextures.hxx b/vcl/inc/opengl/AccumulatedTextures.hxx index bc40c48f3ab0..882a69476db5 100644 --- a/vcl/inc/opengl/AccumulatedTextures.hxx +++ b/vcl/inc/opengl/AccumulatedTextures.hxx @@ -90,11 +90,11 @@ public: bool insert(OpenGLTexture& rTexture, const SalColor& aColor, const SalTwoRect& r2Rect) { - GLuint nTextureId = rTexture.Id(); - if (!rTexture) return false; + GLuint nTextureId = rTexture.Id(); + if (maEntries.find(nTextureId) == maEntries.end()) { OpenGLTexture aWholeTexture(rTexture.GetWholeTexture()); -- cgit fice-5-1'>distro/cib/libreoffice-5-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author