From 99b5d1e7ab6bc75de28696147229383ddee8e730 Mon Sep 17 00:00:00 2001 From: Brenno Date: Mon, 12 Apr 2021 21:18:21 -0300 Subject: [PATCH] Fixed variable names and comments thanks to Frank Dana --- examples/CMakeLists.txt | 7 ++----- src/Timeline.cpp | 8 ++++---- src/TrackedObjectBase.h | 4 ++-- tests/Point.cpp | 1 + 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3f77d700..3e54ef1d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -65,16 +65,13 @@ if (BLACKMAGIC_FOUND) endif() ############### OPENCV EXAMPLE ################ -find_package( OpenCV 4 ) -if (OpenCV_FOUND) +if (DEFINED CACHE{HAVE_OPENCV}) # Create test executable add_executable(openshot-example-opencv Example_opencv.cpp) target_compile_definitions(openshot-example-opencv PRIVATE - -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" ) - + -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" ) # Link test executable to the new library target_link_libraries(openshot-example-opencv openshot) - endif() diff --git a/src/Timeline.cpp b/src/Timeline.cpp index ac6c8f0a..29194410 100644 --- a/src/Timeline.cpp +++ b/src/Timeline.cpp @@ -438,19 +438,19 @@ openshot::EffectBase* Timeline::GetClipEffect(const std::string& id) std::list Timeline::ClipEffects() const { // Initialize the list - std::list ClipEffects; + std::list timelineEffectsList; // Loop through all clips for (const auto& clip : clips) { // Get the clip's list of effects - std::list clipEffects = clip->Effects(); + std::list clipEffectsList = clip->Effects(); // Append the clip's effects to the list - ClipEffects.insert(ClipEffects.end(), clipEffects.begin(), clipEffects.end()); + timelineEffectsList.insert(timelineEffectsList.end(), clipEffectsList.begin(), clipEffectsList.end()); } - return ClipEffects; + return timelineEffectsList; } // Compute the end time of the latest timeline element diff --git a/src/TrackedObjectBase.h b/src/TrackedObjectBase.h index c0f6c660..af74e45e 100644 --- a/src/TrackedObjectBase.h +++ b/src/TrackedObjectBase.h @@ -66,10 +66,10 @@ namespace openshot { Keyframe visible; Keyframe draw_box; - /// Blank constructor + /// Default constructor TrackedObjectBase(); - /// Default constructor + /// Constructor which takes an object ID TrackedObjectBase(std::string _id); /// Get the id of this object diff --git a/tests/Point.cpp b/tests/Point.cpp index 45f493e0..965d9574 100644 --- a/tests/Point.cpp +++ b/tests/Point.cpp @@ -29,6 +29,7 @@ */ #include +#include #include "Point.h" #include "Enums.h"