1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001
- From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Date: Fri, 16 Oct 2020 23:06:36 +0200
- Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv
- 3.4.9
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Use cvScalar instead of CV_RGB to avoid the following build failure with
- opencv 3.4.9:
- mod_cv.cpp:693:24: error: conversion from ‘cv::Scalar {aka cv::Scalar_<double>}’ to non-scalar type ‘CvScalar’ requested
- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
- ^
- Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since
- version 3.4.2 and
- https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f
- It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0)
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- [Upstream status: https://github.com/signalwire/freeswitch/pull/914]
- ---
- src/mod/applications/mod_cv/mod_cv.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp
- index 582f925abf..bbec755e91 100644
- --- a/src/mod/applications/mod_cv/mod_cv.cpp
- +++ b/src/mod/applications/mod_cv/mod_cv.cpp
- @@ -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);
- + CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 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);
- --
- 2.28.0
|