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

Fixes

This commit is contained in:
Maxime Gimeno 2020-11-19 12:11:51 +01:00
parent 016adaa2a9
commit 7cfb944afb
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/test/BGL/test_3mf_to_sm.cpp
View File

@ -40,7 +40,7 @@ int main(int argc, char** argv)
//testing reading functions.
if(!CGAL::read_3MF(filename, meshes))
return 1;
for(int i = 0; i< meshes.size(); ++i)
for(std::size_t i = 0; i< meshes.size(); ++i)
{
Mesh mesh = meshes[i];
std::cout<<"mesh "<<i<<" is valid: "<<mesh.is_valid()<<std::endl;

4
Point_set_processing_3/examples/Point_set_processing_3/orient_scanlines_example.cpp
View File

@ -17,7 +17,7 @@ void dump (const char* filename, const std::vector<Point_with_info>& points)
{
std::ofstream ofile (filename, std::ios::binary);
CGAL::set_binary_mode(ofile);
CGAL::write_ply_points
CGAL::write_PLY
(ofile, points,
CGAL::parameters::point_map (Point_map()).
normal_map (Normal_map()));
@ -33,7 +33,7 @@ int main (int argc, char** argv)
std::cerr << "Reading input file " << fname << std::endl;
std::ifstream ifile (fname, std::ios::binary);
if (!ifile ||
!CGAL::read_las_points_with_properties
!CGAL::read_LAS_with_properties
(ifile, std::back_inserter (points),
CGAL::make_las_point_reader (Point_map()),
std::make_pair (Scan_angle_map(),

4
Point_set_processing_3/include/CGAL/IO/read_las_points.h
View File

@ -614,7 +614,7 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is,
OutputIterator output,
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
@ -627,7 +627,7 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is,
{
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

4
Point_set_processing_3/include/CGAL/IO/read_ply_points.h
View File

@ -481,7 +481,7 @@ bool read_ply_points(std::istream& is, ///< input stream.
template <typename OutputIteratorValueType, typename OutputIterator, typename ... PropertyHandler>
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;
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,

1
Stream_support/test/Stream_support/CMakeLists.txt
View File

@ -2,6 +2,7 @@
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
project(Stream_support_Tests)
find_package(CGAL REQUIRED)
find_path(
3MF_INCLUDE_DIR

2
Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h
View File

@ -332,8 +332,6 @@ bool read_OFF(std::istream& is,
Surface_mesh<Point>& sm,
const CGAL_BGL_NP_CLASS& np)
{
typedef Surface_mesh<Point> Mesh;
using parameters::choose_parameter;
using parameters::get_parameter;
using parameters::is_default_parameter;