diff options
| -rwxr-xr-x | indra/llimage/llimage.cpp | 2 | ||||
| -rwxr-xr-x | indra/llimage/llimagepng.cpp | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 55609deb2b..183620f9bc 100755 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -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); diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp index 525aa8d78c..294f68b122 100755 --- a/indra/llimage/llimagepng.cpp +++ b/indra/llimage/llimagepng.cpp @@ -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())) |