Marked all (probably) functions that take regular string instead of std::fs::path as deprecated
This commit is contained in:
@@ -19,10 +19,10 @@ namespace OpenVulkano::Image
|
||||
virtual ~IImageLoader() = default;
|
||||
|
||||
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> loadFromFile(const std::string& filePath) [[deprecated]] = 0;
|
||||
virtual std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) = 0;
|
||||
virtual Math::Vector2i GetImageDimensions(const std::string& filename) = 0;
|
||||
virtual Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] = 0;
|
||||
protected:
|
||||
static Math::Vector2i GetDimensionsInternal(const std::string& filename);
|
||||
static Math::Vector2i GetDimensionsInternal(const std::string& filename) [[deprecated]];
|
||||
};
|
||||
}
|
||||
@@ -18,9 +18,9 @@ namespace OpenVulkano::Image
|
||||
class ImageLoaderDds : public IImageLoader
|
||||
{
|
||||
public:
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
|
||||
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override;
|
||||
|
||||
protected:
|
||||
std::unique_ptr<Image> ExtractImage(dds::Image* ddsImage);
|
||||
|
||||
@@ -13,9 +13,9 @@ namespace OpenVulkano::Image
|
||||
class ImageLoaderJpeg : public IImageLoader
|
||||
{
|
||||
public:
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
|
||||
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override;
|
||||
private:
|
||||
std::unique_ptr<Image> loadJpeg(const uint8_t* data, size_t size);
|
||||
};
|
||||
|
||||
@@ -13,8 +13,8 @@ namespace OpenVulkano::Image
|
||||
class ImageLoaderKtx : public IImageLoader
|
||||
{
|
||||
public:
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
|
||||
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,8 +13,8 @@ namespace OpenVulkano::Image
|
||||
class ImageLoaderPfm : public IImageLoader
|
||||
{
|
||||
public:
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
|
||||
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override;
|
||||
};
|
||||
}
|
||||
@@ -13,8 +13,8 @@ namespace OpenVulkano::Image
|
||||
class ImageLoaderPng : public IImageLoader
|
||||
{
|
||||
public:
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
|
||||
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override;
|
||||
};
|
||||
}
|
||||
@@ -12,8 +12,8 @@ namespace OpenVulkano::Image
|
||||
class ImageLoaderPnm : public IImageLoader
|
||||
{
|
||||
public:
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
|
||||
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
|
||||
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) override;
|
||||
Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user