From 8512049ca8028d84cfb953081c476c289efb34ed Mon Sep 17 00:00:00 2001 From: Florian Meissner Date: Thu, 25 Aug 2011 16:36:53 +0200 Subject: [PATCH] Allow pfJournalBook to load png files from local path (internal) --- .../pfJournalBook/pfJournalBook.cpp | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp index 554a9e84..5548dd14 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp +++ b/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,12 +2487,22 @@ 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 - plMipmap *mip = plJPEG::Instance().ReadFromFile( cName ); - hsgResMgr::ResMgr()->NewKey( cName, mip, loc ); - delete [] cName; - return mip->GetKey(); + 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