songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add consistency in the use of size_t everywhere

This commit is contained in:
Jane Tournois 2014-11-13 11:13:35 +01:00
parent f9e7e834a8
commit 9c4038d267
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CGAL_ImageIO/include/CGAL/Image_3.h
View File

@ -134,9 +134,9 @@ public:
double vy() const { return image_ptr->vy; } double vy() const { return image_ptr->vy; }
double vz() const { return image_ptr->vz; } double vz() const { return image_ptr->vz; }
float value(const unsigned int i, float value(const std::size_t i,
const unsigned int j, const std::size_t j,
const unsigned int k) const const std::size_t k) const
{ {
return ::evaluate(image(),i,j,k); return ::evaluate(image(),i,j,k);
} }

6
CGAL_ImageIO/src/CGAL_ImageIO/ImageIO.cpp
View File

@ -1543,9 +1543,9 @@ float triLinInterp(const _image* image,
// Gives the value of the image at pixel (i,j,k), converted in float. // Gives the value of the image at pixel (i,j,k), converted in float.
float evaluate(const _image* image, float evaluate(const _image* image,
const unsigned int i, const std::size_t i,
const unsigned int j, const std::size_t j,
const unsigned int k) const std::size_t k)
{ {
using CGAL::IMAGEIO::static_evaluate; using CGAL::IMAGEIO::static_evaluate;

14
CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation.cpp
View File

@ -195,7 +195,7 @@ int main() {
"../Surface_mesher_Examples/data/skull_2.9.inr" "../Surface_mesher_Examples/data/skull_2.9.inr"
}; };
unsigned int file_index = 0; std::size_t file_index = 0;
for( ; file_index < sizeof(filenames); ++file_index) for( ; file_index < sizeof(filenames); ++file_index)
{ {
std::ifstream image_file(filenames[file_index], std::ios_base::binary | std::ios_base::in ); std::ifstream image_file(filenames[file_index], std::ios_base::binary | std::ios_base::in );
@ -242,18 +242,18 @@ int main() {
if(diff > 0.0001 ) if(diff > 0.0001 )
{ {
std::cerr.precision(20); std::cerr.precision(20);
const int i1 = (int)(d_z / image2.image()->vz); const std::size_t i1 = static_cast<std::size_t>(d_z / image2.image()->vz);
const int j1 = (int)(d_y / image2.image()->vy); const std::size_t j1 = static_cast<std::size_t>(d_y / image2.image()->vy);
const int k1 = (int)(d_x / image2.image()->vx); const std::size_t k1 = static_cast<std::size_t>(d_x / image2.image()->vx);
std::cerr << "pos = (" << d_x << ", " << d_y << ", " << d_z << ") => (" std::cerr << "pos = (" << d_x << ", " << d_y << ", " << d_z << ") => ("
<< i1 << ", " << j1 << ", " << k1 << ")\n"; << i1 << ", " << j1 << ", " << k1 << ")\n";
std::cerr << "value1 = " << value1 std::cerr << "value1 = " << value1
<< "\nvalue2 = " << value2 << std::endl; << "\nvalue2 = " << value2 << std::endl;
for(int di = 0; di < 2 ; ++di) for(std::size_t di = 0; di < 2 ; ++di)
for(int dj = 0; dj < 2 ; ++dj) for(std::size_t dj = 0; dj < 2 ; ++dj)
for(int dk = 0; dk < 2 ; ++dk) for(std::size_t dk = 0; dk < 2 ; ++dk)
{ {
std::cerr << "value(" << i1 + di std::cerr << "value(" << i1 + di
<< ", " << j1 + dj << ", " << j1 + dj