From 0ac278b2d643c5e07990e9c8816706f23bfb4128 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Sat, 18 May 2024 13:07:26 -0600 Subject: [PATCH] Remove default empty state of `sf::Image` --- examples/vulkan/Vulkan.cpp | 6 +- include/SFML/Graphics/Image.hpp | 33 ++--- include/SFML/Graphics/Texture.hpp | 27 ----- src/SFML/Graphics/Font.cpp | 3 +- src/SFML/Graphics/Image.cpp | 59 +++------ src/SFML/Graphics/Texture.cpp | 27 +++-- test/Graphics/Image.test.cpp | 195 ++++++++++-------------------- test/Graphics/Texture.test.cpp | 22 +--- 8 files changed, 122 insertions(+), 250 deletions(-) diff --git a/examples/vulkan/Vulkan.cpp b/examples/vulkan/Vulkan.cpp index 5467e6609..a122064f6 100644 --- a/examples/vulkan/Vulkan.cpp +++ b/examples/vulkan/Vulkan.cpp @@ -1801,14 +1801,16 @@ public: void setupTextureImage() { // Load the image data - sf::Image imageData; + const auto maybeImageData = sf::Image::loadFromFile("resources/logo.png"); - if (!imageData.loadFromFile("resources/logo.png")) + if (!maybeImageData) { vulkanAvailable = false; return; } + const auto& imageData = *maybeImageData; + // Create a staging buffer to transfer the data with const VkDeviceSize imageSize = imageData.getSize().x * imageData.getSize().y * 4; diff --git a/include/SFML/Graphics/Image.hpp b/include/SFML/Graphics/Image.hpp index ab10a22ca..3963585fe 100644 --- a/include/SFML/Graphics/Image.hpp +++ b/include/SFML/Graphics/Image.hpp @@ -55,16 +55,16 @@ class SFML_GRAPHICS_API Image { public: //////////////////////////////////////////////////////////// - /// \brief Create the image and fill it with a unique color + /// \brief Construct the image and fill it with a unique color /// /// \param size Width and height of the image /// \param color Fill color /// //////////////////////////////////////////////////////////// - void create(const Vector2u& size, const Color& color = Color::Black); + explicit Image(const Vector2u& size, const Color& color = Color::Black); //////////////////////////////////////////////////////////// - /// \brief Create the image from an array of pixels + /// \brief Construct the image from an array of pixels /// /// The \a pixel array is assumed to contain 32-bits RGBA pixels, /// and have the given \a width and \a height. If not, this is @@ -75,7 +75,7 @@ public: /// \param pixels Array of pixels to copy to the image /// //////////////////////////////////////////////////////////// - void create(const Vector2u& size, const std::uint8_t* pixels); + Image(const Vector2u& size, const std::uint8_t* pixels); //////////////////////////////////////////////////////////// /// \brief Load the image from a file on disk @@ -87,12 +87,12 @@ public: /// /// \param filename Path of the image file to load /// - /// \return True if loading was successful + /// \return Image if loading was successful, `std::nullopt` otherwise /// /// \see loadFromMemory, loadFromStream, saveToFile /// //////////////////////////////////////////////////////////// - [[nodiscard]] bool loadFromFile(const std::filesystem::path& filename); + [[nodiscard]] static std::optional loadFromFile(const std::filesystem::path& filename); //////////////////////////////////////////////////////////// /// \brief Load the image from a file in memory @@ -105,12 +105,12 @@ public: /// \param data Pointer to the file data in memory /// \param size Size of the data to load, in bytes /// - /// \return True if loading was successful + /// \return Image if loading was successful, `std::nullopt` otherwise /// /// \see loadFromFile, loadFromStream /// //////////////////////////////////////////////////////////// - [[nodiscard]] bool loadFromMemory(const void* data, std::size_t size); + [[nodiscard]] static std::optional loadFromMemory(const void* data, std::size_t size); //////////////////////////////////////////////////////////// /// \brief Load the image from a custom stream @@ -122,12 +122,12 @@ public: /// /// \param stream Source stream to read from /// - /// \return True if loading was successful + /// \return Image if loading was successful, `std::nullopt` otherwise /// /// \see loadFromFile, loadFromMemory /// //////////////////////////////////////////////////////////// - [[nodiscard]] bool loadFromStream(InputStream& stream); + [[nodiscard]] static std::optional loadFromStream(InputStream& stream); //////////////////////////////////////////////////////////// /// \brief Save the image to a file on disk @@ -281,6 +281,12 @@ public: void flipVertically(); private: + //////////////////////////////////////////////////////////// + /// \brief Directly initialize data members + /// + //////////////////////////////////////////////////////////// + Image(Vector2u size, std::vector&& pixels); + //////////////////////////////////////////////////////////// // Member data //////////////////////////////////////////////////////////// @@ -316,13 +322,10 @@ private: /// Usage example: /// \code /// // Load an image file from a file -/// sf::Image background; -/// if (!background.loadFromFile("background.jpg")) -/// return -1; +/// const auto background = sf::Image::loadFromFile("background.jpg").value(); /// /// // Create a 20x20 image filled with black color -/// sf::Image image; -/// image.create({20, 20}, sf::Color::Black); +/// sf::Image image({20, 20}, sf::Color::Black); /// /// // Copy background on image at position (10, 10) /// if (!image.copy(background, {10, 10})) diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp index 456a8c515..6ecd36cd5 100644 --- a/include/SFML/Graphics/Texture.hpp +++ b/include/SFML/Graphics/Texture.hpp @@ -110,15 +110,6 @@ public: //////////////////////////////////////////////////////////// /// \brief Load the texture from a file on disk /// - /// This function is a shortcut for the following code: - /// \code - /// sf::Image image; - /// if (!image.loadFromFile(filename)) - /// return false; - /// if (!texture.loadFromImage(image, area)) - /// return false; - /// \endcode - /// /// The \a area argument can be used to load only a sub-rectangle /// of the whole image. If you want the entire image then leave /// the default value (which is an empty IntRect). @@ -143,15 +134,6 @@ public: //////////////////////////////////////////////////////////// /// \brief Load the texture from a file in memory /// - /// This function is a shortcut for the following code: - /// \code - /// sf::Image image; - /// if (!image.loadFromMemory(data, size)) - /// return false; - /// if (!texture.loadFromImage(image, area)) - /// return false; - /// \endcode - /// /// The \a area argument can be used to load only a sub-rectangle /// of the whole image. If you want the entire image then leave /// the default value (which is an empty IntRect). @@ -177,15 +159,6 @@ public: //////////////////////////////////////////////////////////// /// \brief Load the texture from a custom stream /// - /// This function is a shortcut for the following code: - /// \code - /// sf::Image image; - /// if (!image.loadFromStream(stream)) - /// return false; - /// if (!texture.loadFromImage(image, area)) - /// return false; - /// \endcode - /// /// The \a area argument can be used to load only a sub-rectangle /// of the whole image. If you want the entire image then leave /// the default value (which is an empty IntRect). diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index 97a566330..23ff7d69b 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/SFML/Graphics/Font.cpp @@ -784,8 +784,7 @@ bool Font::setCurrentSize(unsigned int characterSize) const Font::Page::Page(bool smooth) { // Make sure that the texture is initialized by default - Image image; - image.create({128, 128}, Color::Transparent); + Image image({128, 128}, Color::Transparent); // Reserve a 2x2 white square for texturing underlines for (unsigned int x = 0; x < 2; ++x) diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp index 62d9fe940..e600d255a 100644 --- a/src/SFML/Graphics/Image.cpp +++ b/src/SFML/Graphics/Image.cpp @@ -95,7 +95,7 @@ using StbPtr = std::unique_ptr; namespace sf { //////////////////////////////////////////////////////////// -void Image::create(const Vector2u& size, const Color& color) +Image::Image(const Vector2u& size, const Color& color) { if (size.x && size.y) { @@ -131,7 +131,7 @@ void Image::create(const Vector2u& size, const Color& color) //////////////////////////////////////////////////////////// -void Image::create(const Vector2u& size, const std::uint8_t* pixels) +Image::Image(const Vector2u& size, const std::uint8_t* pixels) { if (pixels && size.x && size.y) { @@ -156,7 +156,13 @@ void Image::create(const Vector2u& size, const std::uint8_t* pixels) //////////////////////////////////////////////////////////// -bool Image::loadFromFile(const std::filesystem::path& filename) +Image::Image(Vector2u size, std::vector&& pixels) : m_size(size), m_pixels(std::move(pixels)) +{ +} + + +//////////////////////////////////////////////////////////// +std::optional Image::loadFromFile(const std::filesystem::path& filename) { #ifdef SFML_SYSTEM_ANDROID @@ -168,9 +174,6 @@ bool Image::loadFromFile(const std::filesystem::path& filename) #endif - // Clear the array (just in case) - m_pixels.clear(); - // Load the image and get a pointer to the pixels in memory int width = 0; int height = 0; @@ -179,13 +182,7 @@ bool Image::loadFromFile(const std::filesystem::path& filename) if (ptr) { - // Assign the image properties - m_size = Vector2u(Vector2i(width, height)); - - // Copy the loaded pixels to the pixel buffer - m_pixels.assign(ptr.get(), ptr.get() + width * height * 4); - - return true; + return Image(Vector2u(Vector2i(width, height)), {ptr.get(), ptr.get() + width * height * 4}); } else { @@ -193,20 +190,17 @@ bool Image::loadFromFile(const std::filesystem::path& filename) err() << "Failed to load image\n" << formatDebugPathInfo(filename) << "\nReason: " << stbi_failure_reason() << std::endl; - return false; + return std::nullopt; } } //////////////////////////////////////////////////////////// -bool Image::loadFromMemory(const void* data, std::size_t size) +std::optional Image::loadFromMemory(const void* data, std::size_t size) { // Check input parameters if (data && size) { - // Clear the array (just in case) - m_pixels.clear(); - // Load the image and get a pointer to the pixels in memory int width = 0; int height = 0; @@ -217,41 +211,32 @@ bool Image::loadFromMemory(const void* data, std::size_t size) if (ptr) { - // Assign the image properties - m_size = Vector2u(Vector2i(width, height)); - - // Copy the loaded pixels to the pixel buffer - m_pixels.assign(ptr.get(), ptr.get() + width * height * 4); - - return true; + return Image(Vector2u(Vector2i(width, height)), {ptr.get(), ptr.get() + width * height * 4}); } else { // Error, failed to load the image err() << "Failed to load image from memory. Reason: " << stbi_failure_reason() << std::endl; - return false; + return std::nullopt; } } else { err() << "Failed to load image from memory, no data provided" << std::endl; - return false; + return std::nullopt; } } //////////////////////////////////////////////////////////// -bool Image::loadFromStream(InputStream& stream) +std::optional Image::loadFromStream(InputStream& stream) { - // Clear the array (just in case) - m_pixels.clear(); - // Make sure that the stream's reading position is at the beginning if (stream.seek(0) == -1) { err() << "Failed to seek image stream" << std::endl; - return false; + return std::nullopt; } // Setup the stb_image callbacks @@ -268,19 +253,13 @@ bool Image::loadFromStream(InputStream& stream) if (ptr) { - // Assign the image properties - m_size = Vector2u(Vector2i(width, height)); - - // Copy the loaded pixels to the pixel buffer - m_pixels.assign(ptr.get(), ptr.get() + width * height * 4); - - return true; + return Image(Vector2u(Vector2i(width, height)), {ptr.get(), ptr.get() + width * height * 4}); } else { // Error, failed to load the image err() << "Failed to load image from stream. Reason: " << stbi_failure_reason() << std::endl; - return false; + return std::nullopt; } } diff --git a/src/SFML/Graphics/Texture.cpp b/src/SFML/Graphics/Texture.cpp index dd933de10..21ee7c35d 100644 --- a/src/SFML/Graphics/Texture.cpp +++ b/src/SFML/Graphics/Texture.cpp @@ -265,24 +265,30 @@ bool Texture::create(const Vector2u& size) //////////////////////////////////////////////////////////// bool Texture::loadFromFile(const std::filesystem::path& filename, const IntRect& area) { - Image image; - return image.loadFromFile(filename) && loadFromImage(image, area); + const auto image = sf::Image::loadFromFile(filename); + if (!image) + return false; + return loadFromImage(*image, area); } //////////////////////////////////////////////////////////// bool Texture::loadFromMemory(const void* data, std::size_t size, const IntRect& area) { - Image image; - return image.loadFromMemory(data, size) && loadFromImage(image, area); + const auto image = sf::Image::loadFromMemory(data, size); + if (!image) + return false; + return loadFromImage(*image, area); } //////////////////////////////////////////////////////////// bool Texture::loadFromStream(InputStream& stream, const IntRect& area) { - Image image; - return image.loadFromStream(stream) && loadFromImage(image, area); + const auto image = sf::Image::loadFromStream(stream); + if (!image) + return false; + return loadFromImage(*image, area); } @@ -364,8 +370,7 @@ Vector2u Texture::getSize() const Image Texture::copyToImage() const { // Easy case: empty texture - if (!m_texture) - return {}; + assert(m_texture && "Texture::copyToImage Cannot copy empty texture to image"); const TransientContextLock lock; @@ -456,11 +461,7 @@ Image Texture::copyToImage() const #endif // SFML_OPENGL_ES - // Create the image - Image image; - image.create(m_size, pixels.data()); - - return image; + return {m_size, pixels.data()}; } diff --git a/test/Graphics/Image.test.cpp b/test/Graphics/Image.test.cpp index 0dfd63689..f63ce6c5a 100644 --- a/test/Graphics/Image.test.cpp +++ b/test/Graphics/Image.test.cpp @@ -13,25 +13,18 @@ TEST_CASE("[Graphics] sf::Image") { SECTION("Type traits") { + STATIC_CHECK(!std::is_default_constructible_v); STATIC_CHECK(std::is_copy_constructible_v); STATIC_CHECK(std::is_copy_assignable_v); STATIC_CHECK(std::is_nothrow_move_constructible_v); STATIC_CHECK(std::is_nothrow_move_assignable_v); } - SECTION("Default constructor") + SECTION("Construction") { - const sf::Image image; - CHECK(image.getSize() == sf::Vector2u()); - CHECK(image.getPixelsPtr() == nullptr); - } - - SECTION("Create") - { - SECTION("create(Vector2)") + SECTION("Vector2 constructor") { - sf::Image image; - image.create(sf::Vector2u(10, 10)); + const sf::Image image(sf::Vector2u(10, 10)); CHECK(image.getSize() == sf::Vector2u(10, 10)); CHECK(image.getPixelsPtr() != nullptr); @@ -44,11 +37,9 @@ TEST_CASE("[Graphics] sf::Image") } } - SECTION("create(Vector2, Color)") + SECTION("Vector2 and color constructor") { - sf::Image image; - image.create(sf::Vector2u(10, 10), sf::Color::Red); - + const sf::Image image(sf::Vector2u(10, 10), sf::Color::Red); CHECK(image.getSize() == sf::Vector2u(10, 10)); CHECK(image.getPixelsPtr() != nullptr); @@ -61,7 +52,7 @@ TEST_CASE("[Graphics] sf::Image") } } - SECTION("create(Vector2, std::uint8_t*)") + SECTION("Vector2 and std::uint8_t* constructor") { // 10 x 10, with 4 colour channels array std::array pixels{}; @@ -73,9 +64,7 @@ TEST_CASE("[Graphics] sf::Image") pixels[i + 3] = 255; // a } - sf::Image image; - image.create(sf::Vector2u(10, 10), pixels.data()); - + const sf::Image image(sf::Vector2u(10, 10), pixels.data()); CHECK(image.getSize() == sf::Vector2u(10, 10)); CHECK(image.getPixelsPtr() != nullptr); @@ -91,72 +80,72 @@ TEST_CASE("[Graphics] sf::Image") SECTION("loadFromFile()") { - sf::Image image; - SECTION("Invalid file") { - CHECK(!image.loadFromFile(".")); - CHECK(!image.loadFromFile("this/does/not/exist.jpg")); - - CHECK(image.getSize() == sf::Vector2u(0, 0)); - CHECK(image.getPixelsPtr() == nullptr); + CHECK(!sf::Image::loadFromFile(".")); + CHECK(!sf::Image::loadFromFile("this/does/not/exist.jpg")); } SECTION("Successful load") { + std::optional image; + SECTION("bmp") { - REQUIRE(image.loadFromFile("Graphics/sfml-logo-big.bmp")); - CHECK(image.getPixel({0, 0}) == sf::Color::White); - CHECK(image.getPixel({200, 150}) == sf::Color(144, 208, 62)); + image = sf::Image::loadFromFile("Graphics/sfml-logo-big.bmp").value(); + REQUIRE(image.has_value()); + CHECK(image->getPixel({0, 0}) == sf::Color::White); + CHECK(image->getPixel({200, 150}) == sf::Color(144, 208, 62)); } SECTION("png") { - REQUIRE(image.loadFromFile("Graphics/sfml-logo-big.png")); - CHECK(image.getPixel({0, 0}) == sf::Color(255, 255, 255, 0)); - CHECK(image.getPixel({200, 150}) == sf::Color(144, 208, 62)); + image = sf::Image::loadFromFile("Graphics/sfml-logo-big.png").value(); + REQUIRE(image.has_value()); + CHECK(image->getPixel({0, 0}) == sf::Color(255, 255, 255, 0)); + CHECK(image->getPixel({200, 150}) == sf::Color(144, 208, 62)); } SECTION("jpg") { - REQUIRE(image.loadFromFile("Graphics/sfml-logo-big.jpg")); - CHECK(image.getPixel({0, 0}) == sf::Color::White); - CHECK(image.getPixel({200, 150}) == sf::Color(144, 208, 62)); + image = sf::Image::loadFromFile("Graphics/sfml-logo-big.jpg").value(); + REQUIRE(image.has_value()); + CHECK(image->getPixel({0, 0}) == sf::Color::White); + CHECK(image->getPixel({200, 150}) == sf::Color(144, 208, 62)); } SECTION("gif") { - REQUIRE(image.loadFromFile("Graphics/sfml-logo-big.gif")); - CHECK(image.getPixel({0, 0}) == sf::Color::White); - CHECK(image.getPixel({200, 150}) == sf::Color(146, 210, 62)); + image = sf::Image::loadFromFile("Graphics/sfml-logo-big.gif").value(); + REQUIRE(image.has_value()); + CHECK(image->getPixel({0, 0}) == sf::Color::White); + CHECK(image->getPixel({200, 150}) == sf::Color(146, 210, 62)); } SECTION("psd") { - REQUIRE(image.loadFromFile("Graphics/sfml-logo-big.psd")); - CHECK(image.getPixel({0, 0}) == sf::Color::White); - CHECK(image.getPixel({200, 150}) == sf::Color(144, 208, 62)); + image = sf::Image::loadFromFile("Graphics/sfml-logo-big.psd").value(); + REQUIRE(image.has_value()); + CHECK(image->getPixel({0, 0}) == sf::Color::White); + CHECK(image->getPixel({200, 150}) == sf::Color(144, 208, 62)); } - CHECK(image.getSize() == sf::Vector2u(1001, 304)); - CHECK(image.getPixelsPtr() != nullptr); + CHECK(image->getSize() == sf::Vector2u(1001, 304)); + CHECK(image->getPixelsPtr() != nullptr); } } SECTION("loadFromMemory()") { - sf::Image image; - SECTION("Invalid pointer") { - CHECK(!image.loadFromMemory(nullptr, 1)); + CHECK(!sf::Image::loadFromMemory(nullptr, 1)); } SECTION("Invalid size") { const std::byte testByte{0xAB}; - CHECK(!image.loadFromMemory(&testByte, 0)); + CHECK(!sf::Image::loadFromMemory(&testByte, 0)); } SECTION("Failed load") @@ -173,19 +162,13 @@ TEST_CASE("[Graphics] sf::Image") memory = {1, 2, 3, 4}; } - CHECK(!image.loadFromMemory(memory.data(), memory.size())); + CHECK(!sf::Image::loadFromMemory(memory.data(), memory.size())); } SECTION("Successful load") { - const auto memory = []() - { - sf::Image savedImage; - savedImage.create({24, 24}, sf::Color::Green); - return savedImage.saveToMemory("png").value(); - }(); - - CHECK(image.loadFromMemory(memory.data(), memory.size())); + const auto memory = sf::Image({24, 24}, sf::Color::Green).saveToMemory("png").value(); + const auto image = sf::Image::loadFromMemory(memory.data(), memory.size()).value(); CHECK(image.getSize() == sf::Vector2u(24, 24)); CHECK(image.getPixelsPtr() != nullptr); CHECK(image.getPixel({0, 0}) == sf::Color::Green); @@ -195,18 +178,17 @@ TEST_CASE("[Graphics] sf::Image") SECTION("loadFromStream()") { - sf::Image image; sf::FileInputStream stream; SECTION("Invalid stream") { - CHECK(!image.loadFromStream(stream)); + CHECK(!sf::Image::loadFromStream(stream)); } SECTION("Successful load") { CHECK(stream.open("Graphics/sfml-logo-big.png")); - REQUIRE(image.loadFromStream(stream)); + const auto image = sf::Image::loadFromStream(stream).value(); CHECK(image.getSize() == sf::Vector2u(1001, 304)); CHECK(image.getPixelsPtr() != nullptr); CHECK(image.getPixel({0, 0}) == sf::Color(255, 255, 255, 0)); @@ -216,22 +198,13 @@ TEST_CASE("[Graphics] sf::Image") SECTION("saveToFile()") { - sf::Image image; - - SECTION("Empty") - { - CHECK(!image.saveToFile("test.jpg")); - } - SECTION("Invalid size") { - image.create({10, 0}, sf::Color::Magenta); - CHECK(!image.saveToFile("test.jpg")); - image.create({0, 10}, sf::Color::Magenta); - CHECK(!image.saveToFile("test.jpg")); + CHECK(!sf::Image({10, 0}, sf::Color::Magenta).saveToFile("test.jpg")); + CHECK(!sf::Image({0, 10}, sf::Color::Magenta).saveToFile("test.jpg")); } - image.create({256, 256}, sf::Color::Magenta); + const sf::Image image({256, 256}, sf::Color::Magenta); SECTION("No extension") { @@ -269,8 +242,7 @@ TEST_CASE("[Graphics] sf::Image") // Cannot test JPEG encoding due to it triggering UB in stbiw__jpg_writeBits - sf::Image loadedImage; - REQUIRE(loadedImage.loadFromFile(filename)); + const auto loadedImage = sf::Image::loadFromFile(filename).value(); CHECK(loadedImage.getSize() == sf::Vector2u(256, 256)); CHECK(loadedImage.getPixelsPtr() != nullptr); @@ -280,22 +252,13 @@ TEST_CASE("[Graphics] sf::Image") SECTION("saveToMemory()") { - sf::Image image; - - SECTION("Empty") - { - CHECK(!image.saveToMemory("test.jpg")); - } - SECTION("Invalid size") { - image.create({10, 0}, sf::Color::Magenta); - CHECK(!image.saveToMemory("test.jpg")); - image.create({0, 10}, sf::Color::Magenta); - CHECK(!image.saveToMemory("test.jpg")); + CHECK(!sf::Image({10, 0}, sf::Color::Magenta).saveToMemory("test.jpg")); + CHECK(!sf::Image({0, 10}, sf::Color::Magenta).saveToMemory("test.jpg")); } - image.create({16, 16}, sf::Color::Magenta); + const sf::Image image({16, 16}, sf::Color::Magenta); SECTION("No extension") { @@ -359,9 +322,7 @@ TEST_CASE("[Graphics] sf::Image") SECTION("Set/get pixel") { - sf::Image image; - - image.create(sf::Vector2u(10, 10), sf::Color::Green); + sf::Image image(sf::Vector2u(10, 10), sf::Color::Green); CHECK(image.getPixel(sf::Vector2u(2, 2)) == sf::Color::Green); image.setPixel(sf::Vector2u(2, 2), sf::Color::Blue); @@ -372,11 +333,8 @@ TEST_CASE("[Graphics] sf::Image") { SECTION("Copy (Image, Vector2u)") { - sf::Image image1; - image1.create(sf::Vector2u(10, 10), sf::Color::Blue); - - sf::Image image2; - image2.create(sf::Vector2u(10, 10)); + const sf::Image image1(sf::Vector2u(10, 10), sf::Color::Blue); + sf::Image image2(sf::Vector2u(10, 10)); CHECK(image2.copy(image1, sf::Vector2u(0, 0))); for (std::uint32_t i = 0; i < 10; ++i) @@ -390,11 +348,8 @@ TEST_CASE("[Graphics] sf::Image") SECTION("Copy (Image, Vector2u, IntRect)") { - sf::Image image1; - image1.create(sf::Vector2u(5, 5), sf::Color::Blue); - - sf::Image image2; - image2.create(sf::Vector2u(10, 10)); + const sf::Image image1(sf::Vector2u(5, 5), sf::Color::Blue); + sf::Image image2(sf::Vector2u(10, 10)); CHECK(image2.copy(image1, sf::Vector2u(0, 0), sf::IntRect(sf::Vector2i(0, 0), sf::Vector2i(5, 5)))); for (std::uint32_t i = 0; i < 10; ++i) @@ -424,11 +379,8 @@ TEST_CASE("[Graphics] sf::Image") ((source.b * source.a) + ((dest.b * dest.a) * (255 - source.a)) / 255) / a); const sf::Color composite(r, g, b, a); - sf::Image image1; - image1.create(sf::Vector2u(10, 10), dest); - - sf::Image image2; - image2.create(sf::Vector2u(10, 10), source); + sf::Image image1(sf::Vector2u(10, 10), dest); + const sf::Image image2(sf::Vector2u(10, 10), source); CHECK(image1.copy(image2, sf::Vector2u(0, 0), sf::IntRect(sf::Vector2i(0, 0), sf::Vector2i(10, 10)), true)); for (std::uint32_t i = 0; i < 10; ++i) @@ -440,31 +392,10 @@ TEST_CASE("[Graphics] sf::Image") } } - SECTION("Copy (Empty image)") - { - const sf::Image image1; - sf::Image image2; - - image2.create(sf::Vector2u(10, 10), sf::Color::Red); - CHECK(!image2.copy(image1, sf::Vector2u(0, 0), sf::IntRect(sf::Vector2i(0, 0), sf::Vector2i(9, 9)))); - - for (std::uint32_t i = 0; i < 10; ++i) - { - for (std::uint32_t j = 0; j < 10; ++j) - { - CHECK(image2.getPixel(sf::Vector2u(i, j)) == sf::Color::Red); - } - } - } - SECTION("Copy (Out of bounds sourceRect)") { - sf::Image image1; - image1.create(sf::Vector2u(5, 5), sf::Color::Blue); - - sf::Image image2; - - image2.create(sf::Vector2u(10, 10), sf::Color::Red); + const sf::Image image1(sf::Vector2u(5, 5), sf::Color::Blue); + sf::Image image2(sf::Vector2u(10, 10), sf::Color::Red); CHECK(!image2.copy(image1, sf::Vector2u(0, 0), sf::IntRect(sf::Vector2i(5, 5), sf::Vector2i(9, 9)))); for (std::uint32_t i = 0; i < 10; ++i) @@ -481,8 +412,7 @@ TEST_CASE("[Graphics] sf::Image") { SECTION("createMaskFromColor(Color)") { - sf::Image image; - image.create(sf::Vector2u(10, 10), sf::Color::Blue); + sf::Image image(sf::Vector2u(10, 10), sf::Color::Blue); image.createMaskFromColor(sf::Color::Blue); for (std::uint32_t i = 0; i < 10; ++i) @@ -496,8 +426,7 @@ TEST_CASE("[Graphics] sf::Image") SECTION("createMaskFromColor(Color, std::uint8_t)") { - sf::Image image; - image.create(sf::Vector2u(10, 10), sf::Color::Blue); + sf::Image image(sf::Vector2u(10, 10), sf::Color::Blue); image.createMaskFromColor(sf::Color::Blue, 100); for (std::uint32_t i = 0; i < 10; ++i) @@ -512,8 +441,7 @@ TEST_CASE("[Graphics] sf::Image") SECTION("Flip horizontally") { - sf::Image image; - image.create(sf::Vector2u(10, 10), sf::Color::Red); + sf::Image image(sf::Vector2u(10, 10), sf::Color::Red); image.setPixel(sf::Vector2u(0, 0), sf::Color::Green); image.flipHorizontally(); @@ -522,8 +450,7 @@ TEST_CASE("[Graphics] sf::Image") SECTION("Flip vertically") { - sf::Image image; - image.create(sf::Vector2u(10, 10), sf::Color::Red); + sf::Image image(sf::Vector2u(10, 10), sf::Color::Red); image.setPixel(sf::Vector2u(0, 0), sf::Color::Green); image.flipVertically(); diff --git a/test/Graphics/Texture.test.cpp b/test/Graphics/Texture.test.cpp index 3e99184f0..99b4e6cf6 100644 --- a/test/Graphics/Texture.test.cpp +++ b/test/Graphics/Texture.test.cpp @@ -121,19 +121,10 @@ TEST_CASE("[Graphics] sf::Texture", runDisplayTests()) SECTION("loadFromImage()") { - SECTION("Empty image") - { - const sf::Image image; - sf::Texture texture; - REQUIRE(!texture.loadFromImage(image)); - REQUIRE(!texture.loadFromImage(image, {{0, 0}, {1, 1}})); - } - SECTION("Subarea of image") { - sf::Image image; - image.create(sf::Vector2u(10, 15)); - sf::Texture texture; + const sf::Image image(sf::Vector2u(10, 15)); + sf::Texture texture; SECTION("Non-truncated area") { @@ -232,8 +223,7 @@ TEST_CASE("[Graphics] sf::Texture", runDisplayTests()) SECTION("Image") { REQUIRE(texture.create(sf::Vector2u(16, 32))); - sf::Image image; - image.create(sf::Vector2u(16, 32), sf::Color::Red); + const sf::Image image(sf::Vector2u(16, 32), sf::Color::Red); texture.update(image); CHECK(texture.copyToImage().getPixel(sf::Vector2u(7, 15)) == sf::Color::Red); } @@ -241,11 +231,9 @@ TEST_CASE("[Graphics] sf::Texture", runDisplayTests()) SECTION("Image and destination") { REQUIRE(texture.create(sf::Vector2u(16, 32))); - sf::Image image1; - image1.create(sf::Vector2u(16, 16), sf::Color::Red); + const sf::Image image1(sf::Vector2u(16, 16), sf::Color::Red); texture.update(image1); - sf::Image image2; - image2.create(sf::Vector2u(16, 16), sf::Color::Green); + const sf::Image image2(sf::Vector2u(16, 16), sf::Color::Green); texture.update(image1, sf::Vector2u(0, 0)); texture.update(image2, sf::Vector2u(0, 16)); CHECK(texture.copyToImage().getPixel(sf::Vector2u(7, 7)) == sf::Color::Red);