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

wdim should also be a std::size_t

This commit is contained in:
Jane Tournois 2014-10-24 13:51:23 +02:00
parent 127a07b0b1
commit 6529a13915
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CGAL_ImageIO/include/CGAL/ImageIO.h
View File

@ -255,7 +255,7 @@ typedef struct point_image {
void *data; void *data;
/** Image word size (in bytes) */ /** Image word size (in bytes) */
unsigned int wdim; std::size_t wdim;
/** Image format to use for I/0. Should not be set by user */ /** Image format to use for I/0. Should not be set by user */
PTRIMAGE_FORMAT imageFormat; PTRIMAGE_FORMAT imageFormat;
/** Data buffer vectors are interlaced or non interlaced */ /** Data buffer vectors are interlaced or non interlaced */
@ -545,7 +545,7 @@ namespace IMAGEIO {
// //
// The following definition are for the evaluate function. // The following definition are for the evaluate function.
// //
template <WORD_KIND wordKind, SIGN sign, unsigned int wdim> template <WORD_KIND wordKind, SIGN sign, std::size_t wdim>
struct Word_type_generator struct Word_type_generator
{ {
}; };

2
CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp
View File

@ -293,7 +293,7 @@ int readInrimageHeader(const char *,_image *im) {
insight (GM). insight (GM).
*/ */
else if(!strncmp(str, "PIXSIZE=", 8)) { else if(!strncmp(str, "PIXSIZE=", 8)) {
if(sscanf(str+8, "%u", &im->wdim) != 1) return -1; if(sscanf(str+8, "%zu", &im->wdim) != 1) return -1;
if(im->wdim != 8 && im->wdim != 16 && im->wdim != 32 && if(im->wdim != 8 && im->wdim != 16 && im->wdim != 32 &&
im->wdim != 64) return -1; im->wdim != 64) return -1;