Merge pull request #533 from fredroy/fix_memleak_screenshot

[Helper] Fix memory leak while capturing screenshot
sofa-framework · Dec 11, 2017 · ffc9de0 · ffc9de0
2 parents 90af3fe + e5e96f1
commit ffc9de0
Showing 1 changed file with 29 additions and 16 deletions.
diff --git a/SofaKernel/framework/sofa/helper/gl/Capture.cpp b/SofaKernel/framework/sofa/helper/gl/Capture.cpp
@@ -45,31 +45,44 @@ Capture::Capture()
 bool Capture::saveScreen(const std::string& filename, int compression_level)
 {
     std::string extension = sofa::helper::system::SetDirectory::GetExtension(filename.c_str());
-    std::transform(extension.begin(),extension.end(),extension.begin(),::tolower );
+    std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
 
     //test if we can export in lossless image
     bool imageSupport = helper::io::Image::FactoryImage::getInstance()->hasKey(extension);
-    if(!imageSupport)
+    if (!imageSupport)
     {
-        msg_error("Capture") << "Could not write " << extension  << "image format (no support found)" ;
+        msg_error("Capture") << "Could not write " << extension << "image format (no support found)";
         return false;
     }
 
-    helper::io::Image* img =  helper::io::Image::FactoryImage::getInstance()->createObject(extension, "");
-
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT,viewport);
-    img->init(viewport[2], viewport[3], 1, 1, io::Image::UNORM8, io::Image::RGB);
-    glReadBuffer(GL_FRONT);
-    glPixelStorei(GL_PACK_ALIGNMENT, 1);
-    glReadPixels(viewport[0], viewport[1], viewport[2], viewport[3], GL_RGB, GL_UNSIGNED_BYTE, img->getPixels());
+    helper::io::Image* img = helper::io::Image::FactoryImage::getInstance()->createObject(extension, "");
+    bool success = false;
+    if (img)
+    {
+        GLint viewport[4];
+        glGetIntegerv(GL_VIEWPORT, viewport);
+        img->init(viewport[2], viewport[3], 1, 1, io::Image::UNORM8, io::Image::RGB);
+        glReadBuffer(GL_FRONT);
+        glPixelStorei(GL_PACK_ALIGNMENT, 1);
+        glReadPixels(viewport[0], viewport[1], viewport[2], viewport[3], GL_RGB, GL_UNSIGNED_BYTE, img->getPixels());
+
+        success = img->save(filename, compression_level);
+
+        if (success)
+        {
+            msg_info("Capture") << "Saved " << img->getWidth() << "x" << img->getHeight() << " screen image to " << filename;
+        }
+
+        glReadBuffer(GL_BACK);
+        delete img;
+    }
 
-    if (!img->save(filename, compression_level))
-        return false;
+    if(!success)
+    {
+        msg_error("Capture") << "Unknown error while saving screen image to " << filename;
+    }
 
-    msg_info("Capture") << "Saved "<<img->getWidth()<<"x"<<img->getHeight()<<" screen image to "<<filename ;
-    glReadBuffer(GL_BACK);
-    return true;
+    return success;
 }
 
 std::string Capture::findFilename()