ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-21 18:54:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mod_cv] Replace deprecated definitions and update configure.ac to check renamed opencv4.pc on Debian Bullseye.

Browse Source
This commit is contained in:
Andrey Volk committed 2021-10-14 23:29:30 +03:00
1 parent 2505b45134
commit e9fde845de
2 files changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/applications/mod_cv/mod_cv.cpp
+6 -6
View File
@@ -37,7 +37,7 @@
#include <switch.h>
#include "highgui.h"
#include "opencv2/highgui/highgui_c.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -596,9 +596,9 @@ void detectAndDraw(cv_context_t *context)
context->cascade->detectMultiScale( smallImg, detectedObjs,
context->search_scale, context->neighbors, 0
|CV_HAAR_FIND_BIGGEST_OBJECT
|CV_HAAR_DO_ROUGH_SEARCH
|CV_HAAR_SCALE_IMAGE
|CASCADE_FIND_BIGGEST_OBJECT
|CASCADE_DO_ROUGH_SEARCH
|CASCADE_SCALE_IMAGE
,
Size(context->max_search_w, context->max_search_h) );
@@ -679,7 +679,7 @@ void detectAndDraw(cv_context_t *context)
//|CV_HAAR_FIND_BIGGEST_OBJECT
//|CV_HAAR_DO_ROUGH_SEARCH
//|CV_HAAR_DO_CANNY_PRUNING
|CV_HAAR_SCALE_IMAGE
|CASCADE_SCALE_IMAGE
,
Size(30, 30) );
@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context)
//printf("WTF %d\n", object_neighbors);
//cout << "Detected " << object_neighbors << " object neighbors" << endl;
const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors);
CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
cv:Scalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1);
parse_stats(&context->nestDetected, nestedObjects.size(), context->skip);