diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-18 22:29:02 +0300 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-18 22:29:02 +0300 |
| commit | c43cfcdcbd243410e2f780f58f93100e96fc996c (patch) | |
| tree | d5daa0187843a9302c1011937d452d40692d0d1a /indra/llimage/llimage.cpp | |
| parent | c0b60841ce14a1c449ede17284d2aa6939322be3 (diff) | |
| parent | f9c068462f379a4678e59090a066cfa173504c6b (diff) | |
merge into latest changes
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 6775b005f4..825878c5ef 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1660,6 +1660,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) { |