OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

NewKey can take a plString, so no need to convert to const char*

Browse Source
This commit is contained in:
NadnerbD
2012-02-12 01:58:37 -05:00
parent 0bede93022
commit c9b4c0a92d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
View File

@ -200,12 +200,9 @@ PyObject* pyImage::LoadJPEGFromDisk(const wchar_t* filename, uint16_t width, uin
} }
// let's create a nice name for this thing based on the filename // let's create a nice name for this thing based on the filename
plString name = _TEMP_CONVERT_FROM_LITERAL("PtImageFromDisk_"); plString name = plString::Format("PtImageFromDisk_%s", hsWStringToString(filename));
char* filetext = hsWStringToString(filename);
name = name + filetext;
delete[] filetext;
hsgResMgr::ResMgr()->NewKey(name.c_str(), theMipmap, plLocation::kGlobalFixedLoc); hsgResMgr::ResMgr()->NewKey(name, theMipmap, plLocation::kGlobalFixedLoc);
return pyImage::New( theMipmap ); return pyImage::New( theMipmap );
} }
@ -227,7 +224,8 @@ PyObject* pyImage::LoadPNGFromDisk(const wchar_t* filename, uint16_t width, uint
} }
} }
name += plString::FromWchar(i); // let's create a nice name for this thing based on the filename
plString name = plString::Format("PtImageFromDisk_%s", hsWStringToString(filename));
hsgResMgr::ResMgr()->NewKey(name, theMipmap, plLocation::kGlobalFixedLoc); hsgResMgr::ResMgr()->NewKey(name, theMipmap, plLocation::kGlobalFixedLoc);