diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/uca-cam.h | 6 | ||||
| -rw-r--r-- | src/uca.c | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fdc19dd..9c25ca7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 2.8) -set(UCA_VERSION_MAJOR "0") -set(UCA_VERSION_MINOR "3") -set(UCA_VERSION_PATCH "0") - # --- Set sources ------------------------------------------------------------- set(uca_SRCS uca.c @@ -145,8 +141,7 @@ target_link_libraries(uca ${uca_LIBS}) # --- Install target ---------------------------------------------------------- install(TARGETS uca - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) + LIBRARY DESTINATION lib{LIB_SUFFIX}) install(FILES ${uca_HDRS} DESTINATION include/libuca) diff --git a/src/uca-cam.h b/src/uca-cam.h index c7e88a2..5203f8f 100644 --- a/src/uca-cam.h +++ b/src/uca-cam.h @@ -196,9 +196,9 @@ struct uca_camera_t { struct uca_grabber_t *grabber; /**< grabber associated with this camera */ enum uca_cam_state state; /**< camera state */ - uint32_t frame_width; - uint32_t frame_height; - uint32_t current_frame; + uint32_t frame_width; /**< current frame width */ + uint32_t frame_height; /**< current frame height */ + uint32_t current_frame; /**< last grabbed frame number */ void *user; /**< private user data to be used by the camera driver */ }; @@ -141,9 +141,10 @@ struct uca_t *uca_init(const char *config_filename) if (grabber != NULL) grabber->next = NULL; - /* Probe each camera that is configured */ i = 0; struct uca_camera_t *current = NULL; + /* Probe each camera that is configured and append a found camera to the + * linked list. */ while (cam_inits[i] != NULL) { struct uca_camera_t *cam = NULL; uca_cam_init init = cam_inits[i]; |