diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-17 21:13:37 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-17 21:13:37 (GMT) |
| commit | 6d70855a4d92a7aafbc21fdd97c570e9ef227182 (patch) | |
| tree | cf5c3ff4d89e8e6aa5863c7c2fe2035981bc0929 /tests/csgtermtest.cc | |
| parent | 78bf15d0858ca6ed892872d1cd08c9ef4b8ae63b (diff) | |
added png and image comparison, enabling testing on linux
Diffstat (limited to 'tests/csgtermtest.cc')
| -rw-r--r-- | tests/csgtermtest.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index f23ec70..eec5d4b 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -144,17 +144,11 @@ int main(int argc, char **argv) // cout << tree.getString(*root_node) << "\n"; -<<<<<<< HEAD - CSGTermEvaluator evaluator(tree); - vector<CSGTerm*> empty = vector<CSGTerm*>(); - CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, empty, empty); -======= vector<CSGTerm*> highlights; vector<CSGTerm*> background; PolySetEvaluator psevaluator(tree); CSGTermEvaluator evaluator(tree, &psevaluator); CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background); ->>>>>>> upstream/visitor // cout << "Stored terms: " << evaluator.stored_term.size() << "\n"; // for (map<int, class CSGTerm*>::iterator iter = evaluator.stored_term.begin(); |