From dfeff3379e0c9e62a155bbfa85ea8a1e4459a84c Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 26 Feb 2015 01:59:12 -0600 Subject: [PATCH] Fixed a small issue with unneeded reader Open() calls. --- src/effects/Mask.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp index d89bee0b..b232f4b2 100644 --- a/src/effects/Mask.cpp +++ b/src/effects/Mask.cpp @@ -89,6 +89,10 @@ void Mask::set_brightness_and_contrast(tr1::shared_ptr image, flo // modified openshot::Frame object tr1::shared_ptr Mask::GetFrame(tr1::shared_ptr 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