detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 07:17:13 +02:00
Code Issues Actions Packages Releases Activity

changed deprecated uint32 declaration to uint32_t

Browse Source
This commit is contained in:
Erik Frojdh
2022-01-24 09:01:44 +01:00
parent f95a15c841
commit 02174f79d1
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorCalibration/tiffIO.cpp
View File

@ -45,16 +45,16 @@ void *WriteToTiff(float * imgData, const char * imgname, int nrow, int ncol){
return NULL;
};
float *ReadFromTiff( const char * imgname, uint32 &nrow, uint32 &ncol){
float *ReadFromTiff( const char * imgname, uint32_t &nrow, uint32_t &ncol){
// unsigned char * buff=NULL;
TIFF * tif = TIFFOpen(imgname,"r");
if (tif){
uint32 bps;
uint32 sampleperpixel=1;
uint32_t bps;
uint32_t sampleperpixel=1;
//tsize_t linebytes;
uint32 imagelength;
uint32_t imagelength;
TIFFGetField(tif,TIFFTAG_IMAGEWIDTH,&ncol);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &nrow);
@ -65,7 +65,7 @@ float *ReadFromTiff( const char * imgname, uint32 &nrow, uint32 &ncol){
float * imgData=new float[ncol*nrow];
//linebytes = sampleperpixel*ncol;
// TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(tif, ncol*sampleperpixel));
for(uint32 irow=0; irow<nrow; irow++){
for(uint32_t irow=0; irow<nrow; irow++){
//tiffreadscanline(tif, buf, row);
TIFFReadScanline(tif,&imgData[irow*ncol],irow);
}