Skip to content

Commit 885c450

Browse files
mviethmvieth
authored
Merge pull request #5624 from mvieth/misc10
Misc small fixes and improvements
2 parents c828af8 + d47f6d7 commit 885c450

File tree

21 files changed

+69
-52
lines changed

21 files changed

+69
-52
lines changed

‎.ci/azure-pipelines/release.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ stages:
204204
# find the commit hash on a quick non-forced update too
205205
fetchDepth: 10
206206
- bash: |
207-
if [ -z $RC ] || [ $RC -eq 0 ]; then isPreRelease=false; else isPreRelease=true; fi
207+
if [ -z $RC ] || [ $RC -eq 0 ]; then isPreRelease=false; tagName="pcl-$(VERSION)"; else isPreRelease=true; tagName="pcl-$(VERSION)-rc$(RC)"; fi
208208
echo "##vso[task.setvariable variable=isPreRelease]${isPreRelease}"
209+
echo "##vso[task.setvariable variable=tagName]${tagName}"
209210
- task: DownloadBuildArtifacts@0
210211
inputs:
211212
downloadType: 'all' # can be anything except single
@@ -223,7 +224,7 @@ stages:
223224
releaseNotesFilePath: '$(DOWNLOAD_LOCATION)/changelog/changelog.md'
224225
repositoryName: $(Build.Repository.Name)
225226
tagSource: 'userSpecifiedTag'
226-
tag: "pcl-$(VERSION)-rc$(RC)"
227+
tag: "$(tagName)"
227228
tagPattern: 'pcl-*'
228229
target: '$(Build.SourceVersion)'
229230
title: 'PCL $(VERSION)'

‎.ci/azure-pipelines/ubuntu-variety.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
POSSIBLE_VTK_VERSION=("7" "9") \
3333
POSSIBLE_CMAKE_CXX_STANDARD=("14" "17" "20") \
3434
POSSIBLE_CMAKE_BUILD_TYPE=("None" "Debug" "Release" "RelWithDebInfo" "MinSizeRel") \
35-
POSSIBLE_COMPILER_PACKAGE=("g++" "g++-10" "g++-11" "g++-12" "clang" "clang-11" "clang-12" "clang-13" "clang-14" "clang-15") \
36-
POSSIBLE_CMAKE_C_COMPILER=("gcc" "gcc-10" "gcc-11" "gcc-12" "clang" "clang-11" "clang-12" "clang-13" "clang-14" "clang-15") \
37-
POSSIBLE_CMAKE_CXX_COMPILER=("g++" "g++-10" "g++-11" "g++-12" "clang++" "clang++-11" "clang++-12" "clang++-13" "clang++-14" "clang++-15") \
35+
POSSIBLE_COMPILER_PACKAGE=("g++" "g++-10" "g++-11" "g++-12" "g++-13" "clang" "clang-13" "clang-14" "clang-15") \
36+
POSSIBLE_CMAKE_C_COMPILER=("gcc" "gcc-10" "gcc-11" "gcc-12" "gcc-13" "clang" "clang-13" "clang-14" "clang-15") \
37+
POSSIBLE_CMAKE_CXX_COMPILER=("g++" "g++-10" "g++-11" "g++-12" "g++-13" "clang++" "clang++-13" "clang++-14" "clang++-15") \
3838
CHOSEN_COMPILER=$[RANDOM%${#POSSIBLE_COMPILER_PACKAGE[@]}] \
3939
dockerBuildArgs="--build-arg VTK_VERSION=${POSSIBLE_VTK_VERSION[$[RANDOM%${#POSSIBLE_VTK_VERSION[@]}]]} --build-arg CMAKE_CXX_STANDARD=${POSSIBLE_CMAKE_CXX_STANDARD[$[RANDOM%${#POSSIBLE_CMAKE_CXX_STANDARD[@]}]]} --build-arg CMAKE_BUILD_TYPE=${POSSIBLE_CMAKE_BUILD_TYPE[$[RANDOM%${#POSSIBLE_CMAKE_BUILD_TYPE[@]}]]} --build-arg COMPILER_PACKAGE=${POSSIBLE_COMPILER_PACKAGE[$CHOSEN_COMPILER]} --build-arg CMAKE_C_COMPILER=${POSSIBLE_CMAKE_C_COMPILER[$CHOSEN_COMPILER]} --build-arg CMAKE_CXX_COMPILER=${POSSIBLE_CMAKE_CXX_COMPILER[$CHOSEN_COMPILER]}" ; \
4040
echo "##vso[task.setvariable variable=dockerBuildArgs]$dockerBuildArgs"

‎.dev/docker/env/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ RUN apt-get update \
3333
libboost-serialization-dev \
3434
libboost-filesystem-dev \
3535
libboost-iostreams-dev \
36+
libboost-system-dev \
3637
libflann-dev \
3738
libglew-dev \
3839
libgtest-dev \
3940
libopenni-dev \
4041
libopenni2-dev \
42+
libpcap-dev \
4143
libproj-dev \
4244
libqhull-dev \
4345
libqt5opengl5-dev \

‎.dev/docker/release/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN sed -i 's/^deb \(.*\)$/deb \1\ndeb-src \1/' /etc/apt/sources.list \
1818
libboost-serialization-dev \
1919
libboost-filesystem-dev \
2020
libboost-iostreams-dev \
21+
libboost-system-dev \
2122
libeigen3-dev \
2223
libflann-dev \
2324
libglew-dev \

‎.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
image: pointcloudlibrary/env:22.04
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313

1414
- name: Run clang-tidy
1515
run: |

‎CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
119119
else()
120120
string(APPEND CMAKE_CXX_FLAGS " -Wabi")
121121
endif()
122-
string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wno-unknown-pragmas -fno-strict-aliasing -Wno-format-extra-args -Wno-sign-compare -Wno-invalid-offsetof -Wno-conversion ${SSE_FLAGS} ${AVX_FLAGS}")
122+
string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -fno-strict-aliasing ${SSE_FLAGS} ${AVX_FLAGS}")
123123
endif()
124124

125125
if(PCL_WARNINGS_ARE_ERRORS)
@@ -146,8 +146,9 @@ endif()
146146
if(CMAKE_COMPILER_IS_MSVC)
147147
add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS}")
148148

149+
string(APPEND CMAKE_CXX_FLAGS " /bigobj")
149150
if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
150-
string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS} /bigobj")
151+
string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS}")
151152

