Second Life viewer sources 1.23.0-RC

1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index fe5d656..1b93c21 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -418,7 +419,9 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
         resetLastError();
 
         S32 file_size = 0;
-        apr_file_t* apr_file = ll_apr_file_open(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)
         {
                 setLastError("Unable to open file for reading", filename);
@@ -427,7 +430,6 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
         else if (file_size == 0)
         {
                 setLastError("File is empty",filename);
-                apr_file_close(apr_file);
                 res = FALSE;
         }
         else
@@ -435,7 +437,8 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
                 U8 *data = new U8[file_size];
                 apr_size_t bytes_read = file_size;
                 apr_status_t s = apr_file_read(apr_file, data, &bytes_read); // modifies bytes_read     
-                apr_file_close(apr_file);
+                infile.close() ;
+
                 if (s != APR_SUCCESS || (S32)bytes_read != file_size)
                 {
                         delete[] data;
@@ -447,7 +450,7 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
                         res = validate(data, file_size);
                 }
         }
-
+        
         if (!mLastError.empty())
         {
                 LLImage::setLastError(mLastError);