From d9acb35527b5dccd6c0aa1d96aaff212af1e2470 Mon Sep 17 00:00:00 2001 From: Aditya Bhargava Date: Mon, 20 Oct 2014 15:39:10 -0700 Subject: [PATCH] make FromImage work with gifs --- opencv/cvaux.go | 4 ++-- opencv/goimage.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opencv/cvaux.go b/opencv/cvaux.go index 55e9eb5..9168ffc 100644 --- a/opencv/cvaux.go +++ b/opencv/cvaux.go @@ -69,10 +69,10 @@ func (this *HaarCascade) DetectObjects(image *IplImage) []*Rect { rect := (*Rect)((*_Ctype_CvRect)(unsafe.Pointer(C.cvGetSeqElem(seq, C.int(i))))) faces = append(faces, rect) } - + storage_c := (*C.CvMemStorage)(storage) C.cvReleaseMemStorage(&storage_c) - + return faces } diff --git a/opencv/goimage.go b/opencv/goimage.go index 6e09b70..c2dc419 100644 --- a/opencv/goimage.go +++ b/opencv/goimage.go @@ -30,7 +30,7 @@ func FromImage(img image.Image) *IplImage { c := model.Convert(px).(color.RGBA) value := NewScalar(float64(c.B), float64(c.G), float64(c.R), float64(c.A)) - dst.Set2D(x, y, value) + dst.Set2D(x-b.Min.X, y-b.Min.Y, value) } }