mirror of https://github.com/CGAL/cgal
Fixes
This commit is contained in:
parent
016adaa2a9
commit
7cfb944afb
|
|
@ -40,7 +40,7 @@ int main(int argc, char** argv)
|
||||||
//testing reading functions.
|
//testing reading functions.
|
||||||
if(!CGAL::read_3MF(filename, meshes))
|
if(!CGAL::read_3MF(filename, meshes))
|
||||||
return 1;
|
return 1;
|
||||||
for(int i = 0; i< meshes.size(); ++i)
|
for(std::size_t i = 0; i< meshes.size(); ++i)
|
||||||
{
|
{
|
||||||
Mesh mesh = meshes[i];
|
Mesh mesh = meshes[i];
|
||||||
std::cout<<"mesh "<<i<<" is valid: "<<mesh.is_valid()<<std::endl;
|
std::cout<<"mesh "<<i<<" is valid: "<<mesh.is_valid()<<std::endl;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ void dump (const char* filename, const std::vector<Point_with_info>& points)
|
||||||
{
|
{
|
||||||
std::ofstream ofile (filename, std::ios::binary);
|
std::ofstream ofile (filename, std::ios::binary);
|
||||||
CGAL::set_binary_mode(ofile);
|
CGAL::set_binary_mode(ofile);
|
||||||
CGAL::write_ply_points
|
CGAL::write_PLY
|
||||||
(ofile, points,
|
(ofile, points,
|
||||||
CGAL::parameters::point_map (Point_map()).
|
CGAL::parameters::point_map (Point_map()).
|
||||||
normal_map (Normal_map()));
|
normal_map (Normal_map()));
|
||||||
|
|
@ -33,7 +33,7 @@ int main (int argc, char** argv)
|
||||||
std::cerr << "Reading input file " << fname << std::endl;
|
std::cerr << "Reading input file " << fname << std::endl;
|
||||||
std::ifstream ifile (fname, std::ios::binary);
|
std::ifstream ifile (fname, std::ios::binary);
|
||||||
if (!ifile ||
|
if (!ifile ||
|
||||||
!CGAL::read_las_points_with_properties
|
!CGAL::read_LAS_with_properties
|
||||||
(ifile, std::back_inserter (points),
|
(ifile, std::back_inserter (points),
|
||||||
CGAL::make_las_point_reader (Point_map()),
|
CGAL::make_las_point_reader (Point_map()),
|
||||||
std::make_pair (Scan_angle_map(),
|
std::make_pair (Scan_angle_map(),
|
||||||
|
|
|
||||||
|
|
@ -614,7 +614,7 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is,
|
||||||
OutputIterator output,
|
OutputIterator output,
|
||||||
PropertyHandler&& ... properties)
|
PropertyHandler&& ... properties)
|
||||||
{
|
{
|
||||||
return read_LAS(is, output, std::forward<PropertyHandler>(properties)...);
|
return read_LAS_with_properties(is, output, std::forward<PropertyHandler>(properties)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \cond SKIP_IN_MANUAL
|
/// \cond SKIP_IN_MANUAL
|
||||||
|
|
@ -627,7 +627,7 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is,
|
||||||
{
|
{
|
||||||
typedef typename value_type_traits<OutputIterator>::type OutputValueType;
|
typedef typename value_type_traits<OutputIterator>::type OutputValueType;
|
||||||
|
|
||||||
return read_LAS<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
|
return read_LAS_with_properties<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \endcond
|
/// \endcond
|
||||||
|
|
|
||||||
|
|
@ -481,7 +481,7 @@ bool read_ply_points(std::istream& is, ///< input stream.
|
||||||
template <typename OutputIteratorValueType, typename OutputIterator, typename ... PropertyHandler>
|
template <typename OutputIteratorValueType, typename OutputIterator, typename ... PropertyHandler>
|
||||||
CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIterator output, PropertyHandler&& ... properties)
|
CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIterator output, PropertyHandler&& ... properties)
|
||||||
{
|
{
|
||||||
return read_PLY(is, output, std::forward<PropertyHandler>(properties)...);
|
return read_PLY_with_properties(is, output, std::forward<PropertyHandler>(properties)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -504,7 +504,7 @@ CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIte
|
||||||
{
|
{
|
||||||
typedef typename value_type_traits<OutputIterator>::type OutputValueType;
|
typedef typename value_type_traits<OutputIterator>::type OutputValueType;
|
||||||
|
|
||||||
return read_PLY<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
|
return read_PLY_with_properties<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename OutputIteratorValueType,
|
template <typename OutputIteratorValueType,
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
# This is the CMake script for compiling a CGAL application.
|
# This is the CMake script for compiling a CGAL application.
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.1...3.15)
|
cmake_minimum_required(VERSION 3.1...3.15)
|
||||||
|
project(Stream_support_Tests)
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
find_path(
|
find_path(
|
||||||
3MF_INCLUDE_DIR
|
3MF_INCLUDE_DIR
|
||||||
|
|
|
||||||
|
|
@ -332,8 +332,6 @@ bool read_OFF(std::istream& is,
|
||||||
Surface_mesh<Point>& sm,
|
Surface_mesh<Point>& sm,
|
||||||
const CGAL_BGL_NP_CLASS& np)
|
const CGAL_BGL_NP_CLASS& np)
|
||||||
{
|
{
|
||||||
typedef Surface_mesh<Point> Mesh;
|
|
||||||
|
|
||||||
using parameters::choose_parameter;
|
using parameters::choose_parameter;
|
||||||
using parameters::get_parameter;
|
using parameters::get_parameter;
|
||||||
using parameters::is_default_parameter;
|
using parameters::is_default_parameter;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue