tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop

Browse Source
This commit is contained in:
kalman 2018-12-28 17:56:56 +08:00
commit 04722850b8
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
samples/CMakeLists.txt
View File

@ -63,22 +63,24 @@ endif()
set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output") set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output")
# samples above api layer if(OS_MAC)
# samples above uvc layer
if(WITH_API)
add_subdirectory(api)
endif()
add_subdirectory(uvc)
else()
# samples above device layer # samples above device layer
add_subdirectory(device) add_subdirectory(device)
# samples above uvc layer
#add_subdirectory(uvc)
# tutorials # tutorials
if(WITH_API) if(WITH_API)
add_subdirectory(tutorials) add_subdirectory(tutorials)
endif() endif()
# samples above api layer
if(WITH_API)
add_subdirectory(api)
endif()
endif()

4
src/mynteye/uvc/macosx/uvc-vvuvckit.cc
View File

@ -284,10 +284,6 @@ MYNTEYE_API std::vector<std::shared_ptr<device>> query_devices(
auto camerasConfig = findDevicesConfig(); auto camerasConfig = findDevicesConfig();
printConfig(camerasConfig); printConfig(camerasConfig);
for (unsigned int i = 0; i < camerasConfig.size(); i++) { for (unsigned int i = 0; i < camerasConfig.size(); i++) {
// if (strcmp(fstr[camerasConfig[i].cam_format], "yuyv") == 0) {
// printf("change fomat to buf_format 2\n");
// camerasConfig[i].buf_format = 2;
// }
auto dev = std::make_shared<device>(context, camerasConfig[i]); auto dev = std::make_shared<device>(context, camerasConfig[i]);
devices.push_back(dev); devices.push_back(dev);
} }