livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-3913 FIXED User is not able to upload any type of image(*.png, *.tga,*.bmp,*.jpg)

meow-7.2.2
Mnikolenko ProductEngine 2014-04-04 16:28:36 +03:00
parent 93f7ac98b6
commit f8a43c4815
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llimage/llimage.cpp
View File

@ -1493,7 +1493,7 @@ void LLImageFormatted::sanityCheck()
BOOL LLImageFormatted::copyData(U8 *data, S32 size)
{
if ( data && getData() && ((data != getData()) || (size != getDataSize())) )
if ( data && ((data != getData()) || (size != getDataSize())) )
{
deleteData();
allocateData(size);

7
indra/llimage/llimagepng.cpp
View File

@ -94,13 +94,6 @@ BOOL LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time)
return FALSE;
}
// Check to make sure that this instance has been initialized with data
if (!raw_image->getData())
{
setLastError("LLImagePNG trying to decode an image into unallocated LLImageRaw!");
return FALSE;
}
// Decode the PNG data into the raw image
LLPngWrapper pngWrapper;
if (!pngWrapper.isValidPng(getData()))