Merge branch 'master' into win32

others/src/camera/camera_wrapper.cpp

@@ -62,7 +62,7 @@ bool CameraWrapper::init() {
     rgb_buffer = (unsigned char *)malloc(tCapability.sResolutionRange.iHeightMax *
             tCapability.sResolutionRange.iWidthMax * 3);
 	char filepath[200];
-	sprintf_s(filepath, PROJECT_DIR"/others/%s.Config", name.data());
+	sprintf(filepath, PROJECT_DIR"/others/%s.Config", name.data());
 	if (CameraReadParameterFromFile(h_camera, filepath) != CAMERA_STATUS_SUCCESS) {
 		LOGE("Load parameter %s from file fail!", filepath);
 		return false;
@@ -75,28 +75,6 @@ bool CameraWrapper::init() {
 	double t;
 	CameraGetExposureTime(h_camera, &t);
 	LOGM("Exposure time: %lfms", t / 1000.0);
-/*    if(mode == 0){
-        // 不使用自动曝光
-        CameraSetAeState(h_camera, false);
-        // 曝光时间10ms
-        CameraSetExposureTime(h_camera, 10000);
-        double t;
-        CameraGetExposureTime(h_camera, &t);
-        LOGM("Exposure time: %lfms", t/1000.0);
-        // 模拟增益4
-        CameraSetAnalogGain(h_camera, 64);
-        // 使用预设LUT表
-        CameraSetLutMode(h_camera, LUTMODE_PRESET);
-        // 抗频闪
-//        CameraSetAntiFlick(h_camera, true);
-    }
-    else if(mode == 1){
-        // 不使用自动曝光
-        CameraSetAeState(h_camera, false);
-        // 抗频闪
-//        CameraSetAntiFlick(h_camera, true);
-    }
-*/
     /*让SDK进入工作模式，开始接收来自相机发送的图像
     数据。如果当前相机是触发模式，则需要接收到
     触发帧以后才会更新图像。    */