Browse Source

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

Florian Meissner 14 years ago
parent
commit
8512049ca8
  1. 13
      Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

13
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

@ -2478,6 +2478,7 @@ void pfJournalBook::IFreeSource( void )
#ifndef PLASMA_EXTERNAL_RELEASE
#include "plJPEG/plJPEG.h"
#include "plGImage/plPNG.h"
#endif
plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc )
@ -2486,13 +2487,23 @@ plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc
#ifndef PLASMA_EXTERNAL_RELEASE
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
if( strchr( cName, '.png' ) != nil )
{
plMipmap *mip = plPNG::Instance().ReadFromFile( cName );
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
// Try first to find in the given location

Loading…
Cancel
Save