diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 11:45:42 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 11:45:42 -0400 |
commit | 4dd15ae27d1216044da57455eaa2a4832f86915f (patch) | |
tree | 277056b7e3c98a3f4305c1a3553ee0ee18a8eb1c /indra/llimage/llimagej2c.cpp | |
parent | d65d451448573f95b065a9be7c88ff239d5ed8be (diff) | |
parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) |
merge
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
-rw-r--r-- | indra/llimage/llimagej2c.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 8c5dc63e9d..cc8cb66d73 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -29,6 +29,7 @@ #include "llmemtype.h" #include "lltimer.h" #include "llmath.h" +#include "llmemory.h" typedef LLImageJ2CImpl* (*CreateLLImageJ2CFunction)(); typedef void (*DestroyLLImageJ2CFunction)(LLImageJ2CImpl*); @@ -370,7 +371,8 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename) resetLastError(); S32 file_size = 0; - LLAPRFile infile(filename, LL_APR_RB, &file_size); + LLAPRFile infile ; + infile.open(filename, LL_APR_RB, NULL, &file_size); apr_file_t* apr_file = infile.getFileHandle() ; if (!apr_file) { |