From 02174f79d1b1a7f1cd74a870ed10a48fd02c4b1c Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 24 Jan 2022 09:01:44 +0100 Subject: [PATCH] changed deprecated uint32 declaration to uint32_t --- slsDetectorCalibration/analogDetector.h | 8 ++++---- .../interpolations/etaInterpolationBase.h | 4 ++-- .../jungfrauExecutables/jungfrauPhotonCounter.cpp | 2 +- .../moenchExecutables/moenchPhotonCounter.cpp | 2 +- slsDetectorCalibration/multiThreadedAnalogDetector.h | 4 ++-- slsDetectorCalibration/tiffIO.cpp | 10 +++++----- slsDetectorCalibration/tiffIO.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/slsDetectorCalibration/analogDetector.h b/slsDetectorCalibration/analogDetector.h index 098160bd0..c80ab60be 100644 --- a/slsDetectorCalibration/analogDetector.h +++ b/slsDetectorCalibration/analogDetector.h @@ -249,7 +249,7 @@ template class analogDetector { \returns pointer to current gain map is file reading succeeded, NULL is file reading didn't work. */ double *readGainMap(const char * imgname) { - uint32 nnx, nny; + uint32_t nnx, nny; float *gm=ReadFromTiff( imgname, nny, nnx); if (gm) { if (gmap) delete [] gmap; @@ -688,7 +688,7 @@ template class analogDetector { \returns 0 if file reading didn't succed, otherwise 1 */ int readPedestals(const char * imgname) { - uint32 nnx, nny; + uint32_t nnx, nny; float *gm=ReadFromTiff( imgname, nny, nnx); if (nnx>nx) nnx=nx; if (nny>ny) nny=ny; @@ -713,7 +713,7 @@ template class analogDetector { \returns 0 if file reading didn't succed, otherwise 1 */ int readImage(const char * imgname) { - uint32 nnx, nny; + uint32_t nnx, nny; float *gm=ReadFromTiff( imgname, nny, nnx); if (nnx>nx) nnx=nx; if (nny>ny) nny=ny; @@ -764,7 +764,7 @@ template class analogDetector { */ int readPedestalRMS(const char * imgname) { - uint32 nnx, nny; + uint32_t nnx, nny; float *gm=ReadFromTiff( imgname, nny, nnx); if (nnx>nx) nnx=nx; if (nny>ny) nny=ny; diff --git a/slsDetectorCalibration/interpolations/etaInterpolationBase.h b/slsDetectorCalibration/interpolations/etaInterpolationBase.h index c87449051..0882c8f23 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationBase.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationBase.h @@ -145,8 +145,8 @@ class etaInterpolationBase : public slsInterpolation { etastepX=(etamax-etamin)/nbetaX; etastepY=(etamax-etamin)/nbetaY; - uint32 nnx; - uint32 nny; + uint32_t nnx; + uint32_t nny; float *gm=ReadFromTiff(imgname, nnx, nny); /* if (nnx!=nny) { */ /* cout << "different number of bins in x " << nnx << " and y " << nny<< " !"<< endl; */ diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp index 51b416e7a..8b81cdebe 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) { cout << "threshold is " << thr << endl; cout << "Nframes is " << nframes << endl; - uint32 nnx, nny; + uint32_t nnx, nny; double *gmap; // if (gainfname) { diff --git a/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp b/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp index 51b416e7a..8b81cdebe 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) { cout << "threshold is " << thr << endl; cout << "Nframes is " << nframes << endl; - uint32 nnx, nny; + uint32_t nnx, nny; double *gmap; // if (gainfname) { diff --git a/slsDetectorCalibration/multiThreadedAnalogDetector.h b/slsDetectorCalibration/multiThreadedAnalogDetector.h index e1cc9d6bc..ff70cd8a4 100644 --- a/slsDetectorCalibration/multiThreadedAnalogDetector.h +++ b/slsDetectorCalibration/multiThreadedAnalogDetector.h @@ -587,8 +587,8 @@ public: int nx, ny; dets[0]->getDetectorSize(nx,ny); - uint32 nnx; - uint32 nny; + uint32_t nnx; + uint32_t nny; float *gm=ReadFromTiff(imgname, nnx, nny); if (ped) delete [] ped; if (nnx>(uint)nx) nx=nnx; diff --git a/slsDetectorCalibration/tiffIO.cpp b/slsDetectorCalibration/tiffIO.cpp index c92ba87fc..a60978eee 100644 --- a/slsDetectorCalibration/tiffIO.cpp +++ b/slsDetectorCalibration/tiffIO.cpp @@ -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