Merge pull request #1585 from KrisThielemans/reduce_compiler_warnings

KrisThielemans · web-flow · commit d6eff1102584 · 2025-04-08T15:06:49.000+01:00
Reduce compiler warnings
diff --git a/src/Shape_buildblock/Shape3DWithOrientation.cxx b/src/Shape_buildblock/Shape3DWithOrientation.cxx
@@ -92,12 +92,15 @@ Shape3DWithOrientation::set_direction_vectors(const Array<2, float>& directions)
 }
 
 bool
-Shape3DWithOrientation::operator==(const Shape3DWithOrientation& s) const
+Shape3DWithOrientation::operator==(const Shape3D& base_s) const
 {
+  auto sptr = dynamic_cast<const Shape3DWithOrientation*>(&base_s);
+  if (!sptr)
+    return false; // not of same type
+  auto& s = *sptr;
   const float tolerance = .001F;
-  return norm(this->get_origin() - s.get_origin()) < tolerance && norm(this->_directions[1] - s._directions[1]) < tolerance
-         && norm(this->_directions[2] - s._directions[2]) < tolerance && norm(this->_directions[3] - s._directions[3]) < tolerance
-         && base_type::operator==(s);
+  return norm(this->_directions[1] - s._directions[1]) < tolerance && norm(this->_directions[2] - s._directions[2]) < tolerance
+         && norm(this->_directions[3] - s._directions[3]) < tolerance && base_type::operator==(s);
 }
 
 float
diff --git a/src/buildblock/ArrayFilter2DUsingConvolution.cxx b/src/buildblock/ArrayFilter2DUsingConvolution.cxx
@@ -47,6 +47,8 @@ ArrayFilter2DUsingConvolution<elemT>::is_trivial() const
          || (filter_coefficients.get_length() == 1 && filter_coefficients.get_min_index() == 0 && filter_coefficients[0][0] == 1);
 }
 
+#if 0
+// commented out as it does not make sense to have a 1D IndexRange for a 2D filter
 template <typename elemT>
 Succeeded
 ArrayFilter2DUsingConvolution<elemT>::get_influencing_indices(IndexRange<1>& influencing_index_range,
@@ -70,6 +72,7 @@ ArrayFilter2DUsingConvolution<elemT>::get_influenced_indices(IndexRange<1>& infl
                                                output_index_range.get_max_index() + filter_coefficients.get_max_index());
   return Succeeded::yes;
 }
+#endif
 
 template <typename elemT>
 void
diff --git a/src/buildblock/ArrayFilter3DUsingConvolution.cxx b/src/buildblock/ArrayFilter3DUsingConvolution.cxx
@@ -59,6 +59,8 @@ ArrayFilter3DUsingConvolution<elemT>::is_trivial() const
              && filter_coefficients[0][0][0] == 1);
 }
 
+#if 0
+// commented out as it does not make sense to have a 1D IndexRange for a 2D filter
 template <typename elemT>
 Succeeded
 ArrayFilter3DUsingConvolution<elemT>::get_influencing_indices(IndexRange<1>& influencing_index_range,
@@ -82,6 +84,7 @@ ArrayFilter3DUsingConvolution<elemT>::get_influenced_indices(IndexRange<1>& infl
                                                output_index_range.get_max_index() + filter_coefficients.get_max_index());
   return Succeeded::yes;
 }
+#endif
 
 #if 1
 template <typename elemT>
diff --git a/src/buildblock/GeometryBlocksOnCylindrical.cxx b/src/buildblock/GeometryBlocksOnCylindrical.cxx
@@ -85,9 +85,6 @@ GeometryBlocksOnCylindrical::build_crystal_maps(const Scanner& scanner)
   float trans_blocks_gap = transaxial_block_spacing - num_transaxial_crystals_per_block * transaxial_crystal_spacing;
   float ax_blocks_gap = axial_block_spacing - (num_axial_crystals_per_block - 1) * axial_crystal_spacing;
   float csi_minus_csiGaps = csi - (csi / transaxial_block_spacing * 2) * (transaxial_crystal_spacing / 2 + trans_blocks_gap);
-  //    distance between the center of the scannner and the first crystal in the bucket, r=Reffective/cos(csi)
-  float r = scanner.get_effective_ring_radius() / cos(csi_minus_csiGaps);
-
   float start_z = -(axial_block_spacing * num_axial_blocks_per_bucket * num_axial_buckets - ax_blocks_gap) / 2;
   float start_y = -1 * scanner.get_effective_ring_radius();
   float start_x = -1 // the first crystal in the bucket
