Merge pull request 'Extend image API' (#136) from misc into master

Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/136
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>

openVulkanoCpp/Image/ImageLoader.cpp

@@ -60,4 +60,16 @@ namespace OpenVulkano::Image
 		stbi_image_free(pixelData);
 		return std::make_unique<Image>(std::move(result));
 	}
+
+	Math::Vector2i IImageLoader::GetDimensionsInternal(const std::string& filename)
+	{
+		Math::Vector2i res = {};
+		int channels;
+		if (!stbi_info(filename.c_str(), &res.x, &res.y, &channels))
+		{
+			Logger::FILESYS->error("Failed to read image header of file {}", filename);
+			return Math::Vector2i{ -1, -1 };
+		}
+		return res;
+	}
 }

openVulkanoCpp/Image/ImageLoader.hpp

@@ -21,5 +21,8 @@ namespace OpenVulkano::Image
 		static std::unique_ptr<Image> loadData(const uint8_t* data, int size, int desiredChannels = 0);
 		virtual std::unique_ptr<Image> loadFromFile(const std::string& filePath) = 0;
 		virtual std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) = 0;
+		virtual Math::Vector2i GetImageDimensions(const std::string& filename) = 0;
+	protected:
+		static Math::Vector2i GetDimensionsInternal(const std::string& filename);
 	};
 }

openVulkanoCpp/Image/ImageLoaderJpeg.cpp

@@ -31,6 +31,33 @@ namespace OpenVulkano::Image
 		return loadJpeg(buffer.data(), buffer.size());
 	}
 
+	Math::Vector2i ImageLoaderJpeg::GetImageDimensions(const std::string& filename)
+	{
+#if __has_include("turbojpeg.h")
+		auto image = Utils::ReadFile(filename);
+		tjhandle jpegDecompressor = tjInitDecompress();
+		if (!jpegDecompressor)
+		{
+			Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
+			return Math::Vector2i { -1, -1 };
+		}
+		Math::Vector2i res = {};
+		int size = 0, jpegSubsamp = 0;
+		int status = tjDecompressHeader2(jpegDecompressor, reinterpret_cast<unsigned char*>(image.Data()), image.Size(),
+		                                 &res.x, &res.y, &jpegSubsamp);
+		if (status != 0)
+		{
+			Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
+			tjDestroy(jpegDecompressor);
+			return Math::Vector2i { -1, -1 };
+		}
+		tjDestroy(jpegDecompressor);
+		return res;
+#else
+		return IImageLoader::GetDimensionsInternal(filename);
+#endif
+	}
+
 	std::unique_ptr<Image> ImageLoaderJpeg::loadJpeg(const uint8_t* data, size_t size)
 	{
 #if __has_include("turbojpeg.h")

openVulkanoCpp/Image/ImageLoaderJpeg.hpp

@@ -15,7 +15,7 @@ namespace OpenVulkano::Image
 	public:
 		std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
 		std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
-
+		Math::Vector2i GetImageDimensions(const std::string& filename) override;
 	private:
 		std::unique_ptr<Image> loadJpeg(const uint8_t* data, size_t size);
 	};

openVulkanoCpp/Image/ImageLoaderPng.cpp

@@ -22,4 +22,9 @@ namespace OpenVulkano::Image
 	{
 		return loadData(buffer.data(), static_cast<int>(buffer.size()));
 	}
+
+	Math::Vector2i ImageLoaderPng::GetImageDimensions(const std::string& filename)
+	{
+		return GetDimensionsInternal(filename);
+	}
 }

openVulkanoCpp/Image/ImageLoaderPng.hpp

@@ -15,5 +15,6 @@ namespace OpenVulkano::Image
 	public:
 		std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
 		std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
+		Math::Vector2i GetImageDimensions(const std::string& filename) override;
 	};
 }