Browse Source

This should have been reviewed better

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

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

@ -2489,20 +2489,15 @@ 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

Loading…
Cancel
Save