diff --git a/file_io/include/aare/File.hpp b/file_io/include/aare/File.hpp index 611c98c..a490598 100644 --- a/file_io/include/aare/File.hpp +++ b/file_io/include/aare/File.hpp @@ -12,7 +12,7 @@ template class File { public: - virtual Frame* get_frame(int frame_number) = 0; + virtual Frame* get_frame(size_t frame_number) = 0; private: //comment diff --git a/file_io/include/aare/JsonFile.hpp b/file_io/include/aare/JsonFile.hpp index a878ebc..9dc0565 100644 --- a/file_io/include/aare/JsonFile.hpp +++ b/file_io/include/aare/JsonFile.hpp @@ -9,7 +9,7 @@ template class JsonFile : public File using config = RawFileConfig; public: - Frame *get_frame(int frame_number); + Frame *get_frame(size_t frame_number); int n_subfiles; std::vector subfiles; int subfile_rows, subfile_cols; diff --git a/file_io/include/aare/NumpyFile.hpp b/file_io/include/aare/NumpyFile.hpp index a5a57b2..80c8d62 100644 --- a/file_io/include/aare/NumpyFile.hpp +++ b/file_io/include/aare/NumpyFile.hpp @@ -11,7 +11,7 @@ template class NumpyFile : public Fil public: NumpyFile(std::filesystem::path fname); - Frame *get_frame(int frame_number) override; + Frame *get_frame(size_t frame_number) override; header_t header{}; static constexpr std::array magic_str{'\x93', 'N', 'U', 'M', 'P', 'Y'}; uint8_t major_ver_{}; diff --git a/file_io/src/JsonFile.cpp b/file_io/src/JsonFile.cpp index 503b6fa..0b7844d 100644 --- a/file_io/src/JsonFile.cpp +++ b/file_io/src/JsonFile.cpp @@ -1,7 +1,7 @@ #include "aare/JsonFile.hpp" template -Frame *JsonFile::get_frame(int frame_number) { +Frame *JsonFile::get_frame(size_t frame_number) { if (frame_number > this->total_frames) { throw std::runtime_error("Frame number out of range"); } diff --git a/file_io/src/NumpyFile.cpp b/file_io/src/NumpyFile.cpp index 245942e..15f06ff 100644 --- a/file_io/src/NumpyFile.cpp +++ b/file_io/src/NumpyFile.cpp @@ -2,13 +2,13 @@ #include "aare/NumpyFile.hpp" template -NumpyFile::NumpyFile(std::filesystem::path fname){ - this->fname = fname; - fp = fopen(fname.c_str(), "rb"); +NumpyFile::NumpyFile(std::filesystem::path fname_){ + this->fname = fname_; + fp = fopen(this->fname.c_str(), "rb"); } template -Frame *NumpyFile::get_frame(int frame_number) { +Frame *NumpyFile::get_frame(size_t frame_number) { if (fp == nullptr) { throw std::runtime_error("File not open"); } diff --git a/file_io/src/NumpyFileFactory.cpp b/file_io/src/NumpyFileFactory.cpp index 42e2056..1f912eb 100644 --- a/file_io/src/NumpyFileFactory.cpp +++ b/file_io/src/NumpyFileFactory.cpp @@ -78,12 +78,11 @@ template File* NumpyFileFactory::load_file() { NumpyFile *file = new NumpyFile(this->m_fpath); parse_metadata(file); - NumpyFile *f = dynamic_cast *>(file); - std::cout << "parsed header: " << f->header.to_string() << std::endl; + std::cout << "parsed header: " << file->header.to_string() << std::endl; - if(sizeof(DataType) != f->header.dtype.itemsize){ + if(sizeof(DataType) != file->header.dtype.itemsize){ std::stringstream s; - s << "Data type size mismatch: " << sizeof(DataType) << " != " << f->header.dtype.itemsize; + s << "Data type size mismatch: " << sizeof(DataType) << " != " << file->header.dtype.itemsize; throw std::runtime_error(s.str()); } return file;