Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whole bunch of crash fixes and compiler junk.

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-29 00:40:22 -04:00
parent 5fc9867f8b
commit ae4dcc283c
5 changed files with 502 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -115,6 +115,8 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
//
if (!base.getData()) return FALSE;
if (!base.getDataSize()) return FALSE;
if (!raw_image.getData()) return FALSE;
if (!raw_image.getDataSize()) return FALSE;
LLTimer decode_timer;
@@ -156,6 +158,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
/* decode the stream and fill the image structure */
if (!cio) return FALSE;
if (cio->bp == NULL) return FALSE;
if (!dinfo) return FALSE;
image = opj_decode(dinfo, cio);
@@ -463,9 +466,10 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
/* open a byte stream */
cio = opj_cio_open((opj_common_ptr)dinfo, base.getData(), base.getDataSize());
/* decode the stream and fill the image structure */
if (!cio) return FALSE;
if (cio->bp == NULL) return FALSE;
if (!dinfo) return FALSE;
image = opj_decode(dinfo, cio);