diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-01-30 14:03:26 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-01-30 14:03:26 +0000 |
| commit | 6e445e82e2a1c1559be5193cd2c131c5f1207f55 (patch) | |
| tree | ba6610b440ae0792539e79f053b086aac0a95ecc /indra/llimage/llimagej2c.cpp | |
| parent | b0dedf0b68ab47f6926f9b5d60ea05a1ef68eedf (diff) | |
MAINT-8091 Removed deprecated and unused private memory pooling
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
| -rw-r--r-- | indra/llimage/llimagej2c.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index c40df009d8..4bff21610f 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -368,7 +368,7 @@ bool LLImageJ2C::loadAndValidate(const std::string &filename) } else { - U8 *data = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), file_size); + U8 *data = (U8*)ll_aligned_malloc_16(file_size); if (!data) { infile.close(); @@ -383,7 +383,7 @@ bool LLImageJ2C::loadAndValidate(const std::string &filename) if (s != APR_SUCCESS || (S32)bytes_read != file_size) { - FREE_MEM(LLImageBase::getPrivatePool(), data); + ll_aligned_free_16(data); setLastError("Unable to read entire file"); res = false; } |