diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/debian/changelog libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/debian/changelog --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/debian/changelog 2022-06-17 19:46:58.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/debian/changelog 2022-06-22 19:32:43.000000000 +0000 @@ -1,8 +1,8 @@ -libopenshot (0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1) impish; urgency=low +libopenshot (0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1) impish; urgency=low * Auto build. - -- OpenShot Code Fri, 17 Jun 2022 19:46:58 +0000 + -- OpenShot Code Wed, 22 Jun 2022 19:32:43 +0000 libopenshot (0.2.7-1) UNRELEASED; urgency=medium diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/debian/git-build-recipe.manifest libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/debian/git-build-recipe.manifest --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/debian/git-build-recipe.manifest 2022-06-17 19:46:58.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/debian/git-build-recipe.manifest 2022-06-22 19:32:43.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+dfsg2+1121+202206171946+daily -lp:libopenshot git-commit:957d4f6a06eec7c48482561e8bbc0afe150ee681 +# git-build-recipe format 0.4 deb-version {debupstream}+dfsg2+1124+202206221932+daily +lp:libopenshot git-commit:5776efd71cd282786dbf7366a4b2ac0005a2f481 nest-part packaging lp:openshot-packaging libopenshot/debian debian git-commit:0b65bfa3c1c3fbe90abba4c47775e54bdeec1b9c diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/examples/Example_opencv.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/examples/Example_opencv.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/examples/Example_opencv.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/examples/Example_opencv.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -152,7 +152,7 @@ objectDetection.SaveObjDetectedData(); // Create a object detector effect - EffectBase* e = EffectInfo().CreateEffect("Object Detector"); + EffectBase* e = EffectInfo().CreateEffect("ObjectDetection"); // Pass a JSON string with the saved detections data // The effect will read and save the detections in a map:: diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/.github/workflows/ci.yml libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/.github/workflows/ci.yml --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/.github/workflows/ci.yml 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/.github/workflows/ci.yml 2022-06-22 19:32:34.000000000 +0000 @@ -124,14 +124,14 @@ mingw-w64-x86_64-python3 mingw-w64-x86_64-swig - - uses: actions/cache@v2 + - uses: actions/cache@v3.0.1 name: Import OpenShotAudio cache id: cache-audio with: path: audio/build key: audio-${{ matrix.sys.os }}-${{ matrix.compiler.cxx }}-${{ hashFiles('audio/CMakeLists.txt') }} - - uses: actions/cache@v2 + - uses: actions/cache@v3.0.1 name: Import Resvg cache if: ${{ steps.use-resvg.outputs.value }} id: cache-resvg diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/src/ClipProcessingJobs.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/src/ClipProcessingJobs.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/src/ClipProcessingJobs.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/src/ClipProcessingJobs.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -30,7 +30,7 @@ if(processingType == "Tracker"){ t = std::thread(&ClipProcessingJobs::trackClip, this, std::ref(clip), std::ref(this->processingController)); } - if(processingType == "Object Detector"){ + if(processingType == "ObjectDetection"){ t = std::thread(&ClipProcessingJobs::detectObjectsClip, this, std::ref(clip), std::ref(this->processingController)); } } diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/src/EffectInfo.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/src/EffectInfo.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/src/EffectInfo.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/src/EffectInfo.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -104,7 +104,7 @@ else if(effect_type == "Tracker") return new Tracker(); - else if(effect_type == "Object Detector") + else if(effect_type == "ObjectDetection") return new ObjectDetection(); #endif diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CacheDisk.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CacheDisk.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CacheDisk.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CacheDisk.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include "CacheDisk.h" #include "Frame.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CacheMemory.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CacheMemory.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CacheMemory.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CacheMemory.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include "CacheMemory.h" #include "Frame.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/catch2v2.h.in libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/catch2v2.h.in --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/catch2v2.h.in 1970-01-01 00:00:00.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/catch2v2.h.in 2022-06-22 19:32:34.000000000 +0000 @@ -0,0 +1,19 @@ +/** + * @file + * @brief Header (template) for tests built with Catch2 v2 + * @author Jonathan Thomas + * @author FeRD (Frank Dana) + * + * @ref License + */ + +// Copyright (c) 2008-2022 OpenShot Studios, LLC +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#ifndef OPENSHOT_CATCH2_H +#define OPENSHOT_CATCH2_H + +#include + +#endif diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/catch2v3.h.in libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/catch2v3.h.in --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/catch2v3.h.in 1970-01-01 00:00:00.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/catch2v3.h.in 2022-06-22 19:32:34.000000000 +0000 @@ -0,0 +1,20 @@ +/** + * @file + * @brief Header (template) for tests built with Catch2 v3.0 or later + * @author Jonathan Thomas + * @author FeRD (Frank Dana) + * + * @ref License + */ + +// Copyright (c) 2008-2022 OpenShot Studios, LLC +// +// SPDX-License-Identifier: LGPL-3.0-or-later + +#ifndef OPENSHOT_CATCH2_H +#define OPENSHOT_CATCH2_H + +#include +using namespace Catch; + +#endif diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/catch_main.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/catch_main.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/catch_main.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/catch_main.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -11,5 +11,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later #define CATCH_CONFIG_MAIN -#include +#include "openshot_catch.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/ChromaKey.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/ChromaKey.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/ChromaKey.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/ChromaKey.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -28,7 +28,7 @@ return os; } -#include +#include "openshot_catch.h" using namespace openshot; diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Clip.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Clip.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Clip.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Clip.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include #include diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CMakeLists.txt libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CMakeLists.txt --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CMakeLists.txt 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CMakeLists.txt 2022-06-22 19:32:34.000000000 +0000 @@ -68,20 +68,37 @@ return() endif() -# Create object library for test executable main(), -# to avoid recompiling for every test -add_library(catch-main OBJECT catch_main.cpp) -target_link_libraries(catch-main PUBLIC Catch2::Catch2) +add_library(openshot_catch2 INTERFACE) +target_include_directories(openshot_catch2 INTERFACE + "${CMAKE_CURRENT_BINARY_DIR}" +) +target_compile_definitions(openshot_catch2 INTERFACE + TEST_MEDIA_PATH="${TEST_MEDIA_PATH}") + +if(TARGET Catch2::Catch2WithMain) + # Catch2 v3 works a bit differently + configure_file(catch2v3.h.in openshot_catch.h) + target_link_libraries(openshot_catch2 INTERFACE Catch2::Catch2WithMain) +else() + configure_file(catch2v2.h.in openshot_catch.h) + # Create object library for test executable main(), + # to avoid recompiling for every test + add_library(catch-main OBJECT catch_main.cpp) + target_link_libraries(catch-main PUBLIC Catch2::Catch2) + target_include_directories(catch-main PUBLIC + "${CMAKE_CURRENT_BINARY_DIR}") + target_link_libraries(openshot_catch2 INTERFACE Catch2::Catch2) + target_sources(openshot_catch2 INTERFACE $) +endif() foreach(tname ${OPENSHOT_TESTS}) add_executable(openshot-${tname}-test ${tname}.cpp - $ ) - target_compile_definitions(openshot-${tname}-test PRIVATE - TEST_MEDIA_PATH="${TEST_MEDIA_PATH}" + target_link_libraries(openshot-${tname}-test + openshot_catch2 + openshot ) - target_link_libraries(openshot-${tname}-test Catch2::Catch2 openshot) # Automatically configure CTest targets from Catch2 test cases catch_discover_tests( diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Color.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Color.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Color.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Color.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Coordinate.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Coordinate.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Coordinate.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Coordinate.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include "Coordinate.h" #include "Exceptions.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Crop.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Crop.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Crop.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Crop.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include -#include +#include "openshot_catch.h" #include "Frame.h" #include "effects/Crop.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CVObjectDetection.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CVObjectDetection.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CVObjectDetection.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CVObjectDetection.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -14,7 +14,7 @@ #include #include -#include +#include "openshot_catch.h" #include "Clip.h" #include "CVObjectDetection.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CVStabilizer.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CVStabilizer.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CVStabilizer.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CVStabilizer.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -14,7 +14,7 @@ #include #include -#include +#include "openshot_catch.h" #include "Clip.h" #include "CVStabilization.h" // for TransformParam, CamTrajectory, CVStabilization diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CVTracker.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CVTracker.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/CVTracker.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/CVTracker.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -14,7 +14,7 @@ #include #include -#include +#include "openshot_catch.h" #include "Clip.h" #include "CVTracker.h" // for FrameData, CVTracker diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/DummyReader.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/DummyReader.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/DummyReader.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/DummyReader.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -12,7 +12,7 @@ #include -#include +#include "openshot_catch.h" #include "DummyReader.h" #include "Exceptions.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/FFmpegReader.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/FFmpegReader.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/FFmpegReader.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/FFmpegReader.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include "FFmpegReader.h" #include "Exceptions.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/FFmpegWriter.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/FFmpegWriter.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/FFmpegWriter.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/FFmpegWriter.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include "FFmpegWriter.h" #include "Exceptions.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Fraction.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Fraction.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Fraction.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Fraction.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include #include diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Frame.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Frame.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Frame.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Frame.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -24,7 +24,7 @@ #undef uint64 #endif -#include +#include "openshot_catch.h" #include "Clip.h" #include "Fraction.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/FrameMapper.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/FrameMapper.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/FrameMapper.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/FrameMapper.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include "CacheMemory.h" #include "Clip.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/ImageWriter.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/ImageWriter.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/ImageWriter.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/ImageWriter.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -15,7 +15,7 @@ #include #include -#include +#include "openshot_catch.h" #include "ImageWriter.h" #include "Exceptions.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/KeyFrame.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/KeyFrame.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/KeyFrame.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/KeyFrame.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include #include diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Point.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Point.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Point.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Point.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include #include "Point.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/QtImageReader.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/QtImageReader.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/QtImageReader.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/QtImageReader.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/ReaderBase.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/ReaderBase.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/ReaderBase.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/ReaderBase.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -13,7 +13,7 @@ #include #include -#include +#include "openshot_catch.h" #include "ReaderBase.h" #include "CacheBase.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Settings.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Settings.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Settings.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Settings.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include +#include "openshot_catch.h" #include "Settings.h" diff -Nru libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Timeline.cpp libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Timeline.cpp --- libopenshot-0.2.7+dfsg2+1121+202206171946+daily~ubuntu21.10.1/tests/Timeline.cpp 2022-06-17 19:46:51.000000000 +0000 +++ libopenshot-0.2.7+dfsg2+1124+202206221932+daily~ubuntu21.10.1/tests/Timeline.cpp 2022-06-22 19:32:34.000000000 +0000 @@ -15,7 +15,7 @@ #include #include -#include +#include "openshot_catch.h" #include "Timeline.h" #include "Clip.h"