mirror of
git://slackware.nl/current.git
synced 2024-12-31 10:28:29 +01:00
a1b82f3ef3
ap/diffstat-1.64-x86_64-1.txz: Upgraded. d/cmake-3.19.3-x86_64-1.txz: Upgraded. l/gcr-3.38.1-x86_64-1.txz: Upgraded. l/mlt-6.24.0-x86_64-2.txz: Rebuilt. Patched for opencv >= 4.5.1. Thanks to nobodino. l/pulseaudio-14.1-x86_64-1.txz: Upgraded. n/netkit-bootparamd-0.17-x86_64-4.txz: Rebuilt. Patched for libtirpc. Thanks to nobodino. n/netkit-rusers-0.17-x86_64-3.txz: Rebuilt. Patched for libtirpc. Thanks to nobodino. n/netkit-rwall-0.17-x86_64-3.txz: Rebuilt. Patched for libtirpc. Thanks to nobodino. xfce/Greybird-3.22.14-noarch-1.txz: Upgraded. extra/source/flashplayer-plugin/: Removed.
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
diff -aurN mlt-6.24.1/src/modules/opencv/filter_opencv_tracker.cpp mlt-6.24.1.mod/src/modules/opencv/filter_opencv_tracker.cpp
|
|
--- mlt-6.24.1/src/modules/opencv/filter_opencv_tracker.cpp 2021-01-05 19:15:52.000000000 +0100
|
|
+++ mlt-6.24.1.mod/src/modules/opencv/filter_opencv_tracker.cpp 2021-01-13 10:29:26.314403046 +0100
|
|
@@ -25,7 +25,11 @@
|
|
typedef struct
|
|
{
|
|
cv::Ptr<cv::Tracker> tracker;
|
|
- cv::Rect2d boundingBox;
|
|
+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
|
|
+ cv::Rect2d boundingBox;
|
|
+#else
|
|
+ cv::Rect boundingBox;
|
|
+#endif
|
|
char * algo;
|
|
mlt_rect startRect;
|
|
bool initialized;
|
|
@@ -138,7 +142,7 @@
|
|
{
|
|
data->tracker = cv::TrackerKCF::create();
|
|
}
|
|
-#if CV_VERSION_MAJOR > 3 || (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 4 && CV_VERSION_REVISION >= 2)
|
|
+#if (CV_VERSION_MAJOR > 3 && CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5) || (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 4 && CV_VERSION_REVISION >= 2)
|
|
else if ( !strcmp(data->algo, "CSRT" ) )
|
|
{
|
|
data->tracker = cv::TrackerCSRT::create();
|
|
@@ -152,6 +156,7 @@
|
|
{
|
|
data->tracker = cv::TrackerMIL::create();
|
|
}
|
|
+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
|
|
else if ( !strcmp(data->algo, "TLD" ) )
|
|
{
|
|
data->tracker = cv::TrackerTLD::create();
|
|
@@ -160,6 +165,7 @@
|
|
{
|
|
data->tracker = cv::TrackerBoosting::create();
|
|
}
|
|
+#endif // CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
|
|
#else
|
|
if ( data->algo == NULL || !strcmp(data->algo, "" ) )
|
|
{
|
|
@@ -224,7 +230,12 @@
|
|
if ( data->boundingBox.height <1 ) {
|
|
data->boundingBox.height = 50;
|
|
}
|
|
- if ( data->tracker->init( cvFrame, data->boundingBox ) ) {
|
|
+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
|
|
+ if ( data->tracker->init( cvFrame, data->boundingBox ) ) {
|
|
+#else
|
|
+ {
|
|
+ data->tracker->init( cvFrame, data->boundingBox );
|
|
+#endif
|
|
data->initialized = true;
|
|
data->analyze = true;
|
|
data->last_position = position - 1;
|