zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add filename to error-message when jpg-loading fails. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4169 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2012-05-25 10:32:38 +00:00
parent fb80ea202c
commit 17de62ac84
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/Irrlicht/CImageLoaderJPG.cpp
View File

@ -16,6 +16,9 @@ namespace irr
namespace video
{
// Static members
io::path CImageLoaderJPG::Filename;
//! constructor
CImageLoaderJPG::CImageLoaderJPG()
{
@ -107,7 +110,9 @@ void CImageLoaderJPG::output_message(j_common_ptr cinfo)
// display the error message.
c8 temp1[JMSG_LENGTH_MAX];
(*cinfo->err->format_message)(cinfo, temp1);
os::Printer::log("JPEG FATAL ERROR",temp1, ELL_ERROR);
core::stringc errMsg("JPEG FATAL ERROR in ");
errMsg += core::stringc(Filename);
os::Printer::log(errMsg.c_str(),temp1, ELL_ERROR);
}
#endif // _IRR_COMPILE_WITH_LIBJPEG_
@ -133,9 +138,15 @@ bool CImageLoaderJPG::isALoadableFileFormat(io::IReadFile* file) const
IImage* CImageLoaderJPG::loadImage(io::IReadFile* file) const
{
#ifndef _IRR_COMPILE_WITH_LIBJPEG_
os::Printer::log("Can't load as not compiled with _IRR_COMPILE_WITH_LIBJPEG_:", file->getFileName(), ELL_DEBUG);
return 0;
#else
if (!file)
return 0;
Filename = file->getFileName();
u8 **rowPtr=0;
u8* input = new u8[file->getSize()];
file->read(input, file->getSize());

3
source/Irrlicht/CImageLoaderJPG.h
View File

@ -100,6 +100,9 @@ private:
data has been read. Often a no-op. */
static void term_source (j_decompress_ptr cinfo);
// Copy filename to have it around for error-messages
static io::path Filename;
#endif // _IRR_COMPILE_WITH_LIBJPEG_
};