Skip to content

Commit 51539cf

Browse files
Provide alias NormalEstimationOMP with deprecation message
1 parent 65f4c1f commit 51539cf

File tree

4 files changed

+52
-31
lines changed

4 files changed

+52
-31
lines changed

features/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ set(incs
4242
"include/pcl/${SUBSYS_NAME}/narf.h"
4343
"include/pcl/${SUBSYS_NAME}/narf_descriptor.h"
4444
"include/pcl/${SUBSYS_NAME}/normal_3d.h"
45+
"include/pcl/${SUBSYS_NAME}/normal_3d_omp.h"
4546
"include/pcl/${SUBSYS_NAME}/normal_based_signature.h"
4647
"include/pcl/${SUBSYS_NAME}/organized_edge_detection.h"
4748
"include/pcl/${SUBSYS_NAME}/pfh.h"

features/include/pcl/features/normal_3d.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,10 @@ namespace pcl
407407
public:
408408
PCL_MAKE_ALIGNED_OPERATOR_NEW
409409
};
410+
411+
template <typename PointInT, typename PointOutT>
412+
using NormalEstimationOMP PCL_DEPRECATED(1, 12, "use NormalEstimation instead") = NormalEstimation<PointInT, PointOutT>;
413+
410414
}
411415

412416
#ifdef PCL_NO_PRECOMPILE
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Software License Agreement (BSD License)
3+
*
4+
* Point Cloud Library (PCL) - www.pointclouds.org
5+
* Copyright (c) 2010-2011, Willow Garage, Inc.
6+
* Copyright (c) 2012-, Open Perception, Inc.
7+
*
8+
* All rights reserved.
9+
*
10+
* Redistribution and use in source and binary forms, with or without
11+
* modification, are permitted provided that the following conditions
12+
* are met:
13+
*
14+
* * Redistributions of source code must retain the above copyright
15+
* notice, this list of conditions and the following disclaimer.
16+
* * Redistributions in binary form must reproduce the above
17+
* copyright notice, this list of conditions and the following
18+
* disclaimer in the documentation and/or other materials provided
19+
* with the distribution.
20+
* * Neither the name of the copyright holder(s) nor the names of its
21+
* contributors may be used to endorse or promote products derived
22+
* from this software without specific prior written permission.
23+
*
24+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
25+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
26+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
27+
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
28+
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
29+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
30+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
31+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
32+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
34+
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35+
* POSSIBILITY OF SUCH DAMAGE.
36+
*
37+
* $Id$
38+
*
39+
*/
40+
41+
#pragma once
42+
43+
PCL_DEPRECATED_HEADER(1, 13, "Use <pcl/features/normal_3d.h> instead.")
44+
45+
#include <pcl/features/normal_3d.h>

features/src/normal_3d.cpp

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,10 @@
11
/*
2-
* Software License Agreement (BSD License)
2+
* SPDX-License-Identifier: BSD-3-Clause
33
*
44
* Point Cloud Library (PCL) - www.pointclouds.org
5-
* Copyright (c) 2010-2012, Willow Garage, Inc.
5+
* Copyright (c) 2010-2011, Willow Garage, Inc.
66
* Copyright (c) 2012-, Open Perception, Inc.
77
*
8-
* All rights reserved.
9-
*
10-
* Redistribution and use in source and binary forms, with or without
11-
* modification, are permitted provided that the following conditions
12-
* are met:
13-
*
14-
* * Redistributions of source code must retain the above copyright
15-
* notice, this list of conditions and the following disclaimer.
16-
* * Redistributions in binary form must reproduce the above
17-
* copyright notice, this list of conditions and the following
18-
* disclaimer in the documentation and/or other materials provided
19-
* with the distribution.
20-
* * Neither the name of the copyright holder(s) nor the names of its
21-
* contributors may be used to endorse or promote products derived
22-
* from this software without specific prior written permission.
23-
*
24-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
25-
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
26-
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
27-
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
28-
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
29-
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
30-
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
31-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
32-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
34-
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35-
* POSSIBILITY OF SUCH DAMAGE.
36-
*
378
*/
389

3910
#include <pcl/features/impl/normal_3d.hpp>

0 commit comments

Comments
 (0)