diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-10-17 12:36:11 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-10-17 12:36:11 -0700 |
| commit | 4d807ba638cea8898beed5ca8e7e1951adb962bb (patch) | |
| tree | f997e76de0e514cf11974848684e4b3f9e424172 /indra/llimage/llimage.cpp | |
| parent | 161c848e3d78a1ec6265b33b3d9f999dd11126f9 (diff) | |
| parent | 8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff) | |
Merge in upstream fixes
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rw-r--r-- | indra/llimage/llimage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 4999f9886d..a88ac148ef 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1582,6 +1582,12 @@ static void avg4_colors2(const U8* a, const U8* b, const U8* c, const U8* d, U8* dst[1] = (U8)(((U32)(a[1]) + b[1] + c[1] + d[1])>>2); } +void LLImageBase::setDataAndSize(U8 *data, S32 size) +{ + ll_assert_aligned(data, 16); + mData = data; mDataSize = size; +} + //static void LLImageBase::generateMip(const U8* indata, U8* mipdata, S32 width, S32 height, S32 nchannels) { |