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

More crash fixes. Fuck you OpenJPEG. Fuck you where it hurts.

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-26 22:34:10 -04:00
parent 15d74dc41a
commit 8c23e3bdea
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llimage/llimagej2c.cpp
View File

@@ -252,7 +252,9 @@ BOOL LLImageJ2C::updateData()
}
else
{
res = mImpl->getMetadata(*this);
if (mImpl)
res = mImpl->getMetadata(*this);
else res = FALSE;
}
if (res)
@@ -480,7 +482,8 @@ BOOL LLImageJ2C::validate(U8 *data, U32 file_size)
}
else
{
res = mImpl->getMetadata(*this);
if (mImpl)
res = mImpl->getMetadata(*this);
}
}

6
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -113,6 +113,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
//
// FIXME: Get the comment field out of the texture
//
if (!base.getData()) return FALSE;
LLTimer decode_timer;
@@ -153,6 +154,8 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
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 (!dinfo) return FALSE;
image = opj_decode(dinfo, cio);
/* close the byte stream */
@@ -415,6 +418,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
//
// FIXME: We get metadata by decoding the ENTIRE image.
//
if (!base.getData()) return FALSE;
// Update the raw discard level
base.updateRawDiscardLevel();
@@ -459,6 +463,8 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
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 (!dinfo) return FALSE;
image = opj_decode(dinfo, cio);
/* close the byte stream */

10
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -1076,10 +1076,10 @@ Unable to write file [[FILE]]
icon="alertmodal.tga"
name="UnsupportedHardware"
type="alertmodal">
Warning: Your system does not meet Ascent's minimum system requirements. If you continue using Snowglobe, you may experience poor performance. Unfortunately, we cannot provide technical support for unsupported system configurations.
Warning: Your system does not meet Ascent's minimum system requirements. If you continue using Ascent, you may experience poor performance. Unfortunately, we cannot provide technical support for unsupported system configurations.
MINSPECS
Do you wish to visit [_URL] for more information?
MINSPECS
Do you wish to visit [_URL] for more information?
<url option="0" name="url">
http://www.secondlife.com/corporate/sysreqs.php
@@ -6529,9 +6529,9 @@ The URL you clicked cannot be opened from this web browser.
</global>
<global name="UnsupportedGLRequirements">
You do not appear to have the proper hardware requirements for Snowglobe. Snowglobe requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
You do not appear to have the proper hardware requirements for Ascent. Ascent requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
If you continue to have problems, please visit: http://www.secondlife.com/support
If you continue to have problems, please visit: http://www.secondlife.com/support
</global>
<global name="UnsupportedCPUAmount">