From 0c5faa6d24ceede74d2297497ebba846cb1df2cf Mon Sep 17 00:00:00 2001 From: Dmitry-Me Date: Tue, 17 Mar 2015 14:47:00 +0300 Subject: [PATCH] Fix uninitialized members, fix log output typo --- modules/androidcamera/camera_wrapper/camera_wrapper.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp index 2a7d01b22..66678c558 100644 --- a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp +++ b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp @@ -314,7 +314,9 @@ public: cameraId(0), cameraCallback(callback), userData(_userData), - emptyCameraCallbackReported(0) + emptyCameraCallbackReported(0), + width(), + height() { LOGD("Instantiated new CameraHandler (%p, %p)", callback, _userData); void* params_buffer = operator new(sizeof(CameraParameters) + MAGIC_TAIL); @@ -1122,7 +1124,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler) if (handler == NULL) { LOGE("ERROR in applyProperties --- cannot reinit camera"); handler=initCameraConnect(cameraCallback, cameraId, userData, NULL); - LOGD("CameraHandler::applyProperties(): repeate initCameraConnect after ERROR, handler=0x%x", (int)handler); + LOGD("CameraHandler::applyProperties(): repeat initCameraConnect after ERROR, handler=0x%x", (int)handler); if (handler == NULL) { LOGE("ERROR in applyProperties --- cannot reinit camera AGAIN --- cannot do anything else"); }