getWidth/getHeight optimized.

(cherry picked from commit 7d4432df27)
pull/39/head
Alexander Smorkalov 13 years ago committed by Andrey Pavlenko
parent 0ab954a3c4
commit 8a8e719690
  1. 10
      modules/androidcamera/src/camera_activity.cpp

@ -382,18 +382,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)

Loading…
Cancel
Save