From 7d4432df27d1ff8f0f09cae90a7d613d5122baf2 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 10 Sep 2012 17:07:21 +0400 Subject: [PATCH] getWidth/getHeight optimized. --- modules/androidcamera/src/camera_activity.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/androidcamera/src/camera_activity.cpp b/modules/androidcamera/src/camera_activity.cpp index 8ce53a816c..fe4b284d38 100644 --- a/modules/androidcamera/src/camera_activity.cpp +++ b/modules/androidcamera/src/camera_activity.cpp @@ -61,7 +61,7 @@ private: std::string CameraWrapperConnector::pathLibFolder; -bool CameraWrapperConnector::isConnectedToLib=false; +bool CameraWrapperConnector::isConnectedToLib = false; InitCameraConnectC CameraWrapperConnector::pInitCameraC = 0; CloseCameraConnectC CameraWrapperConnector::pCloseCameraC = 0; GetCameraPropertyC CameraWrapperConnector::pGetPropertyC = 0; @@ -421,18 +421,24 @@ void CameraActivity::applyProperties() frameWidth = -1; frameHeight = -1; CameraWrapperConnector::applyProperties(&camera); + frameWidth = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH); + frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT); } int CameraActivity::getFrameWidth() { LOGD("CameraActivity::getFrameWidth()"); - return getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH); + if (frameWidth <= 0) + frameWidth = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH); + return frameWidth; } int CameraActivity::getFrameHeight() { LOGD("CameraActivity::getFrameHeight()"); - return frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT); + if (frameHeight <= 0) + frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT); + return frameHeight; } void CameraActivity::setPathLibFolder(const char* path)