From 57a12621172894c9fcd4e876321e5a122a07dca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 5 Mar 2024 16:18:02 +0100 Subject: [PATCH] use size_t instead of int for max range values --- CGAL_ImageIO/include/CGAL/IO/read_vtk_image_data.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CGAL_ImageIO/include/CGAL/IO/read_vtk_image_data.h b/CGAL_ImageIO/include/CGAL/IO/read_vtk_image_data.h index 0492e2acc6a..a7a4d9596b2 100644 --- a/CGAL_ImageIO/include/CGAL/IO/read_vtk_image_data.h +++ b/CGAL_ImageIO/include/CGAL/IO/read_vtk_image_data.h @@ -88,11 +88,10 @@ read_vtk_image_data(vtkImageData* vtk_image, Image_3::Own owning = Image_3::OWN_ // If there is more than a scalar per point, vtk_image->data is not immediately // interpretable in Image_3->data CGAL_assertion(owning == Image_3::OWN_THE_DATA || cn == 1); - - CGAL_assertion(vtk_image->GetPointData()->GetScalars()->GetNumberOfTuples() == dims[0]*dims[1]*dims[2]); + CGAL_assertion(vtk_image->GetPointData()->GetScalars()->GetNumberOfTuples() == image->xdim*image->ydim*image->zdim); if(owning == Image_3::OWN_THE_DATA) { - int dims_n = dims[0]*dims[1]*dims[2]; + std::size_t dims_n = image->xdim*image->ydim*image->zdim; image->data = ::ImageIO_alloc(dims_n * image->wdim); // std::cerr << "GetNumberOfTuples() = " << vtk_image->GetPointData()->GetScalars()->GetNumberOfTuples() << "\n" @@ -110,7 +109,7 @@ read_vtk_image_data(vtkImageData* vtk_image, Image_3::Own owning = Image_3::OWN_ char* src = static_cast(vtk_image->GetPointData()->GetScalars()->GetVoidPointer(0)); char* dest = static_cast(image->data); - for(int i=0; iwdim because we casted to char* and not the actual data type memcpy(dest + image->wdim*i, src + cn*image->wdim*i, image->wdim);