From cc9f8bc7176aa3ede9e6d87b14e4b2c6f47d51e0 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 18 Jun 2013 18:15:52 -0700 Subject: [PATCH] Adjustments to UVCCameraControl invocation. --- .../include/UVCCameraControl.hpp | 7 ++++--- .../lib/libUVCCameraControl.a | Bin 18448 -> 18512 bytes interface/src/Webcam.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/external/UVCCameraControl/include/UVCCameraControl.hpp b/interface/external/UVCCameraControl/include/UVCCameraControl.hpp index e35a89d1f9..83cf6ac1a3 100644 --- a/interface/external/UVCCameraControl/include/UVCCameraControl.hpp +++ b/interface/external/UVCCameraControl/include/UVCCameraControl.hpp @@ -12,9 +12,10 @@ #ifdef __cplusplus extern "C" { #endif - -void configureCamera(); - + +void configureCamera(int vendorID, int productID, int autoExposure, float exposure, float contrast, float saturation, + float sharpness, int autoWhiteBalance, float whiteBalance); + #ifdef __cplusplus } #endif diff --git a/interface/external/UVCCameraControl/lib/libUVCCameraControl.a b/interface/external/UVCCameraControl/lib/libUVCCameraControl.a index 3dec0b7aab671c90d5860f38f9e8f3765fdad372..b4e63db8d71e0754b7bd10c6e3c4c13c25efec7c 100644 GIT binary patch literal 18512 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 H?^gZ`?LSm< diff --git a/interface/src/Webcam.cpp b/interface/src/Webcam.cpp index acb6d3dc03..4e025c05ce 100644 --- a/interface/src/Webcam.cpp +++ b/interface/src/Webcam.cpp @@ -125,7 +125,7 @@ void FrameGrabber::grabFrame() { cvSetCaptureProperty(_capture, CV_CAP_PROP_FRAME_HEIGHT, IDEAL_FRAME_HEIGHT); #ifdef __APPLE__ - configureCamera(); + configureCamera(0x5ac, 0x8510, 0, 0.9, 0.5, 0.5, 0.5, 1, 0.5); #endif } IplImage* image = cvQueryFrame(_capture);