Browse Source

This should have been reviewed better

Michael Hansen 13 years ago
parent
commit
6ec190f526
  1. 15
      Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

15
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

@ -2489,21 +2489,16 @@ plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc
{ {
// For internal use only--allow local path names of PNG and JPEG images, to // For internal use only--allow local path names of PNG and JPEG images, to
// facilitate fast prototyping // facilitate fast prototyping
if( strchr( cName, '.png' ) != nil ) plMipmap *mip;
{ if( strstr( cName, ".png" ) != nil )
plMipmap *mip = plPNG::Instance().ReadFromFile( cName ); mip = plPNG::Instance().ReadFromFile( cName );
hsgResMgr::ResMgr()->NewKey( cName, mip, loc );
delete [] cName;
return mip->GetKey();
}
else else
{ mip = plJPEG::Instance().ReadFromFile( cName );
plMipmap *mip = plJPEG::Instance().ReadFromFile( cName );
hsgResMgr::ResMgr()->NewKey( cName, mip, loc ); hsgResMgr::ResMgr()->NewKey( cName, mip, loc );
delete [] cName; delete [] cName;
return mip->GetKey(); return mip->GetKey();
} }
}
#endif #endif
// Try first to find in the given location // Try first to find in the given location

Loading…
Cancel
Save