phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface

Browse Source
This commit is contained in:
Sébastien Loriot
2024-12-16 11:47:34 +01:00
parent b7e1841b1d 5050ba0490
commit b32558b87e
547 changed files with 11909 additions and 16078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classification/examples/Classification/CMakeLists.txt
+5 -5
View File
@@ -52,7 +52,7 @@ if(TARGET CGAL::OpenCV_support)
message(STATUS "Found OpenCV")
create_single_source_cgal_program( "example_opencv_random_forest.cpp" )
target_link_libraries(example_opencv_random_forest PUBLIC CGAL::OpenCV_support)
target_link_libraries(example_opencv_random_forest PRIVATE CGAL::OpenCV_support)
else()
message("NOTICE: OpenCV was not found. OpenCV random forest predicate for classification won't be available.")
endif()
@@ -68,11 +68,11 @@ foreach(target
gis_tutorial_example
example_deprecated_conversion)
if(TARGET ${target})
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
target_link_libraries(${target} PRIVATE CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)
target_link_libraries(${target} PRIVATE CGAL::TBB_support)
endif()
endif()
endforeach()
Classification/include/CGAL/Classification/Feature/Elevation.h
+2 -2
View File
@@ -130,7 +130,7 @@ public:
std::nth_element (z.begin(), z.begin() + (z.size() / 10), z.end());
dtm_x(i,j) = z[z.size() / 10];
}
dem.free();
(dem.free)();
if (grid.width() * grid.height() > input.size())
values.resize (input.size(), compressed_float(0));
@@ -162,7 +162,7 @@ public:
values[*it] = v;
}
}
dtm_x.free();
(dtm_x.free)();
}
Classification/include/CGAL/Classification/Feature/Height_above.h
+1 -1
View File
@@ -100,7 +100,7 @@ public:
std::size_t J = grid.y(i);
values[i] = float(dtm(I,J) - get (point_map, *(input.begin() + i)).z());
}
dtm.free();
(dtm.free)();
}
}
Classification/include/CGAL/Classification/Feature/Height_below.h
+1 -1
View File
@@ -100,7 +100,7 @@ public:
std::size_t J = grid.y(i);
values[i] = float(get (point_map, *(input.begin() + i)).z() - dtm(I,J));
}
dtm.free();
(dtm.free)();
}
}
Classification/include/CGAL/Classification/Feature/Vertical_range.h
+1 -1
View File
@@ -102,7 +102,7 @@ public:
std::size_t J = grid.y(i);
values[i] = dtm(I,J);
}
dtm.free();
(dtm.free)();
}
}
Classification/include/CGAL/Classification/Image.h
+1 -1
View File
@@ -71,7 +71,7 @@ public:
{
}
void free()
void free BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
m_raw.reset();
m_sparse.reset();
Classification/test/Classification/CMakeLists.txt
+4 -4
View File
@@ -41,10 +41,10 @@ create_single_source_cgal_program("test_classification_point_set.cpp")
create_single_source_cgal_program("test_classification_io.cpp")
foreach(target test_classification_point_set test_classification_io)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
target_link_libraries(${target} PRIVATE CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)
target_link_libraries(${target} PRIVATE CGAL::TBB_support)
endif()
endforeach()