152153
# Add extra code generation/link optimizations
153154
if(CMAKE_MSVC_CODE_LINK_OPTIMIZATION AND (NOT BUILD_CUDA) AND (NOT BUILD_GPU))

‎apps/src/openni_klt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class OpenNIViewer {
112112
using CloudConstPtr = typename Cloud::ConstPtr;
113113

114114
OpenNIViewer(pcl::Grabber& grabber)
115-
: grabber_(grabber), rgb_data_(nullptr), rgb_data_size_(0)
115+
: grabber_(grabber), rgb_data_(nullptr), rgb_data_size_(0), counter_(0)
116116
{}
117117

118118
void

‎common/include/pcl/common/io.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ namespace pcl
5454
/** \brief Get the index of a specified field (i.e., dimension/channel)
5555
* \param[in] cloud the point cloud message
5656
* \param[in] field_name the string defining the field name
57+
* \return the index of the field or a negative integer if no field with the given name exists
5758
* \ingroup common
5859
*/
5960
inline int
@@ -71,6 +72,7 @@ namespace pcl
7172
* \tparam PointT datatype for which fields is being queries
7273
* \param[in] field_name the string defining the field name
7374
* \param[out] fields a vector to the original \a PCLPointField vector that the raw PointCloud message contains
75+
* \return the index of the field or a negative integer if no field with the given name exists
7476
* \ingroup common
7577
*/
7678
template <typename PointT> inline int

‎common/include/pcl/conversions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,10 @@ namespace pcl
198198
else
199199
{
200200
// If not, memcpy each group of contiguous fields separately
201-
for (uindex_t row = 0; row < msg.height; ++row)
201+
for (std::size_t row = 0; row < msg.height; ++row)
202202
{
203203
const std::uint8_t* row_data = msg_data + row * msg.row_step;
204-
for (uindex_t col = 0; col < msg.width; ++col)
204+
for (std::size_t col = 0; col < msg.width; ++col)
205205
{
206206
const std::uint8_t* msg_data = row_data + col * msg.point_step;
207207
for (const detail::FieldMapping& mapping : field_map)

‎doc/tutorials/content/sources/conditional_euclidean_clustering/conditional_euclidean_clustering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ customRegionGrowing (const PointTypeFull& point_a, const PointTypeFull& point_b,
3737
{
3838
if (std::abs (point_a.intensity - point_b.intensity) < 8.0f)
3939
return (true);
40-
if (std::abs (point_a_normal.dot (point_b_normal)) < 0.06)
40+
if (std::abs (point_a_normal.dot (point_b_normal)) > std::cos (30.0f / 180.0f * static_cast<float> (M_PI)))
4141
return (true);
4242
}
4343
else

0 commit comments

Comments
 (0)