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

changed JF structures and tiff writer for rectangular detectors

Browse Source
This commit is contained in:
bergamaschi
2022-11-08 11:27:31 +01:00
parent 4f21ad5122
commit f0c0f07701
4 changed files with 184 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorCalibration/tiffio/include/sls/tiffIO.h
View File

@ -5,12 +5,12 @@
//Write 32bit float data to tiff file
//Always returns nullptr, prints message on failure
void *WriteToTiff(float *imgData, const char *imgname, int nrow, int ncol);
void *WriteToTiff(float *imgData, const char *imgname, int ncol, int nrow);
//Read 32bit float data from tiff file, returns pointer to data and sets
//image dimensions in the out parameters nrow, ncol.
//Returns nullptr on failure
//The caller is responsible to deallocate the memory that the returned
//pointer points to.
float *ReadFromTiff(const char *imgname, uint32_t &nrow, uint32_t &ncol);
float *ReadFromTiff(const char *imgname, uint32_t &ncol, uint32_t &nrow);

4
slsDetectorCalibration/tiffio/src/tiffIO.cpp
View File

@ -5,7 +5,7 @@
#include <iostream>
#include <tiffio.h>
void *WriteToTiff(float *imgData, const char *imgname, int nrow, int ncol) {
void *WriteToTiff(float *imgData, const char *imgname, int ncol, int nrow) {
constexpr uint32_t sampleperpixel = 1;
TIFF *tif = TIFFOpen(imgname, "w");
if (tif) {
@ -30,7 +30,7 @@ void *WriteToTiff(float *imgData, const char *imgname, int nrow, int ncol) {
return nullptr;
}
float *ReadFromTiff(const char *imgname, uint32_t &nrow, uint32_t &ncol) {
float *ReadFromTiff(const char *imgname, uint32_t &ncol, uint32_t &nrow) {
TIFF *tif = TIFFOpen(imgname, "r");
if (tif) {
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &ncol);