diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 11:50:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 11:50:48 +0000 |
| commit | 00ad8fda569d8138123b1b128fa8b9a418ff19fc (patch) | |
| tree | a6933cfdb0e799a7b28a16ab9afa558a23313ced /goodies | |
| parent | 19edcb2bab4bb5c2cef1231d508523fbf5542232 (diff) | |
INTEGRATION: CWS thbpp6v2 (1.7.42); FILE MERGED
2007/01/27 21:40:25 thb 1.7.42.2: RESYNC: (1.7-1.8); FILE MERGED
2007/01/17 11:17:47 thb 1.7.42.1: #i72893# Caching bitmap size in Base3DTexture now
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/inc/b3dtex.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/goodies/inc/b3dtex.hxx b/goodies/inc/b3dtex.hxx index 10744dcb5b2d..f924064b00a8 100644 --- a/goodies/inc/b3dtex.hxx +++ b/goodies/inc/b3dtex.hxx @@ -4,9 +4,9 @@ * * $RCSfile: b3dtex.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2007-01-22 15:08:16 $ + * last change: $Author: vg $ $Date: 2007-02-05 12:50:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -248,10 +248,7 @@ protected: // Die Bitmap(s) der Textur Bitmap aBitmap; AlphaMask aAlphaMask; - - // #i72895# - Size maBitmapSize; - + Size aBitmapSize; BitmapReadAccess* pReadAccess; BitmapReadAccess* pAlphaReadAccess; @@ -317,7 +314,7 @@ public: BitmapEx GetBitmapEx() { return BitmapEx(aBitmap, aAlphaMask); } // #i72895# - const Size GetBitmapSize() { return maBitmapSize; } + const Size GetBitmapSize() { return aBitmapSize; } // Texturfunktion void ModifyColor(Color& rCol, double fS, double fT); |