FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

facedetect: Redundancy exists in code.

Browse Source 
Checking the vector is not empty and checking the vector size is greater
than zero are the same thing, this is a redundancy in the code. Only
checking the vector is not empty is sufficient, therefore removing the
other check.
This commit is contained in:
vanechipi 2015-08-10 19:02:10 +02:00 committed by Luis de Bethencourt
parent 9720c07f23
commit 73bc2cf7b0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/opencv/gstfacedetect.cpp
View File

@ -602,7 +602,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
post_msg = TRUE; post_msg = TRUE;
break; break;
case GST_FACEDETECT_UPDATES_ON_CHANGE: case GST_FACEDETECT_UPDATES_ON_CHANGE:
if (!faces.empty () && (faces.size () > 0)) { if (!faces.empty ()) {
if (!filter->face_detected) if (!filter->face_detected)
post_msg = TRUE; post_msg = TRUE;
} else { } else {
@ -612,7 +612,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
} }
break; break;
case GST_FACEDETECT_UPDATES_ON_FACE: case GST_FACEDETECT_UPDATES_ON_FACE:
if (!faces.empty () && (faces.size () > 0)) { if (!faces.empty ()) {
post_msg = TRUE; post_msg = TRUE;
} else { } else {
post_msg = FALSE; post_msg = FALSE;
@ -626,7 +626,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
break; break;
} }
filter->face_detected = !faces.empty ()? faces.size () > 0 : FALSE; filter->face_detected = !faces.empty ()? TRUE : FALSE;
if (post_msg) { if (post_msg) {
msg = gst_face_detect_message_new (filter, buf); msg = gst_face_detect_message_new (filter, buf);
@ -651,7 +651,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
rnh = r.height / 2; rnh = r.height / 2;
gst_face_detect_run_detector (filter, filter->cvNoseDetect, mw, mh, gst_face_detect_run_detector (filter, filter->cvNoseDetect, mw, mh,
Rect (rnx, rny, rnw, rnh), nose); Rect (rnx, rny, rnw, rnh), nose);
have_nose = (!nose.empty () && nose.size ()); have_nose = !nose.empty ();
} else { } else {
have_nose = FALSE; have_nose = FALSE;
} }
@ -663,7 +663,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
rmh = r.height / 2; rmh = r.height / 2;
gst_face_detect_run_detector (filter, filter->cvMouthDetect, mw, gst_face_detect_run_detector (filter, filter->cvMouthDetect, mw,
mh, Rect (rmx, rmy, rmw, rmh), mouth); mh, Rect (rmx, rmy, rmw, rmh), mouth);
have_mouth = (!mouth.empty () && mouth.size ()); have_mouth = !mouth.empty ();
} else { } else {
have_mouth = FALSE; have_mouth = FALSE;
} }
@ -675,7 +675,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
reh = r.height / 2; reh = r.height / 2;
gst_face_detect_run_detector (filter, filter->cvEyesDetect, mw, mh, gst_face_detect_run_detector (filter, filter->cvEyesDetect, mw, mh,
Rect (rex, rey, rew, reh), eyes); Rect (rex, rey, rew, reh), eyes);
have_eyes = (!eyes.empty () && eyes.size ()); have_eyes = !eyes.empty ();
} else { } else {
have_eyes = FALSE; have_eyes = FALSE;
} }
@ -806,7 +806,7 @@ gst_face_detect_load_profile (GstFaceDetect * filter, gchar * profile)
GST_ERROR_OBJECT (filter, "Invalid profile file: %s", profile); GST_ERROR_OBJECT (filter, "Invalid profile file: %s", profile);
delete (cascade); delete (cascade);
return NULL; return NULL;
} }
return cascade; return cascade;
} }