Simplify definition of sfBuffer

SFML · Dec 29, 2023 · 3d2af36 · 3d2af36
1 parent 0601d5f
commit 3d2af36
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
@@ -137,7 +137,7 @@ sfBool sfImage_saveToFile(const sfImage* image, const char* filename)
 sfBool sfImage_saveToMemory(const sfImage* image, sfBuffer* output, const char* format)
 {
     CSFML_CHECK_RETURN(output, sfFalse);
-    CSFML_CALL_RETURN(image, saveToMemory(output->buffer, format), sfFalse);
+    CSFML_CALL_RETURN(image, saveToMemory(*output, format), sfFalse);
 }
 
 

diff --git a/src/SFML/System/Buffer.cpp b/src/SFML/System/Buffer.cpp
@@ -48,13 +48,13 @@ void sfBuffer_destroy(sfBuffer* buffer)
 size_t sfBuffer_getSize(const sfBuffer* buffer)
 {
     CSFML_CHECK_RETURN(buffer, 0);
-    return buffer->buffer.size();
+    return buffer->size();
 }
 
 
 ////////////////////////////////////////////////////////////
 const sfUint8* sfBuffer_getData(const sfBuffer* buffer)
 {
     CSFML_CHECK_RETURN(buffer, NULL);
-    return !buffer->buffer.empty() ? &buffer->buffer[0] : NULL;
+    return !buffer->empty() ? &(*buffer)[0] : NULL;
 }
diff --git a/src/SFML/System/BufferStruct.h b/src/SFML/System/BufferStruct.h
@@ -35,10 +35,7 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfBuffer
 ////////////////////////////////////////////////////////////
-struct sfBuffer
-{
-    std::vector<sf::Uint8> buffer;
-};
+struct sfBuffer : std::vector<sf::Uint8> {};
 
 
 #endif // SFML_BUFFERSTRUCT_H