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

Compilation fixes

This commit is contained in:
Mael Rouxel-Labbé 2020-06-25 18:20:52 +02:00
parent e5655f7d29
commit 50e3a838f3
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mesh_3/include/CGAL/IO/File_tetgen.h
View File

@ -17,10 +17,11 @@
#include <CGAL/Time_stamper.h>
#include <CGAL/IO/File_medit.h>
#include <CGAL/utility.h>
#include <fstream>
#include <iostream>
#include <string>
#include <CGAL/utility.h>
namespace CGAL {

8
Point_set_3/examples/Point_set_3/point_set_advanced.cpp
View File

@ -1,6 +1,7 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Point_set_3.h>
#include <CGAL/IO/read_points.h>
#include <fstream>
#include <limits>
@ -18,10 +19,11 @@ int main (int argc, char** argv)
Point_set point_set;
point_set.add_normal_map();
// Reading input in OFF format
if(!CGAL::read_point_set(filename, point_set.index_back_inserter(),
CGAL::parameters::point_map(point_set.point_push_map())
.normal_map(point_set.normal_push_map())))
if(!CGAL::read_points(filename, point_set.index_back_inserter(),
CGAL::parameters::point_map(point_set.point_push_map())
.normal_map(point_set.normal_push_map())))
{
std::cerr << "Can't read input file " << std::endl;
return EXIT_FAILURE;

3
Stream_support/include/CGAL/IO/OBJ/File_writer_wavefront.h
View File

@ -17,8 +17,9 @@
#ifndef CGAL_IO_OBJ_FILE_WRITER_WAVEFRONT_H
#define CGAL_IO_OBJ_FILE_WRITER_WAVEFRONT_H
#include <CGAL/IO/Color.h>
#include <CGAL/IO/io.h>
#include <fstream>
#include <iostream>
namespace CGAL {

1
Stream_support/include/CGAL/IO/OFF.h
View File

@ -11,6 +11,7 @@
#ifndef CGAL_IO_OFF_H
#define CGAL_IO_OFF_H
#include <CGAL/IO/OFF/Scanner_OFF.h>
#include <CGAL/IO/OFF/File_scanner_OFF.h>
#include <CGAL/IO/OFF/File_writer_OFF.h>
#include <CGAL/IO/helpers.h>

3
Stream_support/include/CGAL/IO/OFF/Scanner_OFF.h
View File

@ -19,11 +19,12 @@
#define CGAL_IO_OFF_SCANNER_OFF_H 1
#include <CGAL/basic.h>
#include <CGAL/IO/OFF/File_scanner_OFF.h>
#include <iterator>
#include <vector>
#include <utility>
#include <limits>
#include <CGAL/IO/OFF/File_scanner_OFF.h>
namespace CGAL {

24
Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_Surface_mesh.cpp
View File

@ -7,16 +7,15 @@
typedef CGAL::Simple_cartesian<double> Kernel;
typedef Kernel::Point_3 Point_3;
typedef CGAL::Surface_mesh<Point_3> Mesh;
typedef Kernel::Point_3 Point_3;
typedef CGAL::Surface_mesh<Point_3> Mesh;
typedef boost::graph_traits<Mesh>::vertex_descriptor vertex_descriptor;
typedef boost::graph_traits<Mesh>::vertex_iterator vertex_iterator;
typedef boost::graph_traits<Mesh>::halfedge_descriptor halfedge_descriptor;
typedef boost::graph_traits<Mesh>::edge_descriptor edge_descriptor;
typedef boost::graph_traits<Mesh>::vertex_descriptor vertex_descriptor;
typedef boost::graph_traits<Mesh>::vertex_iterator vertex_iterator;
typedef boost::graph_traits<Mesh>::halfedge_descriptor halfedge_descriptor;
typedef boost::graph_traits<Mesh>::edge_descriptor edge_descriptor;
typedef Eigen::Vector3d Vector3d;
typedef Eigen::Vector3d Vector3d;
typedef CGAL::Surface_mesh_deformation<Mesh> Surface_mesh_deformation;
@ -45,12 +44,13 @@ std::vector<vertex_descriptor> extract_k_ring(const Mesh &P, vertex_descriptor v
return Q;
}
int main()
int main(int argc, char** argv)
{
Mesh mesh;
std::ifstream input("data/plane.off");
const char* filename = (argc>1) ? argv[1] : "data/plane.off";
if ( !input || !(input >> mesh) || mesh.is_empty() ) {
Mesh mesh;
if(!CGAL::read_polygon_mesh(filename, mesh))
{
std::cerr<< "Cannot open data/plane.off";
return 1;
}