Remove the need for copying the image buffer

SFML · Sep 7, 2023 · f5175fb · f5175fb
1 parent 3a6294b
commit f5175fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/include/SFML/Graphics/Image.h b/include/SFML/Graphics/Image.h
@@ -169,9 +169,6 @@ CSFML_GRAPHICS_API sfBool sfImage_saveToFile(const sfImage* image, const char* f
 /// This function fails if the image is empty, or if
 /// the format was invalid.
 ///
-/// The array pointed to by \p buffer must be freed to prevent
-/// a memory leak.
-///
 /// \param image  Image object
 /// \param buffer Address of buffer to fill with encoded data
 /// \param size   Size of buffer

diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
@@ -139,14 +139,10 @@ sfBool sfImage_saveToMemory(const sfImage* image, unsigned char** buffer, size_t
 {
     CSFML_CHECK_RETURN(image, sfFalse);
 
-    std::vector<sf::Uint8> output;
+    static std::vector<sf::Uint8> output;
     if (image->This.saveToMemory(output, format)){
-        // Create new buffer then return address and size to user
-        *buffer = reinterpret_cast<unsigned char*>(std::malloc(output.size()));
+        *buffer = &output[0];
         *size = output.size();
-
-        // Copy vector contents into buffer
-        std::memcpy(*buffer, &output[0], output.size());
         return sfTrue;
     }