epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix Convert::fromStringArray

Browse Source 
destination should grow to fit
This commit is contained in:
Michael Davidsaver
2013-07-16 10:48:01 -04:00
parent 2e3cbed520
commit 6e3a344caa
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pvDataApp/factory/Convert.cpp
View File

@@ -114,13 +114,20 @@ size_t Convert::fromStringArray(PVScalarArrayPtr const &pv,
StringArray const & from,
size_t fromOffset)
{
assert(offset==0);
size_t alen = pv->getLength();
if(fromOffset>alen) return 0;
alen -= fromOffset;
if(length>alen) length=alen;
pv->copyIn<pvString>(&from[fromOffset], length);
return length;
if(offset==0 && length>=alen) {
// replace all existing elements
assert(from.size()>=fromOffset+length);
if(length>alen)
pv->setLength(length);
pv->copyIn<pvString>(&from[fromOffset], length);
return length;
} else {
// partial update.
throw std::runtime_error("fromStringArray: partial update not implemented");
}
}
size_t Convert::toStringArray(PVScalarArrayPtr const & pv,