diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
| commit | cf35d27dfb86a8a8d8223bc344f35984efaa7b98 (patch) | |
| tree | 883758ee1282e0936343ec27d80d25329aae9242 /indra/llimage/llimage.cpp | |
| parent | 199775b7ac214cfc3492c343c3f6046effcde7ed (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
DRTVWR-546 merge up to 6.5.2
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rw-r--r-- | indra/llimage/llimage.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 2bf5f5492e..15b07e5318 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -2219,20 +2219,11 @@ bool LLImageFormatted::save(const std::string &filename) return true; } -// bool LLImageFormatted::save(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type) -// Depricated to remove VFS dependency. -// Use: -// LLVFile::writeFile(image->getData(), image->getDataSize(), vfs, uuid, type); - -//---------------------------------------------------------------------------- - S8 LLImageFormatted::getCodec() const { return mCodec; } -//============================================================================ - static void avg4_colors4(const U8* a, const U8* b, const U8* c, const U8* d, U8* dst) { dst[0] = (U8)(((U32)(a[0]) + b[0] + c[0] + d[0])>>2); |
