1*4882a593SmuzhiyunFrom 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3*4882a593SmuzhiyunDate: Fri, 16 Oct 2020 23:06:36 +0200
4*4882a593SmuzhiyunSubject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv
5*4882a593Smuzhiyun 3.4.9
6*4882a593SmuzhiyunMIME-Version: 1.0
7*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8
8*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit
9*4882a593Smuzhiyun
10*4882a593SmuzhiyunUse cvScalar instead of CV_RGB to avoid the following build failure with
11*4882a593Smuzhiyunopencv 3.4.9:
12*4882a593Smuzhiyun
13*4882a593Smuzhiyunmod_cv.cpp:693:24: error: conversion from ‘cv::Scalar {aka cv::Scalar_<double>}’ to non-scalar type ‘CvScalar’ requested
14*4882a593Smuzhiyun         CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
15*4882a593Smuzhiyun                        ^
16*4882a593Smuzhiyun
17*4882a593SmuzhiyunIndeed, CV_RGB is defined as cv::Scalar instead of cvScalar since
18*4882a593Smuzhiyunversion 3.4.2 and
19*4882a593Smuzhiyunhttps://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f
20*4882a593Smuzhiyun
21*4882a593SmuzhiyunIt should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0)
22*4882a593Smuzhiyun
23*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
24*4882a593Smuzhiyun[Upstream status: https://github.com/signalwire/freeswitch/pull/914]
25*4882a593Smuzhiyun---
26*4882a593Smuzhiyun src/mod/applications/mod_cv/mod_cv.cpp | 2 +-
27*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
28*4882a593Smuzhiyun
29*4882a593Smuzhiyundiff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp
30*4882a593Smuzhiyunindex 582f925abf..bbec755e91 100644
31*4882a593Smuzhiyun--- a/src/mod/applications/mod_cv/mod_cv.cpp
32*4882a593Smuzhiyun+++ b/src/mod/applications/mod_cv/mod_cv.cpp
33*4882a593Smuzhiyun@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context)
34*4882a593Smuzhiyun 		//printf("WTF %d\n", object_neighbors);
35*4882a593Smuzhiyun         //cout << "Detected " << object_neighbors << " object neighbors" << endl;
36*4882a593Smuzhiyun         const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors);
37*4882a593Smuzhiyun-        CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
38*4882a593Smuzhiyun+        CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0);
39*4882a593Smuzhiyun         rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1);
40*4882a593Smuzhiyun
41*4882a593Smuzhiyun         parse_stats(&context->nestDetected, nestedObjects.size(), context->skip);
42*4882a593Smuzhiyun--
43*4882a593Smuzhiyun2.28.0
44*4882a593Smuzhiyun
45