songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update namespace

This commit is contained in:
Mael Rouxel-Labbé 2020-02-20 11:17:02 +01:00
parent 3bbc07ebf5
commit 9424714ee8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Polyhedron_IO/include/CGAL/IO/OFF_reader.h
View File

@ -14,12 +14,14 @@
#include <CGAL/IO/File_scanner_OFF.h> #include <CGAL/IO/File_scanner_OFF.h>
#include <CGAL/IO/reader_helpers.h> #include <CGAL/IO/reader_helpers.h>
#include <vector>
#include <iostream>
#include <CGAL/array.h> #include <CGAL/array.h>
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
#include <CGAL/Container_helper.h>
#include <CGAL/use.h> #include <CGAL/use.h>
#include <vector>
#include <iostream>
namespace CGAL { namespace CGAL {
template <class Point_3, class Polygon_3> template <class Point_3, class Polygon_3>
@ -47,7 +49,7 @@ namespace CGAL {
std::size_t no; std::size_t no;
scanner.scan_facet( no, i); scanner.scan_facet( no, i);
IO::internal::resize(polygons[i], no); CGAL::internal::resize(polygons[i], no);
for(std::size_t j = 0; j < no; ++j) { for(std::size_t j = 0; j < no; ++j) {
std::size_t id; std::size_t id;
scanner.scan_facet_vertex_index(id, i); scanner.scan_facet_vertex_index(id, i);
@ -114,7 +116,7 @@ namespace CGAL {
scanner.scan_facet( no, i); scanner.scan_facet( no, i);
if(!in) if(!in)
return false; return false;
IO::internal::resize(polygons[i], no); CGAL::internal::resize(polygons[i], no);
for(std::size_t j = 0; j < no; ++j) { for(std::size_t j = 0; j < no; ++j) {
std::size_t id; std::size_t id;
scanner.scan_facet_vertex_index(id, i); scanner.scan_facet_vertex_index(id, i);

6
Polyhedron_IO/include/CGAL/IO/STL_reader.h
View File

@ -15,6 +15,8 @@
#include <CGAL/IO/io.h> #include <CGAL/IO/io.h>
#include <CGAL/IO/reader_helpers.h> #include <CGAL/IO/reader_helpers.h>
#include <CGAL/Container_helper.h>
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
#include <cctype> #include <cctype>
@ -43,7 +45,7 @@ bool read_ASCII_facet(std::istream& input,
double x,y,z; double x,y,z;
Point p; Point p;
Triangle ijk; Triangle ijk;
IO::internal::resize(ijk, 3); CGAL::internal::resize(ijk, 3);
while(input >> s) while(input >> s)
{ {
@ -213,7 +215,7 @@ bool parse_binary_STL(std::istream& input,
} }
Triangle ijk; Triangle ijk;
IO::internal::resize(ijk, 3); CGAL::internal::resize(ijk, 3);
for(int j=0; j<3; ++j) for(int j=0; j<3; ++j)
{ {