Merge from Dev

[nodtem66]

No description provided.

[todo]

remove this debug message

Scaffolder/include/OptimalSlice.hpp

Lines 615 to 620 in 31610ab

	/* TODO: remove this debug message
	for (ContourHash::const_iterator item = hash.begin(); item != hash.end(); item++) {
	std::cout << " " << item->first << ": " << item->second << (item->second.first == item->second.second ? " [***]" : "") << std::endl;
	//std::cout << " " << item->first << ": " << std::hash<Point2d>()(item->first) << std::endl;
	}
	//*/

---

This comment was generated by todo based on a TODO comment in 31610ab in #4. cc @nodtem66.

[todo]

fixed this bugs

Scaffolder/include/OptimalSlice.hpp

Lines 694 to 699 in 31610ab

	// TODO: fixed this bugs
	if (item == hash.end()) {
	CS[i].clear();
	break;
	}
	assert(item != hash.end());

---

This comment was generated by todo based on a TODO comment in 31610ab in #4. cc @nodtem66.

[todo]

change to TBB parallel for

Scaffolder/include/OptimalSlice.hpp

Lines 1135 to 1140 in 31610ab

	// TODO: change to TBB parallel for
	#ifndef USE_PARALLEL
	for (size_t cs_index = 0, cs_size = CS.size(); cs_index < cs_size; cs_index++) {
	#else
	static tbb::affinity_partitioner ap;
	tbb::spin_mutex feretMutex, shapeMutex;

---

This comment was generated by todo based on a TODO comment in 31610ab in #4. cc @nodtem66.

[nodtem66]

Fine