diff --git a/include/DEN/DenFrame2DReader.hpp b/include/DEN/DenFrame2DReader.hpp index daa8c4b282f3c98ecc29366939926e824895c666..6da8ca80ec80d01956cb410ef30893f4e9334735 100644 --- a/include/DEN/DenFrame2DReader.hpp +++ b/include/DEN/DenFrame2DReader.hpp @@ -50,13 +50,14 @@ namespace io { uint32_t dimz() const override; std::string getFileName() const; /**Returns file name of the underlying DEN file.**/ - private: + protected: std::string denFile; uint64_t offset; // protected: // Visible in inheritance structure uint32_t sizex, sizey, sizez; DenSupportedType dataType; int elementByteSize; + private: mutable std::mutex* consistencyMutexes; uint8_t** buffers; T** buffer_copys; diff --git a/include/DENITK/DenFrame2DReaderItk.hpp b/include/DENITK/DenFrame2DReaderItk.hpp index f3676d4b3a346e616ba92fa6fe290e5d71bdb8df..12389ed41d70ace2f4e67e32964d0a22505d585e 100644 --- a/include/DENITK/DenFrame2DReaderItk.hpp +++ b/include/DENITK/DenFrame2DReaderItk.hpp @@ -38,10 +38,9 @@ namespace io { { // LOGD << "Called readProjectionSliceToItkImage method, transpose???"; typename itk::RawImageIO::Pointer rawImageIO = itk::RawImageIO::New(); - rawImageIO->SetFileName(this->denFile); //(1) ... this is probably unnecessery + rawImageIO->SetFileName(this->getFileName()); //(1) ... this is probably unnecessery rawImageIO->SetFileTypeToBinary(); - uint32_t offset = 6; - rawImageIO->SetHeaderSize(offset + i * this->elementByteSize * (this->sizex * this->sizey)); + rawImageIO->SetHeaderSize(this->offset + i * this->elementByteSize * (this->sizex * this->sizey)); rawImageIO->SetFileDimensionality(2); rawImageIO->SetOrigin(0, 0.0); // origin in millimeters