Browse Source

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

NadnerbD 13 years ago
parent
commit
c9b4c0a92d
  1. 10
      Sources/Plasma/FeatureLib/pfPython/pyImage.cpp

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

@ -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);

Loading…
Cancel
Save