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

do not use default template parameters

This commit is contained in:
Sébastien Loriot 2014-12-23 14:57:39 +01:00
parent 4b3f88bab6
commit 21a705cdd9
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Surface_mesh_segmentation/examples/Surface_mesh_segmentation/segmentation_from_sdf_values_OpenMesh_example.cpp
View File

@ -33,13 +33,8 @@ int main(int argc, char** argv )
Facet_double_map internal_sdf_map;
boost::associative_property_map<Facet_double_map> sdf_property_map(internal_sdf_map);
typedef boost::property_map<Mesh, boost::vertex_point_t>::type Ppmap;
Ppmap ppmap(mesh);
// compute SDF values
// We can't use default parameters for number of rays, and cone angle
// and the postprocessing
CGAL::sdf_values(mesh, sdf_property_map, 2.0 / 3.0 * CGAL_PI, 25, true, ppmap);
CGAL::sdf_values(mesh, sdf_property_map);
// create a property-map for segment-ids
typedef std::map<face_descriptor, std::size_t> Facet_int_map;

22
Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
View File

@ -31,11 +31,11 @@ namespace CGAL
template <bool Fast_sdf_calculation_mode, class Polyhedron,
class SDFPropertyMap,
class PointPropertyMap
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename boost::property_map<Polyhedron, boost::vertex_point_t>::type
#endif
, class GeomTraits
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename Kernel_traits<typename boost::property_traits<PointPropertyMap>::value_type>::Kernel
#endif
>
@ -82,11 +82,11 @@ sdf_values( const Polyhedron& polyhedron,
* @return minimum and maximum raw SDF values if @a postprocess is `true`, otherwise minimum and maximum SDF values (before linear normalization)
*/
template <class Polyhedron, class SDFPropertyMap, class PointPropertyMap
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename boost::property_map<Polyhedron, boost::vertex_point_t>::type
#endif
, class GeomTraits
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename Kernel_traits<typename boost::property_traits<PointPropertyMap>::value_type>::Kernel
#endif
>
@ -177,11 +177,11 @@ sdf_values_postprocessing(const Polyhedron& polyhedron,
*/
template <class Polyhedron, class SDFPropertyMap, class SegmentPropertyMap,
class PointPropertyMap
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename boost::property_map<Polyhedron, boost::vertex_point_t>::type
#endif
, class GeomTraits
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename Kernel_traits<typename boost::property_traits<PointPropertyMap>::value_type>::Kernel
#endif
>
@ -204,11 +204,11 @@ segmentation_from_sdf_values( const Polyhedron& polyhedron,
///\cond SKIP_IN_MANUAL
template < bool Fast_sdf_calculation_mode, class Polyhedron,
class SegmentPropertyMap, class PointPropertyMap
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename boost::property_map<Polyhedron, boost::vertex_point_t>::type
#endif
, class GeomTraits
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename Kernel_traits<typename boost::property_traits<PointPropertyMap>::value_type>::Kernel
#endif
>
@ -273,11 +273,11 @@ segmentation_via_sdf_values(const Polyhedron& polyhedron,
* @return number of segments if `output_cluster_ids` is set to `false` and `number_of_clusters` otherwise
*/
template < class Polyhedron, class SegmentPropertyMap, class PointPropertyMap
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename boost::property_map<Polyhedron, boost::vertex_point_t>::type
#endif
, class GeomTraits
#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifdef DOXYGEN_RUNNING
= typename Kernel_traits<typename boost::property_traits<PointPropertyMap>::value_type>::Kernel
#endif
>
@ -297,7 +297,7 @@ segmentation_via_sdf_values(const Polyhedron& polyhedron,
smoothing_lambda, output_cluster_ids, ppmap, traits);
}
#ifdef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
#ifndef DOXYGEN_RUNNING
// we need these overloads for the default of the point property map
/// sdf_values ///