Fix posix file storage again

Author: jherico

base/vks/storage.cpp

@@ -72,6 +72,14 @@ class MemoryStorage : public Storage {
     std::vector<uint8_t> _data;
 };
 
+#if defined(__ANDROID__) || defined(WIN32)
+#define MAPPED_FILES 1
+#else
+#define MAPPED_FILES 0
+#endif
+
+#if MAPPED_FILES
+
 class FileStorage : public Storage {
 public:
     static StoragePointer create(const std::string& filename, size_t size, const uint8_t* data);
@@ -121,27 +129,6 @@ FileStorage::FileStorage(const std::string& filename) {
         throw std::runtime_error("Failed to create mapping");
     }
     _mapped = (uint8_t*)MapViewOfFile(_mapFile, FILE_MAP_READ, 0, 0, 0);
-#else
-    // FIXME move to posix memory mapped files
-    // open the file:
-    std::ifstream file(filename, std::ios::binary);
-    // Stop eating new lines in binary mode!!!
-    file.unsetf(std::ios::skipws);
-
-    // get its size:
-    std::streampos fileSize;
-
-    file.seekg(0, std::ios::end);
-    fileSize = file.tellg();
-    file.seekg(0, std::ios::beg);
-
-    // reserve capacity
-    _data.reserve(fileSize);
-
-    // read the data:
-    _data.insert(_data.begin(), std::istream_iterator<uint8_t>(file), std::istream_iterator<uint8_t>());
-    _size = _data.size();
-    file.close();
 #endif
 }
 
@@ -152,15 +139,40 @@ FileStorage::~FileStorage() {
     UnmapViewOfFile(_mapped);
     CloseHandle(_mapFile);
     CloseHandle(_file);
-#else
 #endif
 }
 
+#endif
+
 StoragePointer Storage::create(size_t size, uint8_t* data) {
     return std::make_shared<MemoryStorage>(size, data);
 }
 StoragePointer Storage::readFile(const std::string& filename) {
+#if MAPPED_FILES
     return std::make_shared<FileStorage>(filename);
+#else
+    // FIXME move to posix memory mapped files
+    // open the file:
+    std::ifstream file(filename, std::ios::binary);
+    // Stop eating new lines in binary mode!!!
+    file.unsetf(std::ios::skipws);
+
+    // get its size:
+    std::streampos fileSize;
+
+    file.seekg(0, std::ios::end);
+    fileSize = file.tellg();
+    file.seekg(0, std::ios::beg);
+
+
+	std::vector<uint8_t> fileData;
+    // reserve capacity
+    fileData.reserve(fileSize);
+    // read the data:
+    fileData.insert(fileData.begin(), std::istream_iterator<uint8_t>(file), std::istream_iterator<uint8_t>());
+    file.close();
+	return std::make_shared<MemoryStorage>(fileData.size(), fileData.data());
+#endif
 }
 
 }}  // namespace vks::storage