aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-20 03:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2017-01-10 15:09:55 +02:00
commit ab5aa5b2c4
2 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
code/nel/src/gui/group_html.cpp
View file

@ -587,6 +587,13 @@ namespace NLGUI
// there is race condition if two browser instances are downloading same file // there is race condition if two browser instances are downloading same file
// second instance deletes first tmpfile and creates new file for itself. // second instance deletes first tmpfile and creates new file for itself.
if (CFile::getFileSize(tmpfile) > 0) 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); CFile::moveFile(it->dest, tmpfile);
for(uint i = 0; i < it->imgs.size(); i++) 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 else
{ {
CFile::moveFile(it->dest, tmpfile); CFile::moveFile(it->dest, tmpfile);
@ -4177,11 +4191,19 @@ namespace NLGUI
if (!reloadImg && lookupLocalFile (finalUrl, image.c_str(), false)) if (!reloadImg && lookupLocalFile (finalUrl, image.c_str(), false))
{ {
// don't display image that are not power of 2 // don't display image that are not power of 2
try
{
uint32 w, h; uint32 w, h;
CBitmap::loadSize (image, w, h); CBitmap::loadSize (image, w, h);
if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures())) if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
image = "web_del.tga"; image = "web_del.tga";
} }
catch(const NLMISC::Exception &e)
{
nlwarning(e.what());
image = "web_del.tga";
}
}
else else
{ {
// //
@ -4375,12 +4397,20 @@ namespace NLGUI
addImageDownload(normalBitmap, ctrlButton, style); addImageDownload(normalBitmap, ctrlButton, style);
} }
else else
{
try
{ {
uint32 w, h; uint32 w, h;
CBitmap::loadSize(normal, w, h); CBitmap::loadSize(normal, w, h);
if (w == 0 || h == 0) if (w == 0 || h == 0)
normal = "web_del.tga"; normal = "web_del.tga";
} }
catch(const NLMISC::Exception &e)
{
nlwarning(e.what());
normal = "web_del.tga";
}
}
} }
} }

2
code/nel/src/misc/bitmap_gif.cpp
View file

@ -65,7 +65,7 @@ static int readGIFData(GifFileType *gif, GifByteType *data, int length)
} }
catch(...) catch(...)
{ {
nlwarning("error while reading JPEG image"); nlwarning("error while reading GIF image");
return 0; return 0;
} }