summaryrefslogtreecommitdiff
path: root/goodies
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-08-03 10:53:12 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-08-03 10:53:12 +0000
commit249ba671243d58fce77f55ffba01a75f1705f0dc (patch)
treed6473dd80b3988be8591e996fe2ba7f597e373ca /goodies
parent9f4cd73dda40b70b7811332e1350d34ac46f972b (diff)
INTEGRATION: CWS thbpp8 (1.10.42); FILE MERGED
2007/07/05 09:57:58 thb 1.10.42.1: #i79079# Moved resource dealloc to correct place
Diffstat (limited to 'goodies')
-rw-r--r--goodies/source/base3d/b3dtex.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/goodies/source/base3d/b3dtex.cxx b/goodies/source/base3d/b3dtex.cxx
index 08f0bfdb458b..c0ae040a36e7 100644
--- a/goodies/source/base3d/b3dtex.cxx
+++ b/goodies/source/base3d/b3dtex.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: b3dtex.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: vg $ $Date: 2007-02-05 12:51:00 $
+ * last change: $Author: hr $ $Date: 2007-08-03 11:53:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1304,13 +1304,12 @@ void B3dTextureOpenGL::CreateOpenGLTexture(OpenGL& rOpenGL)
rtl_freeMemory(pBuffer);
}
-
- // Lesezugriff freigeben
- aLocalBitmap.ReleaseAccess(pLocalReadAccess);
- if(bUsesAlpha)
- aTransAlphaMask.ReleaseAccess(pLocalAlphaReadAccess);
}
+ // Lesezugriff freigeben
+ if (pLocalReadAccess) aLocalBitmap.ReleaseAccess(pLocalReadAccess);
+ if (pLocalAlphaReadAccess) aTransAlphaMask.ReleaseAccess(pLocalAlphaReadAccess);
+
// Hinweis auf Veraenderung der Texturart auf jeden Fall elliminieren
bTextureKindChanged = sal_False;
}