From a5cb8fdbee72b5522975373eebde12aaeb832f19 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 6 Dec 2017 16:57:08 +0100 Subject: [PATCH] Sync LLImageJ2C for upcoming fix with LL --- indra/llimage/llimagej2c.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 43d6f730ff..1ee6deaa87 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -374,11 +374,6 @@ bool LLImageJ2C::loadAndValidate(const std::string &filename) else { U8 *data = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), file_size); - if(!data) - { - LL_WARNS() << "couldn't allocate memory for loading file: " << filename << " size: " << file_size << LL_ENDL; - return FALSE; - } apr_size_t bytes_read = file_size; apr_status_t s = apr_file_read(apr_file, data, &bytes_read); // modifies bytes_read infile.close() ;