Use correct order of params and enforce type for VideoCapture

Signed-off-by: deadprogram <[email protected]>
hybridgroup · Oct 9, 2017 · f86f1eb · f86f1eb
1 parent d8b7b4d
commit f86f1eb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/videoio.cpp b/videoio.cpp
@@ -17,7 +17,7 @@ int VideoCapture_OpenDevice(VideoCapture v, int device) {
     return v->open(device);
 }
 
-void VideoCapture_Set(VideoCapture v, int prop, int param) {
+void VideoCapture_Set(VideoCapture v, int prop, double param) {
     v->set(prop, param);
 }
 

diff --git a/videoio.go b/videoio.go
@@ -186,8 +186,8 @@ func (v *VideoCapture) Close() error {
 }
 
 // Set parameter with property (=key).
-func (v *VideoCapture) Set(prop int, param VideoCaptureProperties) {
-	C.VideoCapture_Set(v.p, C.int(prop), C.int(param))
+func (v *VideoCapture) Set(prop VideoCaptureProperties, param float64) {
+	C.VideoCapture_Set(v.p, C.int(prop), C.double(param))
 }
 
 // IsOpened returns if the VideoCapture has been opened to read from

diff --git a/videoio.h b/videoio.h
@@ -21,7 +21,7 @@ VideoCapture VideoCapture_New();
 void VideoCapture_Close(VideoCapture v);
 int VideoCapture_Open(VideoCapture v, const char* uri);
 int VideoCapture_OpenDevice(VideoCapture v, int device);
-void VideoCapture_Set(VideoCapture v, int prop, int param);
+void VideoCapture_Set(VideoCapture v, int prop, double param);
 int VideoCapture_IsOpened(VideoCapture v);
 int VideoCapture_Read(VideoCapture v, Mat buf);
 void VideoCapture_Grab(VideoCapture v, int skip);

diff --git a/videoio_test.go b/videoio_test.go
@@ -12,7 +12,7 @@ func TestVideoCaptureFile(t *testing.T) {
 		t.Error("Unable to open VideoCaptureFile")
 	}
 
-	vc.Set(VideoCaptureBrightness, 100)
+	vc.Set(VideoCaptureBrightness, 100.0)
 	vc.Grab(10)
 
 	img := NewMat()