Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita0e6073

Browse files
committed
warnning fix
1 parent7dfdeec commita0e6073

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

‎modules/3d/include/opencv2/3d.hpp‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2513,7 +2513,7 @@ class CV_EXPORTS Octree{
25132513
Ptr<OctreeNode>index(Point3f point, Ptr<OctreeNode>& node)const;
25142514

25152515
/** @overload
2516-
*@brief The default search range is in the entire tree.
2516+
* @brief The default search range is in the entire tree.
25172517
* @param point
25182518
* @return The pointer to the located OctreeNode.
25192519
*/
@@ -2539,7 +2539,7 @@ class CV_EXPORTS Octree{
25392539
voidtraverseRecurseDFS( Ptr<OctreeNode>& node,const std::function<bool ( Ptr<OctreeNode>&)>&f );
25402540

25412541
/** @brief Radius Nearest Neighbor Search in Octree
2542-
* Search all points that are less than or equal to radius from thequery point.
2542+
* Search all points that are less than or equal to radius from thegiven octree node.
25432543
* And return the number of searched points.
25442544
* @param node The input OctreeNode.
25452545
* @param query Query point.
@@ -2550,11 +2550,20 @@ class CV_EXPORTS Octree{
25502550
*/
25512551
staticintradiusNNSearch(Ptr<OctreeNode>& node, Point3f query,float radius, std::vector<Point3f>& pointSet, std::vector<float>& squareDistSet);
25522552

2553-
//! overload
2553+
/** @overload
2554+
* @brief Radius Nearest Neighbor Search in Octree
2555+
* Search all points that are less than or equal to radius from the query point.
2556+
* And return the number of searched points.
2557+
* @param query Query point.
2558+
* @param radius Retrieved radius value.
2559+
* @param pointSet Contains searched points, and output vector is not in order.
2560+
* @param distSet Contains searched squared distance, and output vector is not in order.
2561+
* @return the number of searched points.
2562+
*/
25542563
intradiusNNSearch(Point3f query,float radius, std::vector<Point3f>& pointSet, std::vector<float>& squareDistSet);
25552564

25562565
/** @brief K Nearest Neighbor Search in Octree.
2557-
*
2566+
* Find the K nearest neighbors to the query point from the given octree node.
25582567
* @param node The input OctreeNode.
25592568
* @param query Query point.
25602569
* @param K
@@ -2563,7 +2572,14 @@ class CV_EXPORTS Octree{
25632572
*/
25642573
staticvoidKNNSearch(Ptr<OctreeNode>& node, Point3f query,int K, std::vector<Point3f>& pointSet, std::vector<float>& squareDistSet);
25652574

2566-
//! overload
2575+
/** @overload
2576+
* @brief K Nearest Neighbor Search in Octree.
2577+
* Find the K points nearest to the query point from the octree.
2578+
* @param query Query point.
2579+
* @param K
2580+
* @param pointSet Contains K points, arranged in order of distance from near to far.
2581+
* @param squareDistSet Contains K squared distance, arranged in order of distance from near to far.
2582+
*/
25672583
voidKNNSearch(Point3f query,int K, std::vector<Point3f>& pointSet, std::vector<float>& squareDistSet);
25682584

25692585
//! The pointer to Octree root node.
@@ -2613,7 +2629,7 @@ CV_EXPORTS_W bool octreeFromPointCloud(std::vector<Point3f> &pointCloud, Octree&
26132629
* @param query Query point.
26142630
* @param radius Retrieved radius value.
26152631
* @param pointSet Contains searched points, and output vector is not in order.
2616-
* @paramdistSet Contains searched squared distance, and output vector is not in order.
2632+
* @paramsquareDistSet Contains searched squared distance, and output vector is not in order.
26172633
* @return the number of searched points.
26182634
*/
26192635
CV_EXPORTS_WintoctreeRadiusNNSearch(Octree& octree, Point3f query,float radius, std::vector<Point3f>& pointSet, std::vector<float>& squareDistSet);
@@ -2622,7 +2638,6 @@ CV_EXPORTS_W int octreeRadiusNNSearch(Octree& octree, Point3f query, float radiu
26222638
/** @brief K Nearest Neighbor Search in Octree.
26232639
*
26242640
* @param octree The input Octree instance.
2625-
* @param node The input Octree instance.
26262641
* @param query Query point.
26272642
* @param K
26282643
* @param pointSet Contains K points, arranged in order of distance from near to far.

‎modules/3d/test/test_octree.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class OctreeTest: public::testing::Test
1919
RNGrng_Point(12345);// set random seed for fixing output 3D point.
2020

2121
// Generate 3D PointCloud
22-
for (size_t i =0; i < pointCloudSize; i++)
22+
for (int i =0; i < pointCloudSize; i++)
2323
{
2424
float _x = rng_Point.uniform(pmin.x, pmax.x);
2525
float _y = rng_Point.uniform(pmin.y, pmax.y);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp