OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Allow pfJournalBook to load png files from local path (internal)

Browse Source
This commit is contained in:
Florian Meissner
2011-08-25 16:36:53 +02:00
parent 14d6f51943
commit 8512049ca8
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
View File

@ -2478,6 +2478,7 @@ void pfJournalBook::IFreeSource( void )
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
#include "plJPEG/plJPEG.h" #include "plJPEG/plJPEG.h"
#include "plGImage/plPNG.h"
#endif #endif
plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc ) plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc )
@ -2486,12 +2487,22 @@ plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
if( strchr( cName, '/' ) != nil || strchr( cName, '\\' ) != nil ) if( strchr( cName, '/' ) != nil || strchr( cName, '\\' ) != nil )
{ {
// For internal use only--we allow local path names of JPEG images, to // For internal use only--allow local path names of PNG and JPEG images, to
// facilitate fast prototyping // facilitate fast prototyping
plMipmap *mip = plJPEG::Instance().ReadFromFile( cName ); if( strchr( cName, '.png' ) != nil )
hsgResMgr::ResMgr()->NewKey( cName, mip, loc ); {
delete [] cName; plMipmap *mip = plPNG::Instance().ReadFromFile( cName );
return mip->GetKey(); hsgResMgr::ResMgr()->NewKey( cName, mip, loc );
delete [] cName;
return mip->GetKey();
}
else
{
plMipmap *mip = plJPEG::Instance().ReadFromFile( cName );
hsgResMgr::ResMgr()->NewKey( cName, mip, loc );
delete [] cName;
return mip->GetKey();
}
} }
#endif #endif