replace error prone FileReader factory class with simple readFile(fn) function

Author: axxel

src/librawspeed/io/FileReader.cpp

@@ -24,79 +24,28 @@
 #include <cstdio>               // for fclose, fseek, fopen, fread, ftell
 #include <fcntl.h>              // for SEEK_END, SEEK_SET
 
-#if !defined(__unix__) && !defined(__APPLE__)
-#include <io.h>
-#include <tchar.h>
-#include <windows.h>
-#endif // !defined(__unix__) && !defined(__APPLE__)
-
 namespace RawSpeed {
 
-FileReader::FileReader(const char *_filename) : mFilename(_filename) {}
-
-FileMap* FileReader::readFile() {
-#if defined(__unix__) || defined(__APPLE__)
-  int bytes_read = 0;
-  FILE *file;
-  char *dest;
-  long size;
-
-  file = fopen(mFilename, "rb");
-  if (file == nullptr)
-    ThrowFIE("Could not open file.");
-  fseek(file, 0, SEEK_END);
-  size = ftell(file);
-  if (size <= 0) {
-    fclose(file);
-    ThrowFIE("File is 0 bytes.");
-  }
-  fseek(file, 0, SEEK_SET);
-
-#if 0
-  // Not used, as it is slower than sync read
-
-  uchar8* pa = (uchar8*)mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-  FileMap *fileData = new FileMap(pa, size);
-
-#else
-  auto *fileData = new FileMap(size);
-
-  dest = (char *)fileData->getDataWrt(0, size);
-  bytes_read = fread(dest, 1, size, file);
-  fclose(file);
-  if (size != bytes_read) {
-    delete fileData;
-    ThrowFIE("Could not read file.");
-  }
-#endif
-
-#else // __unix__
-  HANDLE file_h;  // File handle
-  file_h = CreateFile(mFilename, GENERIC_READ, FILE_SHARE_READ, nullptr,
-                      OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
-  if (file_h == INVALID_HANDLE_VALUE) {
+Buffer readFile(const char* fn)
+{
+  std::unique_ptr<FILE, decltype(&fclose)> file(fopen(fn, "rb"), &fclose);
+  if (!file)
     ThrowFIE("Could not open file.");
-  }
 
-  LARGE_INTEGER f_size;
-  GetFileSizeEx(file_h , &f_size);
+  fseek(file.get(), 0, SEEK_END);
+  long size = ftell(file.get());
+  if (size <= 0)
+    ThrowFIE("File is empty or has unknown size.");
 
-  if (!f_size.LowPart)
-    ThrowFIE("File is 0 bytes.");
+  fseek(file.get(), 0, SEEK_SET);
 
-  FileMap *fileData = new FileMap(f_size.LowPart);
+  Buffer data(size);
 
-  DWORD bytes_read;
-  if (!ReadFile(file_h, fileData->getDataWrt(0, fileData->getSize()),
-                fileData->getSize(), &bytes_read, nullptr)) {
-    CloseHandle(file_h);
-    delete fileData;
+  size_t bytes_read = fread((char *)data.getDataWrt(0, size), 1, size, file.get());
+  if ((size_t)size != bytes_read)
     ThrowFIE("Could not read file.");
-  }
-  CloseHandle(file_h);
 
-#endif // __unix__
-  return fileData;
+  return data;
 }
 
 } // namespace RawSpeed

src/librawspeed/io/FileReader.h

@@ -20,21 +20,10 @@
 
 #pragma once
 
-#include "io/FileMap.h" // for FileMap
+#include "io/Buffer.h"
 
 namespace RawSpeed {
 
-class FileReader
-{
-public:
-  FileReader(const char *filename);
-
-  FileMap* readFile();
-  const char* Filename() const { return mFilename; }
-  //  void Filename(const char * val) { mFilename = val; }
-
-private:
-  const char* mFilename;
-};
+Buffer readFile(const char* filename);
 
 } // namespace RawSpeed

src/utilities/identify/rawspeed-identify.cpp

@@ -125,11 +125,9 @@ int main(int argc, char *argv[]) {
 
     fprintf(stderr, "Loading file: \"%s\"\n", argv[1]);
 
-    FileReader f(argv[1]);
+    auto fileBuffer = readFile(argv[1]);
 
-    std::unique_ptr<FileMap> m(f.readFile());
-
-    RawParser t(m.get());
+    RawParser t(&fileBuffer);
 
     std::unique_ptr<RawDecoder> d(t.getDecoder(meta.get()));
 

src/utilities/rstest/rstest.cpp

@@ -188,16 +188,12 @@ size_t process(const string& filename, const CameraMetaData* metadata,
 #endif
   cout << left << setw(55) << filename << ": starting decoding ... " << endl;
 
-  FileReader reader(filename.c_str());
-
-  unique_ptr<FileMap> map = unique_ptr<FileMap>(reader.readFile());
-  // FileMap* map = readFile( argv[1] );
+  Buffer fileBuffer = readFile( argv[1] );
 
   Timer t;
 
-  RawParser parser(map.get());
-  unique_ptr<RawDecoder> decoder =
-      unique_ptr<RawDecoder>(parser.getDecoder(metadata));
+  RawParser parser(&fileBuffer);
+  unique_ptr<RawDecoder> decoder(parser.getDecoder(metadata));
   // RawDecoder* decoder = parseRaw( map );
 
   decoder->failOnUnknown = false;
@@ -213,7 +209,7 @@ size_t process(const string& filename, const CameraMetaData* metadata,
 #pragma omp critical(io)
 #endif
   cout << left << setw(55) << filename << ": " << internal << setw(3)
-       << map->getSize() / 1000000 << " MB / " << setw(4) << time << " ms"
+       << fileBuffer.getSize() / 1000000 << " MB / " << setw(4) << time << " ms"
        << endl;
 
   if (create) {