diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:36:54 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:36:54 -0400 |
| commit | ed50235528e90747cbc2e558d73d6d93d56d188e (patch) | |
| tree | 80f3ff1ed5753a1eacfb70279d39cbf850482f81 /indra/llimage/llimagej2c.cpp | |
| parent | 0a4b187301e1d5521dda7d2f157a94f02d597365 (diff) | |
| parent | 4ac1b64665a49c7121411f3db27718f0c37eaf33 (diff) | |
reconciled .hgtags
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) { |