Merge pull request #2080 from SergioRAgostinho/warnings

More warning suppression in pcl apps
PointCloudLibrary · Nov 14, 2017 · ecaa617 · ecaa617
2 parents 519b433 + d67e667
commit ecaa617
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/apps/cloud_composer/src/merge_selection.cpp b/apps/cloud_composer/src/merge_selection.cpp
@@ -23,7 +23,7 @@ pcl::cloud_composer::MergeSelection::performAction (ConstItemList input_data, Po
 {
   if (type != PointTypeFlags::NONE)
   {
-    switch (type)
+    switch ((uint8_t) type)
     {
       case (PointTypeFlags::XYZ):
         return this->performTemplatedAction<pcl::PointXYZ> (input_data);

diff --git a/apps/cloud_composer/src/project_model.cpp b/apps/cloud_composer/src/project_model.cpp
@@ -292,9 +292,9 @@ pcl::cloud_composer::ProjectModel::insertNewCloudFromRGBandDepth ()
   depth_pixel = static_cast<unsigned short*>(depth_image->GetScalarPointer (depth_dims[0]-1,depth_dims[1]-1,0));
   color_pixel = static_cast<unsigned char*> (rgb_image->GetScalarPointer (depth_dims[0]-1,depth_dims[1]-1,0));
 
-  for (int y=0; y<cloud->height; ++y)
+  for (uint32_t y=0; y<cloud->height; ++y)
   {
-    for (int x=0; x<cloud->width; ++x, --depth_pixel, color_pixel-=3)
+    for (uint32_t x=0; x<cloud->width; ++x, --depth_pixel, color_pixel-=3)
     {
       PointXYZRGB new_point;
       //  uint8_t* p_i = &(cloud_blob->data[y * cloud_blob->row_step + x * cloud_blob->point_step]);

diff --git a/apps/cloud_composer/src/transform_clouds.cpp b/apps/cloud_composer/src/transform_clouds.cpp
@@ -23,7 +23,7 @@ pcl::cloud_composer::TransformClouds::performAction (ConstItemList input_data, P
 {
   if (type != PointTypeFlags::NONE)
   {
-    switch (type)
+    switch ((uint8_t) type)
     {
       case (PointTypeFlags::XYZ):
         return this->performTemplatedAction<pcl::PointXYZ> (input_data);

diff --git a/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h b/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h
@@ -418,10 +418,6 @@ class Cloud : public Statistics
     /// (false) when displaying the cloud
     bool use_color_ramp_;
 
-    /// Flag that indicates whether the cloud should be colored with its own
-    /// color
-    bool use_native_color_;
-
     /// The axis which the color ramp is to be applied when drawing the cloud
     Axis color_ramp_axis_;
 

diff --git a/apps/point_cloud_editor/src/cloud.cpp b/apps/point_cloud_editor/src/cloud.cpp
@@ -102,12 +102,12 @@ Cloud::Cloud (const Cloud &copy)
   use_color_ramp_(copy.use_color_ramp_),
   color_ramp_axis_(copy.color_ramp_axis_),
   display_scale_(copy.display_scale_),
+  partitioned_indices_(copy.partitioned_indices_),
   point_size_(copy.point_size_),
   selected_point_size_(copy.selected_point_size_),
   select_translate_x_(copy.select_translate_x_),
   select_translate_y_(copy.select_translate_y_),
-  select_translate_z_(copy.select_translate_z_),
-  partitioned_indices_(copy.partitioned_indices_)
+  select_translate_z_(copy.select_translate_z_)
 {
   std::copy(copy.center_xyz_, copy.center_xyz_+XYZ_SIZE, center_xyz_);
   std::copy(copy.cloud_matrix_, copy.cloud_matrix_+MATRIX_SIZE, cloud_matrix_);

diff --git a/apps/point_cloud_editor/src/cloudTransformTool.cpp b/apps/point_cloud_editor/src/cloudTransformTool.cpp
@@ -43,8 +43,6 @@
 #include <pcl/apps/point_cloud_editor/cloudTransformTool.h>
 #include <pcl/apps/point_cloud_editor/cloud.h>
 
-const float DEG_2_RADS = M_PI / 180.0f;
-
 const float CloudTransformTool::DEFAULT_SCALE_FACTOR_ = 1.14;
 const float CloudTransformTool::DEFAULT_TRANSLATE_FACTOR_ = 0.001f;