Commit 0c5faa6d authored by Dmitry-Me's avatar Dmitry-Me

Fix uninitialized members, fix log output typo

parent e12a04ac
...@@ -314,7 +314,9 @@ public: ...@@ -314,7 +314,9 @@ public:
cameraId(0), cameraId(0),
cameraCallback(callback), cameraCallback(callback),
userData(_userData), userData(_userData),
emptyCameraCallbackReported(0) emptyCameraCallbackReported(0),
width(),
height()
{ {
LOGD("Instantiated new CameraHandler (%p, %p)", callback, _userData); LOGD("Instantiated new CameraHandler (%p, %p)", callback, _userData);
void* params_buffer = operator new(sizeof(CameraParameters) + MAGIC_TAIL); void* params_buffer = operator new(sizeof(CameraParameters) + MAGIC_TAIL);
...@@ -1122,7 +1124,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler) ...@@ -1122,7 +1124,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
if (handler == NULL) { if (handler == NULL) {
LOGE("ERROR in applyProperties --- cannot reinit camera"); LOGE("ERROR in applyProperties --- cannot reinit camera");
handler=initCameraConnect(cameraCallback, cameraId, userData, NULL); 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) { if (handler == NULL) {
LOGE("ERROR in applyProperties --- cannot reinit camera AGAIN --- cannot do anything else"); LOGE("ERROR in applyProperties --- cannot reinit camera AGAIN --- cannot do anything else");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment