diff options
| author | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
| commit | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch) | |
| tree | 23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/llimage/llimagej2c.cpp | |
| parent | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff) | |
| parent | fcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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) { |