diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
| commit | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch) | |
| tree | 2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/llimage/llimage.cpp | |
| parent | 6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff) | |
| parent | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rw-r--r-- | indra/llimage/llimage.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 825878c5ef..916c346b7a 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -292,11 +292,16 @@ LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) ++sRawImageCount; } -LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components) +LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components, bool no_copy) : LLImageBase() { mMemType = LLMemType::MTYPE_IMAGERAW; - if(allocateDataSize(width, height, components)) + + if(no_copy) + { + setDataAndSize(data, width, height, components); + } + else if(allocateDataSize(width, height, components)) { memcpy(getData(), data, width*height*components); } |