Moved deprecated attr at beginning of functions

This commit is contained in:
Vladyslav Baranovskyi
2025-02-11 17:34:12 +02:00
parent e976515d82
commit 3c7a883ee8
25 changed files with 49 additions and 47 deletions

View File

@@ -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) [[deprecated]] = 0;
[[deprecated]] 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) [[deprecated]] = 0;
[[deprecated]] virtual Math::Vector2i GetImageDimensions(const std::string& filename) = 0;
protected:
static Math::Vector2i GetDimensionsInternal(const std::string& filename) [[deprecated]];
[[deprecated]] static Math::Vector2i GetDimensionsInternal(const std::string& filename);
};
}

View File

@@ -18,9 +18,9 @@ namespace OpenVulkano::Image
class ImageLoaderDds : public IImageLoader
{
public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
[[deprecated]] 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) [[deprecated]] override;
[[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override;
protected:
std::unique_ptr<Image> ExtractImage(dds::Image* ddsImage);

View File

@@ -13,9 +13,9 @@ namespace OpenVulkano::Image
class ImageLoaderJpeg : public IImageLoader
{
public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
[[deprecated]] 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) [[deprecated]] override;
[[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override;
private:
std::unique_ptr<Image> loadJpeg(const uint8_t* data, size_t size);
};

View File

@@ -13,8 +13,8 @@ namespace OpenVulkano::Image
class ImageLoaderKtx : public IImageLoader
{
public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
[[deprecated]] 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) [[deprecated]] override;
[[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override;
};
}

View File

@@ -13,8 +13,8 @@ namespace OpenVulkano::Image
class ImageLoaderPfm : public IImageLoader
{
public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
[[deprecated]] 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) [[deprecated]] override;
[[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override;
};
}

View File

@@ -13,8 +13,8 @@ namespace OpenVulkano::Image
class ImageLoaderPng : public IImageLoader
{
public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
[[deprecated]] 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) [[deprecated]] override;
[[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override;
};
}

View File

@@ -12,8 +12,8 @@ namespace OpenVulkano::Image
class ImageLoaderPnm : public IImageLoader
{
public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) [[deprecated]] override;
[[deprecated]] 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) [[deprecated]] override;
[[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override;
};
}