From 831735fc1cec8895ac36d58af14bda4c97a8cade Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 1 Dec 2016 21:13:23 -0500 Subject: [PATCH] opencv: Remove uneeded buffer writability check When set to in_place, the BaseTransform class will guaranty that buffers passed to transform_ip() function are writable. https://bugzilla.gnome.org/show_bug.cgi?id=775378 --- ext/opencv/gstfacedetect.cpp | 11 +---------- ext/opencv/gstmotioncells.cpp | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ext/opencv/gstfacedetect.cpp b/ext/opencv/gstfacedetect.cpp index 3c82ce0df3..503b9e70f3 100644 --- a/ext/opencv/gstfacedetect.cpp +++ b/ext/opencv/gstfacedetect.cpp @@ -590,19 +590,10 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf, vector < Rect > mouth; vector < Rect > nose; vector < Rect > eyes; - gboolean do_display = FALSE; gboolean post_msg = FALSE; Mat mtxOrg (cv::cvarrToMat (img)); - if (filter->display) { - if (gst_buffer_is_writable (buf)) { - do_display = TRUE; - } else { - GST_LOG_OBJECT (filter, "Buffer is not writable, not drawing faces."); - } - } - cvCvtColor (img, filter->cvGray, CV_RGB2GRAY); gst_face_detect_run_detector (filter, filter->cvFaceDetect, @@ -719,7 +710,7 @@ gst_face_detect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf, s = NULL; } - if (do_display) { + if (filter->display) { CvPoint center; Size axes; gdouble w, h; diff --git a/ext/opencv/gstmotioncells.cpp b/ext/opencv/gstmotioncells.cpp index 33f314a64d..0aedbd8bab 100644 --- a/ext/opencv/gstmotioncells.cpp +++ b/ext/opencv/gstmotioncells.cpp @@ -857,7 +857,6 @@ gst_motion_cells_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf, cellscolor motioncellscolor; motioncellidx *motioncellsidx; - buf = gst_buffer_make_writable (buf); if (filter->firstframe) { setPrevFrame (img, filter->id); filter->firstframe = FALSE;