openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a small issue with unneeded reader Open() calls.

Browse Source
This commit is contained in:
Jonathan Thomas
2015-02-26 01:59:12 -06:00
parent 79519dbeab
commit dfeff3379e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/effects/Mask.cpp
View File

@@ -89,6 +89,10 @@ void Mask::set_brightness_and_contrast(tr1::shared_ptr<Magick::Image> image, flo
// modified openshot::Frame object
tr1::shared_ptr<Frame> Mask::GetFrame(tr1::shared_ptr<Frame> frame, int frame_number)
{
// Check if reader is open
if (!reader->IsOpen())
reader->Open();
// Get the mask image (from the mask reader)
mask = reader->GetFrame(frame_number)->GetImage();
mask->type(Magick::GrayscaleType); // convert to grayscale
@@ -179,6 +183,7 @@ void Mask::SetJsonValue(Json::Value root) {
contrast.SetJsonValue(root["contrast"]);
if (!root["reader"].isNull()) // does Json contain a reader?
{
if (!root["reader"]["type"].isNull()) // does the reader Json contain a 'type'?
{
// Close previous reader (if any)
@@ -213,11 +218,9 @@ void Mask::SetJsonValue(Json::Value root) {
}
// Always Open reader
reader->Open();
}
}
}
// Get all properties for a specific frame