From 9275058449f51a4df94f560f26f528087f1c4651 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 27 Oct 2016 11:52:28 +0200 Subject: [PATCH] fix conversion warnings --- .../Data_classification/Attribute_echo_scatter.h | 12 ++++++------ .../CGAL/Data_classification/Attribute_elevation.h | 4 ++-- .../Attribute_vertical_dispersion.h | 8 ++++---- .../include/CGAL/Data_classification/Neighborhood.h | 2 +- .../CGAL/Data_classification/Planimetric_grid.h | 4 ++-- .../include/CGAL/Point_set_classification.h | 7 ++++--- .../Point_set/Point_set_classification_plugin.cpp | 8 ++++---- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Data_classification/include/CGAL/Data_classification/Attribute_echo_scatter.h b/Data_classification/include/CGAL/Data_classification/Attribute_echo_scatter.h index e75571160eb..77e6fdecfdc 100644 --- a/Data_classification/include/CGAL/Data_classification/Attribute_echo_scatter.h +++ b/Data_classification/include/CGAL/Data_classification/Attribute_echo_scatter.h @@ -65,8 +65,8 @@ public: std::size_t squareYmin = (j < square ? 0 : j - square); std::size_t squareYmax = (std::min) (grid.height()-1, j + square); - int NB_echo_sup=0; - int NB_echo_total=0; + std::size_t NB_echo_sup=0; + std::size_t NB_echo_total=0; for(std::size_t k = squareXmin; k <= squareXmax; k++){ for(std::size_t l = squareYmin; l <= squareYmax; l++){ @@ -75,9 +75,9 @@ public: if(grid.indices(k,l).size()>0){ - for(int t=0; t<(int)grid.indices(k,l).size();t++){ + for(std::size_t t=0; t 1) NB_echo_sup++; } @@ -100,8 +100,8 @@ public: } for(std::size_t i = 0; i < (std::size_t)(end - begin); i++){ - int I= grid.x(i); - int J= grid.y(i); + std::size_t I= grid.x(i); + std::size_t J= grid.y(i); echo_scatter.push_back((double)Scatter(I,J)); } this->compute_mean_max (echo_scatter, this->mean, this->max); diff --git a/Data_classification/include/CGAL/Data_classification/Attribute_elevation.h b/Data_classification/include/CGAL/Data_classification/Attribute_elevation.h index d199ac40870..bfac3870a57 100644 --- a/Data_classification/include/CGAL/Data_classification/Attribute_elevation.h +++ b/Data_classification/include/CGAL/Data_classification/Attribute_elevation.h @@ -142,8 +142,8 @@ public: elevation_attribute.reserve(end - begin); for (std::size_t i = 0; i < (std::size_t)(end - begin); i++){ - int I = grid.x(i); - int J = grid.y(i); + std::size_t I = grid.x(i); + std::size_t J = grid.y(i); elevation_attribute.push_back ((double)(get(point_map, begin[i]).z()-dtm(I,J))); } diff --git a/Data_classification/include/CGAL/Data_classification/Attribute_vertical_dispersion.h b/Data_classification/include/CGAL/Data_classification/Attribute_vertical_dispersion.h index 42ddbb02e6b..e594a320537 100644 --- a/Data_classification/include/CGAL/Data_classification/Attribute_vertical_dispersion.h +++ b/Data_classification/include/CGAL/Data_classification/Attribute_vertical_dispersion.h @@ -99,9 +99,9 @@ public: if(CGAL::sqrt(pow((double)k-i,2)+pow((double)l-j,2)) <=(double)0.5*radius_neighbors/grid_resolution && (grid.indices(k,l).size()>0)) - for(int t=0; t<(int)grid.indices(k,l).size();t++) + for(std::size_t t=0; tfirst; } diff --git a/Data_classification/include/CGAL/Data_classification/Planimetric_grid.h b/Data_classification/include/CGAL/Data_classification/Planimetric_grid.h index a525445fb24..038fbd19959 100644 --- a/Data_classification/include/CGAL/Data_classification/Planimetric_grid.h +++ b/Data_classification/include/CGAL/Data_classification/Planimetric_grid.h @@ -27,7 +27,7 @@ class Planimetric_grid typedef typename Kernel::Point_3 Point_3; typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; - typedef Image > Image_indices; + typedef Image > Image_indices; typedef Image Image_bool; Image_indices m_grid; @@ -77,7 +77,7 @@ public: /*! \brief Returns the indices of points lying in the given indexed cell. */ - const std::vector& indices(std::size_t x, std::size_t y) const { return m_grid(x,y); } + const std::vector& indices(std::size_t x, std::size_t y) const { return m_grid(x,y); } /*! \brief Returns `true` if the indexed cell is to be used for classification. */ diff --git a/Data_classification/include/CGAL/Point_set_classification.h b/Data_classification/include/CGAL/Point_set_classification.h index c4cd47775a6..e56572efee9 100644 --- a/Data_classification/include/CGAL/Point_set_classification.h +++ b/Data_classification/include/CGAL/Point_set_classification.h @@ -205,7 +205,8 @@ public: /// \cond SKIP_IN_MANUAL - double classification_value (std::size_t class_type, int pt_index) const + double classification_value (const std::size_t& class_type, + const std::size_t& pt_index) const { double out = 0.; if (m_multiplicative) @@ -267,7 +268,7 @@ public: for (std::size_t s = 0; s < m_input.size(); s++) { - int nb_class_best=0; + std::size_t nb_class_best=0; double val_class_best = (std::numeric_limits::max)(); std::vector values; @@ -336,7 +337,7 @@ public: mean[j] += values[j][neighbors[n]]; } - int nb_class_best=0; + std::size_t nb_class_best=0; double val_class_best = (std::numeric_limits::max)(); for(std::size_t k = 0; k < mean.size(); ++ k) { diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_classification_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_classification_plugin.cpp index 6ac7d79c730..cfe266aa8f2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_classification_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_classification_plugin.cpp @@ -254,9 +254,9 @@ public Q_SLOTS: disable_everything(); enable_computation(); - ui_widget.numberOfScalesSpinBox->setValue(item->nb_scales()); - ui_widget.number_of_trials->setValue(item->number_of_trials()); - ui_widget.smoothingDoubleSpinBox->setValue(item->smoothing()); + ui_widget.numberOfScalesSpinBox->setValue((int)(item->nb_scales())); + ui_widget.number_of_trials->setValue((int)(item->number_of_trials())); + ui_widget.smoothingDoubleSpinBox->setValue((int)(item->smoothing())); // Clear class types for (std::size_t i = 0; i < class_rows.size(); ++ i) @@ -658,7 +658,7 @@ public Q_SLOTS: void add_new_class (const ClassRow& class_row) { class_rows.push_back (class_row); - int position = class_rows.size(); + int position = static_cast(class_rows.size()); ui_widget.gridLayout_3->addWidget (class_rows.back().label, position, 0); ui_widget.gridLayout_3->addWidget (class_rows.back().color_button, position, 1);