Ported PCL 1.11 deprecated changes to PCL 1.10 (#550)

This commit is contained in:
matlabbe
2020-05-27 17:45:16 -04:00
parent 8842d0c0e3
commit bf39c5295b
4 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -1271,7 +1271,7 @@ LaserScan laserScanFromPointCloud(const pcl::PCLPointCloud2 & cloud, bool filter
}
//determine the output type
int fieldStates[8] = {0}; // x,y,z,normal_x,normal_y,normal_z,rgb,intensity
#if PCL_VERSION_COMPARE(>=, 1, 11, 0)
#if PCL_VERSION_COMPARE(>=, 1, 10, 0)
std::uint32_t fieldOffsets[8] = {0};
#else
pcl::uint32_t fieldOffsets[8] = {0};
@@ -1440,7 +1440,7 @@ LaserScan laserScanFromPointCloud(const pcl::PCLPointCloud2 & cloud, bool filter
}
else // XYZRGB
{
#if PCL_VERSION_COMPARE(>=, 1, 11, 0)
#if PCL_VERSION_COMPARE(>=, 1, 10, 0)
std::uint8_t b=*(msg_data + fieldOffsets[6]);
std::uint8_t g=*(msg_data + fieldOffsets[6]+1);
std::uint8_t r=*(msg_data + fieldOffsets[6]+2);
@@ -1491,7 +1491,7 @@ LaserScan laserScanFromPointCloud(const pcl::PCLPointCloud2 & cloud, bool filter
}
else // XYZRGBNormal
{
#if PCL_VERSION_COMPARE(>=, 1, 11, 0)
#if PCL_VERSION_COMPARE(>=, 1, 10, 0)
std::uint8_t b=*(msg_data + fieldOffsets[6]);
std::uint8_t g=*(msg_data + fieldOffsets[6]+1);
std::uint8_t r=*(msg_data + fieldOffsets[6]+2);