diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-06 16:20:21 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-06 16:20:21 -0700 |
| commit | 611d8bdf6155f6c7b440ab745f197d278a74b209 (patch) | |
| tree | 15664a307f5a269671c209759e5a64580b386be4 /indra/llimage/llimagej2c.cpp | |
| parent | 4de6759cd9d566ab92f0d9efa0c0338359dfa85c (diff) | |
use the private pool in the texture pipeline
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 c8c866b7f2..0a13372b07 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -471,14 +471,14 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename) } else { - U8 *data = new U8[file_size]; + U8 *data = (U8*)allocateMemory(file_size); apr_size_t bytes_read = file_size; apr_status_t s = apr_file_read(apr_file, data, &bytes_read); // modifies bytes_read infile.close() ; if (s != APR_SUCCESS || (S32)bytes_read != file_size) { - delete[] data; + deleteMemory(data); setLastError("Unable to read entire file"); res = FALSE; } |