diff --git a/src/buildblock/TimeFrameDefinitions.cxx b/src/buildblock/TimeFrameDefinitions.cxx
@@ -49,6 +49,9 @@ START_NAMESPACE_STIR
 double
 TimeFrameDefinitions::get_start_time(unsigned int frame_num) const
 {
+  if (frame_num < 1)
+    throw std::runtime_error("TimeFrameDefinitions::get_start_time called for frame " + std::to_string(frame_num)
+                             + ", but it should be at least 1.");
   if (frame_num > frame_times.size())
     throw std::runtime_error("TimeFrameDefinitions: asked for frame " + std::to_string(frame_num) + ", but only "
                              + std::to_string(frame_times.size()) + " frames present.");
@@ -58,6 +61,9 @@ TimeFrameDefinitions::get_start_time(unsigned int frame_num) const
 double
 TimeFrameDefinitions::get_end_time(unsigned int frame_num) const
 {
+  if (frame_num < 1)
+    throw std::runtime_error("TimeFrameDefinitions::get_end_time called for frame " + std::to_string(frame_num)
+                             + ", but it should be at least 1.");
   if (frame_num > frame_times.size())
     throw std::runtime_error("TimeFrameDefinitions: asked for frame " + std::to_string(frame_num) + ", but only "
                              + std::to_string(frame_times.size()) + " frames present.");
@@ -253,8 +259,11 @@ TimeFrameDefinitions::TimeFrameDefinitions(const TimeFrameDefinitions& org_frame
 }
 
 void
-TimeFrameDefinitions::set_time_frame(const int frame_num, const double start, const double end)
+TimeFrameDefinitions::set_time_frame(const unsigned int frame_num, const double start, const double end)
 {
+  if (frame_num < 1)
+    throw std::runtime_error("TimeFrameDefinitions::set_time_frame called for frame " + std::to_string(frame_num)
+                             + ", but it should be at least 1.");
   if (frame_num > frame_times.size())
     throw std::runtime_error("TimeFrameDefinitions::set_time_frame called for frame " + std::to_string(frame_num) + ", but only "
                              + std::to_string(frame_times.size()) + " frames present.");
@@ -265,7 +274,7 @@ TimeFrameDefinitions::set_time_frame(const int frame_num, const double start, co
 bool
 TimeFrameDefinitions::operator==(const TimeFrameDefinitions& t) const
 {
-  for (int frame = 0; frame < frame_times.size(); frame++)
+  for (int frame = 0; static_cast<unsigned>(frame) < frame_times.size(); frame++)
     {
 
       const bool is_identical = (std::abs(frame_times.at(frame).first - t.frame_times.at(frame).first) <= 10e-5)
diff --git a/src/data_buildblock/SinglesRatesFromGEHDF5.cxx b/src/data_buildblock/SinglesRatesFromGEHDF5.cxx
@@ -62,7 +62,7 @@ SinglesRatesFromGEHDF5::read_from_file(const std::string& rdf_filename)
   // GE uses unsigned int, while SinglesRateForTimeSlices uses int, so we need a copy
   Array<2, unsigned int> GE_singles(IndexRange2D(0, _num_time_slices - 1, 0, total_singles_units - 1));
 
-  while (slice < _num_time_slices)
+  while (slice < static_cast<unsigned>(_num_time_slices))
     {
       m_input_sptr->read_singles(GE_singles[slice], slice + 1);
       ++slice;
@@ -73,7 +73,7 @@ SinglesRatesFromGEHDF5::read_from_file(const std::string& rdf_filename)
   std::copy(GE_singles.begin_all(), GE_singles.end_all(), _singles.begin_all());
 
   // PW Modify this bit of code too.
-  if (slice != _num_time_slices)
+  if (slice != static_cast<unsigned>(_num_time_slices))
     {
       error("\nSinglesRatesFromGEHDF5: Couldn't read all records in the file. Read %d of %d. Exiting\n", slice, _num_time_slices);
       // TODO resize singles to return array with new sizes
@@ -83,7 +83,7 @@ SinglesRatesFromGEHDF5::read_from_file(const std::string& rdf_filename)
     {
       // GE RDF9 listmode stores singles every second
       _singles_time_interval = 1.0;
-      for (unsigned int slice = 0; slice < _num_time_slices; ++slice)
+      for (unsigned int slice = 0; slice < static_cast<unsigned>(_num_time_slices); ++slice)
         _times[slice] = slice + _singles_time_interval; // note that this has to store the "end-time" of the slice
 
       assert(_times.size() != 0);
diff --git a/src/include/stir/Array.h b/src/include/stir/Array.h
@@ -328,6 +328,9 @@ class Array : public NumericVectorWithOffset<Array<num_dimensions - 1, elemT>, e
   // Make sure that we can access init() recursively
   template <int num_dimensions2, class elemT2>
   friend class Array;
+
+  using base_type::grow;
+  using base_type::resize;
 };
 
 /**************************************************
diff --git a/src/include/stir/ArrayFilter2DUsingConvolution.h b/src/include/stir/ArrayFilter2DUsingConvolution.h
@@ -40,9 +40,12 @@ class ArrayFilter2DUsingConvolution : public ArrayFunctionObject_2ArgumentImplem
 
   bool is_trivial() const override;
 
+#if 0
+  // commented out as it does not make sense to have a 1D IndexRange for a 2D filter
   virtual Succeeded get_influencing_indices(IndexRange<1>& influencing_indices, const IndexRange<1>& output_indices) const;
 
   virtual Succeeded get_influenced_indices(IndexRange<1>& influenced_indices, const IndexRange<1>& input_indices) const;
+#endif
 
 private:
   Array<2, float> filter_coefficients;
diff --git a/src/include/stir/ArrayFilter3DUsingConvolution.h b/src/include/stir/ArrayFilter3DUsingConvolution.h
@@ -40,9 +40,12 @@ class ArrayFilter3DUsingConvolution : public ArrayFunctionObject_2ArgumentImplem
 
   bool is_trivial() const override;
 
+#if 0
+  // commented out as it does not make sense to have a 1D IndexRange for a 2D filter
   virtual Succeeded get_influencing_indices(IndexRange<1>& influencing_indices, const IndexRange<1>& output_indices) const;
 
   virtual Succeeded get_influenced_indices(IndexRange<1>& influenced_indices, const IndexRange<1>& input_indices) const;
+#endif
 
 private:
   Array<3, float> filter_coefficients;
diff --git a/src/include/stir/Shape/Shape3DWithOrientation.h b/src/include/stir/Shape/Shape3DWithOrientation.h
@@ -60,7 +60,7 @@ class Shape3DWithOrientation : public Shape3D
   typedef Shape3D base_type;
 
 public:
-  bool operator==(const Shape3DWithOrientation& s) const;
+  bool operator==(const Shape3D& s) const override;
   void scale(const CartesianCoordinate3D<float>& scale3D) override;
 
   //! get direction vectors currently in use
diff --git a/src/include/stir/TimeFrameDefinitions.h b/src/include/stir/TimeFrameDefinitions.h
@@ -98,7 +98,7 @@ class TimeFrameDefinitions
   void set_num_time_frames(int num_time_frames) { frame_times.resize(num_time_frames); }
 
   //! Set time frame
-  void set_time_frame(const int frame_num, const double start, const double end);
+  void set_time_frame(const unsigned int frame_num, const double start, const double end);
 
   bool operator==(const TimeFrameDefinitions& t) const;
 
diff --git a/src/include/stir/data/SinglesRatesForTimeFrames.h b/src/include/stir/data/SinglesRatesForTimeFrames.h
@@ -40,6 +40,8 @@ class SinglesRatesForTimeFrames : public SinglesRates
   // SinglesRatesForTimeFrames(const TimeFrameDefinitions& time_frame_definitions,
   //			      const shared_ptr<Scanner>& scanner_sptr);
 
+  using SinglesRates::get_singles;
+
   //! get the singles for a particular singles unit and frame number.
   /*!
      The singles returned is the rate for a whole singles unit.
diff --git a/src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl b/src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl
@@ -687,7 +687,7 @@ DataSymmetriesForBins_PET_CartesianGrid::num_related_view_segment_numbers(const
 int
 DataSymmetriesForBins_PET_CartesianGrid::num_related_bins(const Bin& b) const
 {
-  int num;
+  int num = 0;
   // cylindrical implementaion
   if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry() == "Cylindrical")
     {
diff --git a/src/iterative/KOSMAPOSL/KOSMAPOSLReconstruction.cxx b/src/iterative/KOSMAPOSL/KOSMAPOSLReconstruction.cxx
@@ -418,7 +418,9 @@ void
 KOSMAPOSLReconstruction<TargetT>::set_anatomical_prior_sptr(shared_ptr<TargetT> arg, int index)
 {
   this->_already_set_up = false;
-  if (index < this->anatomical_prior_sptrs.size())
+  if (index < 0)
+    error("KOSMAPOSLReconstruction::set_anatomical_prior_sptr called with negative index");
+  if (static_cast<unsigned>(index) < this->anatomical_prior_sptrs.size())
     this->anatomical_prior_sptrs.at(index) = arg;
   else
     this->anatomical_prior_sptrs.push_back(arg);
@@ -438,6 +440,8 @@ void
 KOSMAPOSLReconstruction<TargetT>::set_anatomical_image_filename(const std::string& arg, const int index)
 {
   this->_already_set_up = false;
+  if (index < 0)
+    error("KOSMAPOSLReconstruction::set_anatomical_image_filename called with negative index");
   if (static_cast<unsigned>(index) < this->anatomical_image_filenames.size())
     this->anatomical_image_filenames.at(index) = arg;
   else
diff --git a/src/test/IO/test_IO_DynamicDiscretisedDensity.cxx b/src/test/IO/test_IO_DynamicDiscretisedDensity.cxx
@@ -123,7 +123,7 @@ IOTests_DynamicDiscretisedDensity::check_result()
   std::cerr << "\tChecking the exam info...\n";
   check_exam_info(_image_to_write_sptr->get_exam_info(), _image_to_read_sptr->get_exam_info());
 
-  for (int i = 1; i <= _image_to_read_sptr->get_densities().size(); ++i)
+  for (int i = 1; static_cast<unsigned>(i) <= _image_to_read_sptr->get_densities().size(); ++i)
     {
 
       std::cerr << "\t\tChecking dynamic image " << i << "...\n";
diff --git a/src/test/IO/test_IO_ParametricDiscretisedDensity.cxx b/src/test/IO/test_IO_ParametricDiscretisedDensity.cxx
@@ -132,7 +132,7 @@ IOTests_ParametricDiscretisedDensity::check_result()
   std::cerr << "\tChecking the exam info...\n";
   check_exam_info(_image_to_write_sptr->get_exam_info(), _image_to_read_sptr->get_exam_info());
 
-  for (int i = 1; i <= _image_to_read_sptr->get_num_params(); ++i)
+  for (int i = 1; static_cast<unsigned>(i) <= _image_to_read_sptr->get_num_params(); ++i)
     {
 
       std::cerr << "\t\tChecking kinetic parameter " << i << "...\n";
diff --git a/src/utilities/GE/print_GE_singles_values.cxx b/src/utilities/GE/print_GE_singles_values.cxx
@@ -69,7 +69,7 @@ main(int argc, char** argv)
   Array<3, float> singles_arr(IndexRange3D(
       time_def.get_num_time_frames(), scanner.get_num_axial_singles_units(), scanner.get_num_transaxial_singles_units()));
 
-  for (int time_frame_num = 1; time_frame_num <= time_def.get_num_time_frames(); ++time_frame_num)
+  for (int time_frame_num = 1; static_cast<unsigned>(time_frame_num) <= time_def.get_num_time_frames(); ++time_frame_num)
     {
       for (int ax = 0; ax < scanner.get_num_axial_singles_units(); ++ax)
         {
diff --git a/src/utilities/calculate_attenuation_coefficients.cxx b/src/utilities/calculate_attenuation_coefficients.cxx
@@ -185,9 +185,6 @@ main(int argc, char* argv[])
       return EXIT_FAILURE;
     }
 
-  // dummy values currently necessary for BinNormalisation, but they will be ignored
-  const double start_frame = 0;
-  const double end_frame = 0;
   shared_ptr<DataSymmetriesForViewSegmentNumbers> symmetries_sptr(forw_projector_sptr->get_symmetries_used()->clone());
   if (doACF)
     {
diff --git a/src/utilities/conv_gipl_to_interfile.cxx b/src/utilities/conv_gipl_to_interfile.cxx
@@ -141,7 +141,7 @@ main(int argc, char* argv[])
       min_range[2] = -static_cast<int>(floor(image->m_dim[0] / 2.F));
       max_range[2] = min_range[2] + image->m_dim[0] - 1;
       min_range[3] = -static_cast<int>(floor(image->m_dim[2] / 2.F));
-      max_range[3] = max_range[3] + image->m_dim[2] - 1;
+      max_range[3] = min_range[3] + image->m_dim[2] - 1;
 
       IndexRange<3> data_range(min_range, max_range);
       Array<3, float> v_array(data_range);
diff --git a/src/utilities/correct_projdata.cxx b/src/utilities/correct_projdata.cxx
@@ -297,8 +297,6 @@ CorrectProjDataApplication::run() const
 		  else
 #endif
             {
-              const double start_frame = frame_defs.get_start_time(frame_num);
-              const double end_frame = frame_defs.get_end_time(frame_num);
               if (apply_or_undo_correction)
                 {
                   normalisation_ptr->apply(viewgrams);
diff --git a/src/utilities/separate_true_from_random_scatter_for_necr.cxx b/src/utilities/separate_true_from_random_scatter_for_necr.cxx
@@ -262,7 +262,7 @@ main(int argc, char* argv[])
       float random_and_scatter = random_and_scatter_inside_14mm + random_and_scatter_outside_14mm;
 
       float total_event_number = 0;
-      for (int idx = 0; idx < squeezed_sino_all.size(); ++idx)
+      for (int idx = 0; static_cast<unsigned>(idx) < squeezed_sino_all.size(); ++idx)
         {
           total_event_number += squeezed_sino_all[idx];
         }

Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,15 @@ Shape3DWithOrientation::set_direction_vectors(const Array<2, float>& directions)`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`bool`
`95`		`-Shape3DWithOrientation::operator==(const Shape3DWithOrientation& s) const`
	`95`	`+Shape3DWithOrientation::operator==(const Shape3D& base_s) const`
`96`	`96`	`{`
	`97`	`+ auto sptr = dynamic_cast<const Shape3DWithOrientation*>(&base_s);`
	`98`	`+ if (!sptr)`
	`99`	`+ return false; // not of same type`
	`100`	`+ auto& s = *sptr;`
`97`	`101`	`const float tolerance = .001F;`
`98`		`- return norm(this->get_origin() - s.get_origin()) < tolerance && norm(this->_directions[1] - s._directions[1]) < tolerance`
`99`		`- && norm(this->_directions[2] - s._directions[2]) < tolerance && norm(this->_directions[3] - s._directions[3]) < tolerance`
`100`		`- && base_type::operator==(s);`
	`102`	`+ return norm(this->_directions[1] - s._directions[1]) < tolerance && norm(this->_directions[2] - s._directions[2]) < tolerance`
	`103`	`+ && norm(this->_directions[3] - s._directions[3]) < tolerance && base_type::operator==(s);`
`101`	`104`	`}`
`102`	`105`
`103`	`106`	`float`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ ArrayFilter2DUsingConvolution<elemT>::is_trivial() const`
`47`	`47`	`\|\| (filter_coefficients.get_length() == 1 && filter_coefficients.get_min_index() == 0 && filter_coefficients[0][0] == 1);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+#if 0`
	`51`	`+// commented out as it does not make sense to have a 1D IndexRange for a 2D filter`
`50`	`52`	`template <typename elemT>`
`51`	`53`	`Succeeded`
`52`	`54`	`ArrayFilter2DUsingConvolution<elemT>::get_influencing_indices(IndexRange<1>& influencing_index_range,`
`@@ -70,6 +72,7 @@ ArrayFilter2DUsingConvolution<elemT>::get_influenced_indices(IndexRange<1>& infl`
`70`	`72`	`output_index_range.get_max_index() + filter_coefficients.get_max_index());`
`71`	`73`	`return Succeeded::yes;`
`72`	`74`	`}`
	`75`	`+#endif`
`73`	`76`
`74`	`77`	`template <typename elemT>`
`75`	`78`	`void`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ ArrayFilter3DUsingConvolution<elemT>::is_trivial() const`
`59`	`59`	`&& filter_coefficients[0][0][0] == 1);`
`60`	`60`	`}`
`61`	`61`
	`62`	`+#if 0`
	`63`	`+// commented out as it does not make sense to have a 1D IndexRange for a 2D filter`
`62`	`64`	`template <typename elemT>`
`63`	`65`	`Succeeded`
`64`	`66`	`ArrayFilter3DUsingConvolution<elemT>::get_influencing_indices(IndexRange<1>& influencing_index_range,`
`@@ -82,6 +84,7 @@ ArrayFilter3DUsingConvolution<elemT>::get_influenced_indices(IndexRange<1>& infl`
`82`	`84`	`output_index_range.get_max_index() + filter_coefficients.get_max_index());`
`83`	`85`	`return Succeeded::yes;`
`84`	`86`	`}`
	`87`	`+#endif`
`85`	`88`
`86`	`89`	`#if 1`
`87`	`90`	`template <typename elemT>`