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

Correction of copy dart info functor.

This commit is contained in:
Guillaume Damiand 2016-10-31 21:41:35 -04:00
parent 70155e27ad
commit 9731a1a51e
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -245,7 +245,7 @@ namespace CGAL {
{ {
dartmap[it]=mdarts.emplace(); dartmap[it]=mdarts.emplace();
init_dart(dartmap[it], amap.get_marks(it)); init_dart(dartmap[it], amap.get_marks(it));
internal::Copy_dart_info_functor::run internal::Copy_dart_info_functor<CMap2, Refs>::run
(amap, static_cast<Refs&>(*this), it, dartmap[it], (amap, static_cast<Refs&>(*this), it, dartmap[it],
dartinfoconverter); dartinfoconverter);
} }
@ -3570,8 +3570,8 @@ namespace CGAL {
it!=darts().end(); ++it) it!=darts().end(); ++it)
{ {
dual[it] = amap.create_dart(); dual[it] = amap.create_dart();
internal::Copy_dart_info_functor::run(amap, static_cast<Refs&>(*this), internal::Copy_dart_info_functor<Refs, Refs>::
it, dual[it]); run(amap, static_cast<Refs&>(*this), it, dual[it]);
if ( it==adart && res==amap.null_handle ) res = dual[it]; if ( it==adart && res==amap.null_handle ) res = dual[it];
} }

7
Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h
View File

@ -392,12 +392,11 @@ struct Copy_dart_info_functor_if_nonvoid<Map1, Map2, DartInfoConverter,
// **************************************************************************** // ****************************************************************************
/// Copy non void information of dart from one cmap to other. /// Copy non void information of dart from one cmap to other.
/// Map1 is the existing map, to copy into map2. /// Map1 is the existing map, to copy into map2.
template<typename Map1, typename Map2,
typename DartInfoConverter=CGAL::Default_converter_dart_info<Map1, Map2> >
struct Copy_dart_info_functor struct Copy_dart_info_functor
{ {
template<typename Map1, typename Map2, static void run( const Map1& cmap1, Map2& cmap2,
typename DartInfoConverter=CGAL::Default_converter_dart_info<Map1, Map2> >
static void run( const Map1& cmap1,
Map2& cmap2,
typename Map1::Dart_const_handle dh1, typename Map1::Dart_const_handle dh1,
typename Map2::Dart_handle dh2, typename Map2::Dart_handle dh2,
const DartInfoConverter& converter=DartInfoConverter()) const DartInfoConverter& converter=DartInfoConverter())

10
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -222,9 +222,9 @@ namespace CGAL {
{ {
dartmap[it]=mdarts.emplace(); dartmap[it]=mdarts.emplace();
init_dart(dartmap[it], amap.get_marks(it)); init_dart(dartmap[it], amap.get_marks(it));
internal::Copy_dart_info_functor::run internal::Copy_dart_info_functor<GMap2, Refs>::
(amap, static_cast<Refs&>(*this), it, dartmap[it], run(amap, static_cast<Refs&>(*this), it, dartmap[it],
dartinfoconverter); dartinfoconverter);
} }
unsigned int min_dim=(dimension<amap.dimension?dimension:amap.dimension); unsigned int min_dim=(dimension<amap.dimension?dimension:amap.dimension);
@ -2743,8 +2743,8 @@ namespace CGAL {
it!=darts().end(); ++it) it!=darts().end(); ++it)
{ {
dual[it] = amap.create_dart(); dual[it] = amap.create_dart();
internal::Copy_dart_info_functor::run(amap, static_cast<Refs&>(*this), internal::Copy_dart_info_functor<Refs, Refs>::
it, dual[it]); run(amap, static_cast<Refs&>(*this), it, dual[it]);
if ( it==adart && res==amap.null_handle ) res = dual[it]; if ( it==adart && res==amap.null_handle ) res = dual[it];
} }

10
Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt
View File

@ -11,8 +11,8 @@ endif()
# If you want to visualize a linear cell complex, you can use the following viewer # If you want to visualize a linear cell complex, you can use the following viewer
# based on qt. Just uncomment the following two lines, plus the lines qt5_use_modules below # based on qt. Just uncomment the following two lines, plus the lines qt5_use_modules below
find_package(CGAL COMPONENTS Qt5) # find_package(CGAL COMPONENTS Qt5)
include("CMakeLCCViewerQt.inc") # include("CMakeLCCViewerQt.inc")
# If you don't want to visualize, use the following line (otherwise comment it) # If you don't want to visualize, use the following line (otherwise comment it)
find_package(CGAL QUIET) find_package(CGAL QUIET)
@ -43,19 +43,19 @@ if ( CGAL_FOUND )
add_executable(voronoi_2 voronoi_2.cpp) add_executable(voronoi_2 voronoi_2.cpp)
target_link_libraries(voronoi_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} target_link_libraries(voronoi_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
${MAP_VIEWER_LIBRARIES}) ${MAP_VIEWER_LIBRARIES})
qt5_use_modules(voronoi_2 ${MAP_VIEWER_MODULES}) # qt5_use_modules(voronoi_2 ${MAP_VIEWER_MODULES})
add_executable(voronoi_3 voronoi_3.cpp) add_executable(voronoi_3 voronoi_3.cpp)
target_link_libraries(voronoi_3 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} target_link_libraries(voronoi_3 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
${MAP_VIEWER_LIBRARIES}) ${MAP_VIEWER_LIBRARIES})
qt5_use_modules(voronoi_3 ${MAP_VIEWER_MODULES}) # qt5_use_modules(voronoi_3 ${MAP_VIEWER_MODULES})
create_single_source_cgal_program( "gmap_linear_cell_complex_3.cpp" ) create_single_source_cgal_program( "gmap_linear_cell_complex_3.cpp" )
add_executable(linear_cell_complex_3_operations linear_cell_complex_3_operations.cpp) add_executable(linear_cell_complex_3_operations linear_cell_complex_3_operations.cpp)
target_link_libraries(linear_cell_complex_3_operations ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} target_link_libraries(linear_cell_complex_3_operations ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
${MAP_VIEWER_LIBRARIES}) ${MAP_VIEWER_LIBRARIES})
qt5_use_modules(linear_cell_complex_3_operations ${MAP_VIEWER_MODULES}) # qt5_use_modules(linear_cell_complex_3_operations ${MAP_VIEWER_MODULES})
else() else()