Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Helper] Fix memory leak while capturing screenshot #533

Merged
merged 1 commit into from
Dec 11, 2017
Merged

[Helper] Fix memory leak while capturing screenshot #533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions SofaKernel/framework/sofa/helper/gl/Capture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down