Sync LLImageJ2C for upcoming fix with LL

Wed, 06 Dec 2017 16:57:08 +0100

author
Ansariel
date
Wed, 06 Dec 2017 16:57:08 +0100
changeset 53550
a3c8abf0690b
parent 53549
f1882a9c40a6
child 53551
e1eaaa165f25

Sync LLImageJ2C for upcoming fix with LL

indra/llimage/llimagej2c.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llimage/llimagej2c.cpp	Wed Dec 06 16:40:58 2017 +0100
     1.2 +++ b/indra/llimage/llimagej2c.cpp	Wed Dec 06 16:57:08 2017 +0100
     1.3 @@ -374,11 +374,6 @@
     1.4  	else
     1.5  	{
     1.6  		U8 *data = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), file_size);
     1.7 -		if(!data)
     1.8 -		{
     1.9 -			LL_WARNS() << "couldn't allocate memory for loading file: " << filename << " size: " << file_size << LL_ENDL;
    1.10 -			return FALSE;
    1.11 -		}
    1.12  		apr_size_t bytes_read = file_size;
    1.13  		apr_status_t s = apr_file_read(apr_file, data, &bytes_read); // modifies bytes_read	
    1.14  		infile.close() ;

mercurial