[pprepair] 03/08: Imported Upstream version 0.0~20150323-6284890

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pprepair.

commit 028f0a1ee695056447fb766e93c62b77166a6015
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 23 22:51:50 2015 +0200

    Imported Upstream version 0.0~20150323-6284890
---
 FaceInfo.cpp | 1 +
 IOWorker.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/FaceInfo.cpp b/FaceInfo.cpp
index 5d00963..f586924 100644
--- a/FaceInfo.cpp
+++ b/FaceInfo.cpp
@@ -59,6 +59,7 @@ unsigned int FaceInfo::numberOfTags() const {
 
 void FaceInfo::addTag(PolygonHandle *handle) {
 	if (tag == NULL) tag = handle;
+  else if (hasTag(handle)) return;
 	else if (tag->isMultiPolygonHandle()) static_cast<MultiPolygonHandle *>(tag)->addHandle(handle);
 	else if (tag != handle) {
 		MultiPolygonHandle *multiTag = new MultiPolygonHandle(tag);
diff --git a/IOWorker.cpp b/IOWorker.cpp
index e551328..fac4f1c 100644
--- a/IOWorker.cpp
+++ b/IOWorker.cpp
@@ -1879,7 +1879,7 @@ void IOWorker::tagStack(std::stack<Triangulation::Face_handle> &stack, PolygonHa
 	while (!stack.empty()) {
 		Triangulation::Face_handle currentFace = stack.top();
 		stack.pop();
-		currentFace->info().addTag(handle);
+//		currentFace->info().addTag(handle);
 		if (!currentFace->neighbor(0)->info().hasTag(handle) && !currentFace->is_constrained(0)) {
 			currentFace->neighbor(0)->info().addTag(handle);
 			stack.push(currentFace->neighbor(0));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pprepair.git