diff options
author | Jacek Antonelli | 2008-08-15 23:45:38 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:38 -0500 |
commit | d7f00c03e236098b10ad5e30d35a0f159eb17255 (patch) | |
tree | d45c68b3a638b0545c88c1f644a6b9a689ce58e0 /linden/indra/llimage/llimage.h | |
parent | Second Life viewer sources 1.19.1.2 (diff) | |
download | meta-impy-d7f00c03e236098b10ad5e30d35a0f159eb17255.zip meta-impy-d7f00c03e236098b10ad5e30d35a0f159eb17255.tar.gz meta-impy-d7f00c03e236098b10ad5e30d35a0f159eb17255.tar.bz2 meta-impy-d7f00c03e236098b10ad5e30d35a0f159eb17255.tar.xz |
Second Life viewer sources 1.19.1.3
Diffstat (limited to 'linden/indra/llimage/llimage.h')
-rw-r--r-- | linden/indra/llimage/llimage.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h index 8546303..199dc07 100644 --- a/linden/indra/llimage/llimage.h +++ b/linden/indra/llimage/llimage.h | |||
@@ -101,9 +101,10 @@ public: | |||
101 | S8 getComponents() const { return mComponents; } | 101 | S8 getComponents() const { return mComponents; } |
102 | S32 getDataSize() const { return mDataSize; } | 102 | S32 getDataSize() const { return mDataSize; } |
103 | 103 | ||
104 | const U8 *getData() const { return mData; } // read only | 104 | const U8 *getData() const ; |
105 | U8 *getData() { return mData; } | 105 | U8 *getData() ; |
106 | 106 | BOOL isBufferInvalid() ; | |
107 | |||
107 | void setSize(S32 width, S32 height, S32 ncomponents); | 108 | void setSize(S32 width, S32 height, S32 ncomponents); |
108 | U8* allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 size = -1); // setSize() + allocateData() | 109 | U8* allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 size = -1); // setSize() + allocateData() |
109 | 110 | ||
@@ -133,6 +134,8 @@ private: | |||
133 | 134 | ||
134 | S8 mComponents; | 135 | S8 mComponents; |
135 | 136 | ||
137 | BOOL mBadBufferAllocation ; | ||
138 | |||
136 | public: | 139 | public: |
137 | S16 mMemType; // debug | 140 | S16 mMemType; // debug |
138 | 141 | ||