generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed camera output format handling

Browse Source
This commit is contained in:
Andrey Kamaev
2011-07-25 12:32:33 +00:00
parent 4ddc1a6477
commit ac7e16fdf6
13 changed files with 109 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
View File

@@ -398,7 +398,7 @@ double CameraHandler::getProperty(int propIdx)
union {const char* str;double res;} u;
memset(&u.res, 0, sizeof(u.res));
u.str = cameraPropertySupportedPreviewSizesString.c_str();
u.str = cameraPropertyPreviewFormatString.c_str();
return u.res;
}

6
modules/androidcamera/src/camera_activity.cpp
View File

@@ -133,7 +133,7 @@ CameraActivity::ErrorCode CameraWrapperConnector::getProperty(void* camera, int
LOGE("CameraWrapperConnector::getProperty error: wrong pointer to camera object");
return CameraActivity::ERROR_WRONG_POINTER_CAMERA_WRAPPER;
}
LOGE("calling (*pGetPropertyC)(%p, %d)", camera, propIdx);
*value = (*pGetPropertyC)(camera, propIdx);
return CameraActivity::NO_ERROR;
}
@@ -260,10 +260,6 @@ std::string CameraWrapperConnector::getPathLibFolder()
LOGD("Library name: %s", dl_info.dli_fname);
LOGD("Library base address: %p", dl_info.dli_fbase);
char addrBuf[18];
sprintf(addrBuf, "%p-", dl_info.dli_fbase);
int addrLength = strlen(addrBuf);
const char* libName=dl_info.dli_fname;
while( ((*libName)=='/') || ((*libName)=='.') )
libName++;