From 0918c9eef3860bd54524147787cc68f02a52e522 Mon Sep 17 00:00:00 2001 From: David Oram Date: Sat, 29 Aug 2015 14:40:11 +1200 Subject: [PATCH 1/3] Added 'Avg' function --- opencv/cxcore.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opencv/cxcore.go b/opencv/cxcore.go index 610d933..29052ff 100644 --- a/opencv/cxcore.go +++ b/opencv/cxcore.go @@ -523,6 +523,10 @@ func Not(src, dst *IplImage) { /****************************************************************************************\ * Array Statistics * \****************************************************************************************/ +// CvScalar cvAvg(const CvArr* arr, const CvArr* mask=NULL ) +func (src *IplImage) Avg(mask *IplImage) Scalar { + return (Scalar)(C.cvAvg(unsafe.Pointer(src), unsafe.Pointer(mask))) +} /****************************************************************************************\ * Discrete Linear Transforms and Related Functions * From 3014fc92fb601a2807820ba47b38e36906aca698 Mon Sep 17 00:00:00 2001 From: David Oram Date: Sat, 29 Aug 2015 16:29:51 +1200 Subject: [PATCH 2/3] Added 'EqualizeHist' function --- opencv/cxcore.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opencv/cxcore.go b/opencv/cxcore.go index 29052ff..7abf3ba 100644 --- a/opencv/cxcore.go +++ b/opencv/cxcore.go @@ -528,6 +528,11 @@ func (src *IplImage) Avg(mask *IplImage) Scalar { return (Scalar)(C.cvAvg(unsafe.Pointer(src), unsafe.Pointer(mask))) } +// cvEqualizeHist(const CvArr* src, CvArr* dst) +func (src *IplImage) EqualizeHist(dst *IplImage) { + C.cvEqualizeHist(unsafe.Pointer(src), unsafe.Pointer(dst)) +} + /****************************************************************************************\ * Discrete Linear Transforms and Related Functions * \****************************************************************************************/ From b7bb2a16d7b18f75a4d5656060812dc93079a8f8 Mon Sep 17 00:00:00 2001 From: David Oram Date: Sat, 29 Aug 2015 16:30:39 +1200 Subject: [PATCH 3/3] Added missing smoothing type constants --- opencv/cv.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opencv/cv.go b/opencv/cv.go index c41ddcc..2e5e689 100644 --- a/opencv/cv.go +++ b/opencv/cv.go @@ -23,7 +23,11 @@ const ( CV_BGR2BGRA = C.CV_BGR2BGRA CV_RGBA2BGRA = C.CV_RGBA2BGRA - CV_BLUR = C.CV_BLUR + CV_BLUR_NO_SCALE = C.CV_BLUR_NO_SCALE + CV_BLUR = C.CV_BLUR + CV_GAUSSIAN = C.CV_GAUSSIAN + CV_MEDIAN = C.CV_MEDIAN + CV_BILATERAL = C.CV_BILATERAL CV_8U = C.CV_8U CV_8S = C.CV_8S