Commit adf44a8b authored by Mark Winter's avatar Mark Winter

Merge remote-tracking branch opensource/master into master

parents 3b1e2cfc 7452e45d
Pipeline #223 skipped
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
{
"name" : "LEVER",
"majorVersion" : 7,
"minorVersion" : 14,
"minorVersion" : 14.1,
"branchName" : "master",
"buildNumber" : "2016.07.13.19",
"buildNumber" : "2016.07.21.18",
"buildMachine" : "bioimage28",
"commitHash" : [
"lever.git : 927f1b2f5e7c61457c5a923cdf82875a876659f9",
"lever.git : cfbead4e27c205b02d82b3a8cb4760873d1d7073",
"utilities.git : 0112a311096593ddeb888a58c8f0c6e3982340bb"
]
}
......@@ -104,8 +104,8 @@ void loadDists(const mxArray* ccDists)
for (int j = 0; j < m ; j++)
{
int nextHull = (int)(distPairs[j*2]);
double dist = distPairs[j*2+1];
int nextHull = MatToC((int)(distPairs[j]));
double dist = distPairs[j+m];
ccDistMap[i].insert(std::pair<int, double>(nextHull,dist));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment