From 5393f2101a8b862ba49f95c9889cf45b6be4c537 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Wed, 22 Nov 2023 16:25:44 +0100 Subject: [PATCH] Fix issues --- openVulkanoCpp/Base/Utils.cpp | 2 +- openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp | 2 +- openVulkanoCpp/Host/ResourceLoader.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openVulkanoCpp/Base/Utils.cpp b/openVulkanoCpp/Base/Utils.cpp index e0ee2fe..f67c51e 100644 --- a/openVulkanoCpp/Base/Utils.cpp +++ b/openVulkanoCpp/Base/Utils.cpp @@ -33,7 +33,7 @@ namespace OpenVulkano std::ifstream file(filePath, std::ios::ate | std::ios::binary); if (!file.is_open()) { - if (emptyOnMissing) return { 0 }; + if (emptyOnMissing) return {}; throw std::runtime_error("Failed to open file '" + filePath + "'!"); } const size_t fileSize = static_cast(file.tellg()); diff --git a/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp b/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp index f977b8a..a9cbcc2 100644 --- a/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp +++ b/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp @@ -42,6 +42,6 @@ namespace OpenVulkano Array ResourceLoaderAppDirLinux::GetResource(const std::string& resourceName) { - return Utils::ReadFile(GetAppDir() + resourceName); + return Utils::ReadFile(GetAppDir() + resourceName, true); } } \ No newline at end of file diff --git a/openVulkanoCpp/Host/ResourceLoader.cpp b/openVulkanoCpp/Host/ResourceLoader.cpp index 9eaaf5e..229f368 100644 --- a/openVulkanoCpp/Host/ResourceLoader.cpp +++ b/openVulkanoCpp/Host/ResourceLoader.cpp @@ -33,7 +33,7 @@ namespace OpenVulkano Logger::FILESYS->error("Unknown error trying to get resource for '{}'!", resourceName); } } - return { 0 }; + return {}; } void* Register(std::unique_ptr loader)