Android: No longer keep an active input stream longer than needed.

SFML · Mar 20, 2018 · 4cd36b7 · 4cd36b7
1 parent bc16629
commit 4cd36b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/include/SFML/Graphics/Image.hpp b/include/SFML/Graphics/Image.hpp
@@ -265,9 +265,6 @@ class SFML_GRAPHICS_API Image
     ////////////////////////////////////////////////////////////
     Vector2u           m_size;   ///< Image size
     std::vector<Uint8> m_pixels; ///< Pixels of the image
-    #ifdef SFML_SYSTEM_ANDROID
-    void*              m_stream; ///< Asset file streamer (if loaded from file)
-    #endif
 };
 
 } // namespace sf

diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
@@ -41,23 +41,14 @@ namespace sf
 Image::Image() :
 m_size(0, 0)
 {
-    #ifdef SFML_SYSTEM_ANDROID
 
-    m_stream = NULL;
-
-    #endif
 }
 
 
 ////////////////////////////////////////////////////////////
 Image::~Image()
 {
-    #ifdef SFML_SYSTEM_ANDROID
-
-        if (m_stream)
-            delete (priv::ResourceStream*)m_stream;
 
-    #endif
 }
 
 
@@ -135,11 +126,8 @@ bool Image::loadFromFile(const std::string& filename)
 
     #else
 
-        if (m_stream)
-            delete (priv::ResourceStream*)m_stream;
-
-        m_stream = new priv::ResourceStream(filename);
-        return loadFromStream(*(priv::ResourceStream*)m_stream);
+        priv::ResourceStream stream(filename);
+        return loadFromStream(stream);
 
     #endif
 }