Skip to content

Fix non-OpenCV build: guard TrackedObjectBBox usage, move EffectMask test #1087

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

Open
Chzrz89 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix non-OpenCV build: guard TrackedObjectBBox usage, move EffectMask test #1087

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions src/EffectBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,12 @@ std::shared_ptr<QImage> EffectBase::GetMaskImage(std::shared_ptr<QImage> target_
}

std::shared_ptr<QImage> EffectBase::TrackedObjectMask(std::shared_ptr<QImage> target_image, int64_t frame_number) const {
#ifndef USE_OPENCV
// Tracked-object bounding boxes are only produced by OpenCV-based
// trackers; without OpenCV there is nothing to draw a mask for.
(void)frame_number;
return {};
#else
if (!target_image || target_image->isNull() || trackedObjects.empty())
return {};

Expand Down Expand Up @@ -595,6 +601,7 @@ std::shared_ptr<QImage> EffectBase::TrackedObjectMask(std::shared_ptr<QImage> ta
if (!drew_any_box)
return {};
return mask_image;
#endif
}

void EffectBase::BlendWithMask(std::shared_ptr<QImage> original_image, std::shared_ptr<QImage> effected_image,
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ set(OPENSHOT_TESTS
LensFlare
AnalogTape
BenchmarkArgs
EffectMask
Mask
Pixelate
Saturation
Expand All @@ -96,6 +95,7 @@ if($CACHE{HAVE_OPENCV})
CVStabilizer
CVOutline
ObjectMask
EffectMask
# CVObjectDetection
)
endif()
Expand Down