mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
ab5aa5b2c4
2 changed files with 41 additions and 11 deletions
|
@ -587,6 +587,13 @@ namespace NLGUI
|
|||
// there is race condition if two browser instances are downloading same file
|
||||
// second instance deletes first tmpfile and creates new file for itself.
|
||||
if (CFile::getFileSize(tmpfile) > 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
// verify that image is not corrupted
|
||||
uint32 w, h;
|
||||
CBitmap::loadSize(tmpfile, w, h);
|
||||
if (w != 0 && h != 0)
|
||||
{
|
||||
CFile::moveFile(it->dest, tmpfile);
|
||||
for(uint i = 0; i < it->imgs.size(); i++)
|
||||
|
@ -596,6 +603,13 @@ namespace NLGUI
|
|||
}
|
||||
}
|
||||
}
|
||||
catch(const NLMISC::Exception &e)
|
||||
{
|
||||
// exception message has .tmp file name, so keep it for further analysis
|
||||
nlwarning("Invalid image (%s): %s", it->url.c_str(), e.what());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
CFile::moveFile(it->dest, tmpfile);
|
||||
|
@ -4177,11 +4191,19 @@ namespace NLGUI
|
|||
if (!reloadImg && lookupLocalFile (finalUrl, image.c_str(), false))
|
||||
{
|
||||
// don't display image that are not power of 2
|
||||
try
|
||||
{
|
||||
uint32 w, h;
|
||||
CBitmap::loadSize (image, w, h);
|
||||
if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
|
||||
image = "web_del.tga";
|
||||
}
|
||||
catch(const NLMISC::Exception &e)
|
||||
{
|
||||
nlwarning(e.what());
|
||||
image = "web_del.tga";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//
|
||||
|
@ -4375,12 +4397,20 @@ namespace NLGUI
|
|||
addImageDownload(normalBitmap, ctrlButton, style);
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
uint32 w, h;
|
||||
CBitmap::loadSize(normal, w, h);
|
||||
if (w == 0 || h == 0)
|
||||
normal = "web_del.tga";
|
||||
}
|
||||
catch(const NLMISC::Exception &e)
|
||||
{
|
||||
nlwarning(e.what());
|
||||
normal = "web_del.tga";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ static int readGIFData(GifFileType *gif, GifByteType *data, int length)
|
|||
}
|
||||
catch(...)
|
||||
{
|
||||
nlwarning("error while reading JPEG image");
|
||||
nlwarning("error while reading GIF image");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue