From e59940aa0196d66cb18d4cfdcb1554c14e486ee2 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 2 Apr 2024 15:05:09 +0200 Subject: [PATCH] formatting --- file_io/src/NumpyFile.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/file_io/src/NumpyFile.cpp b/file_io/src/NumpyFile.cpp index d21429e..44f452b 100644 --- a/file_io/src/NumpyFile.cpp +++ b/file_io/src/NumpyFile.cpp @@ -109,14 +109,6 @@ NumpyFile::~NumpyFile() { void NumpyFile::load_metadata(){ - // auto file = dynamic_cast(_file); - // // open ifsteam to file - // f = std::ifstream(file->m_fname, std::ios::binary); - // // check if file exists - // if (!f.is_open()) { - // throw std::runtime_error(fmt::format("Could not open: \"{}\" for reading", file->m_fname.c_str())); - // } - // read magic number std::array tmp{}; fread(tmp.data(), tmp.size(), 1, fp); @@ -128,8 +120,8 @@ void NumpyFile::load_metadata(){ } // read version - fread(reinterpret_cast(&major_ver_),sizeof(major_ver_), 1,fp); - fread(reinterpret_cast(&minor_ver_), sizeof(minor_ver_),1,fp); + fread(reinterpret_cast(&major_ver_), sizeof(major_ver_), 1,fp); + fread(reinterpret_cast(&minor_ver_), sizeof(minor_ver_), 1,fp); if (major_ver_ == 1) { header_len_size = 2; @@ -145,13 +137,13 @@ void NumpyFile::load_metadata(){ if (header_size % 16 != 0) { fmt::print("Warning: header length is not a multiple of 16\n"); } + // read header auto buf_v = std::vector(header_len); fread(buf_v.data(), header_len,1,fp); std::string header(buf_v.data(), header_len); // parse header - std::vector keys{"descr", "fortran_order", "shape"}; aare::logger::debug("original header: \"header\"");