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 /src/export.cc | |
| parent | 78bf15d0858ca6ed892872d1cd08c9ef4b8ae63b (diff) | |
added png and image comparison, enabling testing on linux
Diffstat (limited to 'src/export.cc')
| -rw-r--r-- | src/export.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/export.cc b/src/export.cc index 9c23600..6c427dd 100644 --- a/src/export.cc +++ b/src/export.cc @@ -53,17 +53,6 @@ void export_stl(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDial setlocale(LC_NUMERIC, "C"); // Ensure radix is . (not ,) in output -<<<<<<< HEAD - std::ofstream output(filename.toUtf8()); - if (!output.is_open()) { - PRINTA("Can't open STL file \"%1\" for STL export: %2", - filename, QString(strerror(errno))); - set_output_handler(NULL, NULL); - return; - } - -======= ->>>>>>> upstream/visitor output << "solid OpenSCAD_Model\n"; int facet_count = 0; @@ -122,10 +111,6 @@ void export_stl(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDial } output << "endsolid OpenSCAD_Model\n"; -<<<<<<< HEAD - output.close(); -======= ->>>>>>> upstream/visitor setlocale(LC_NUMERIC, ""); // Set default locale } |