diff options
author | SeokHoon Lee <andy.shlee@samsung.com> | 2015-12-28 11:12:18 +0900 |
---|---|---|
committer | SeokHoon Lee <andy.shlee@samsung.com> | 2015-12-28 11:15:56 +0900 |
commit | efbda6c1245893a928180ea573bd4222bc730e25 (patch) | |
tree | 989ac6775ae53064140437d8ca7b0e2135ec23d6 | |
parent | 97aa7477e98a4ae40576ad49fb30960b5947d66d (diff) | |
download | mediavision-efbda6c1245893a928180ea573bd4222bc730e25.tar.gz mediavision-efbda6c1245893a928180ea573bd4222bc730e25.tar.bz2 mediavision-efbda6c1245893a928180ea573bd4222bc730e25.zip |
modify feature link and refactoringsubmit/tizen_common/20151229.154718submit/tizen/20151228.024536accepted/tizen/wearable/20151228.063646accepted/tizen/tv/20151228.063622accepted/tizen/mobile/20151228.063546
Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I3021c9b6081812f178d5ff78ad92387b4cad0763
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | doc/mediavision_doc.h | 19 | ||||
-rw-r--r-- | media-vision-config.json | 3 |
3 files changed, 12 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49c3ed3b..5898b983 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) # Configure for porting layer: -# Configure for porting layer: - option(MEDIA_VISION_BARCODE_DETECTOR_LICENSE_PORT "Turn on building of licensed port of the barcode detecting module (if OFF - open port will be built)." OFF) option(MEDIA_VISION_BARCODE_GENERATOR_LICENSE_PORT @@ -117,12 +115,12 @@ ADD_SUBDIRECTORY(mv_surveillance) aux_source_directory(src SOURCES) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) -TARGET_LINK_LIBRARIES(${fw_name} ${MV_COMMON_LIB_NAME} +TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} + ${MV_COMMON_LIB_NAME} ${MV_BARCODE_DETECTOR_LIB_NAME} ${MV_BARCODE_GENERATOR_LIB_NAME} ${MV_IMAGE_LIB_NAME} ${MV_FACE_LIB_NAME} - ${${fw_name}_LDFLAGS} ${MV_SURVEILLANCE_LIB_NAME}) SET_TARGET_PROPERTIES(${fw_name} diff --git a/doc/mediavision_doc.h b/doc/mediavision_doc.h index 8402b851..3458f3c0 100644 --- a/doc/mediavision_doc.h +++ b/doc/mediavision_doc.h @@ -70,7 +70,7 @@ * features, please define the features in your manifest file using the manifest * editor in the SDK.\n * More details on featuring your application can be found from - * <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"> + * <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"> * <b>Feature Element</b>. * </a> * @@ -80,8 +80,6 @@ * @section CAPI_MEDIA_VISION_FACE_MODULE_HEADER Required Header * \#include <mv_face.h> * - * @section CAPI_MEDIA_VISION_FACE_MODULE_OVERVIEW Overview - * * @section CAPI_MEDIA_VISION_FACE_MODULE_FEATURE Related Features * This API is related with the following features:\n * - http://tizen.org/feature/vision.face_recognition\n @@ -95,10 +93,11 @@ * features, please define the features in your manifest file using the manifest * editor in the SDK.\n * More details on featuring your application can be found from - * <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"> + * <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"> * <b>Feature Element</b>. * </a> * + * @section CAPI_MEDIA_VISION_FACE_MODULE_OVERVIEW Overview * @ref CAPI_MEDIA_VISION_FACE_MODULE contains @ref mv_face_detect() function * to detect faces on @ref mv_source_h, and @ref mv_face_detected_cb callback * to process detected faces. Also it contains @ref mv_face_recognize() function @@ -128,7 +127,7 @@ * function can be used.\n * Module contains function * @ref mv_face_track() which performs tracking on @ref mv_source_h for - * @ref mv_face_tracking_model_h and @ref mv_face_on_tracked_cb which process + * @ref mv_face_tracking_model_h and @ref mv_face_tracked_cb which process * tracked face. Tracking model should be created with * @ref mv_face_tracking_model_create() and destroyed with * @ref mv_face_tracking_model_destroy(). Tracking model should be prepared @@ -152,8 +151,6 @@ * @section CCAPI_MEDIA_VISION_IMAGE_MODULE_HEADER Required Header * \#include <mv_image.h> * - * @section CAPI_MEDIA_VISION_IMAGE_MODULE_OVERVIEW Overview - * * @section CAPI_MEDIA_VISION_IMAGE_MODULE_FEATURE Related Features * This API is related with the following features:\n * - http://tizen.org/feature/vision.image_recognition\n @@ -167,10 +164,11 @@ * features, please define the features in your manifest file using the manifest * editor in the SDK.\n * More details on featuring your application can be found from - * <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"> + * <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"> * <b>Feature Element</b>. * </a> * + * @section CAPI_MEDIA_VISION_IMAGE_MODULE_OVERVIEW Overview * @ref CAPI_MEDIA_VISION_IMAGE_MODULE contains @ref mv_image_recognize() * function to recognize images on @ref mv_source_h, and @ref * mv_image_recognized_cb callback to process recognition result. Module @@ -202,8 +200,6 @@ * @section CAPI_MEDIA_VISION_BARCODE_MODULE_HEADER Required Header * \#include <mv_barcode.h> * - * @section CAPI_MEDIA_VISION_BARCODE_MODULE_OVERVIEW Overview - * * @section CAPI_MEDIA_VISION_BARCODE_MODULE_FEATURE Related Features * This API is related with the following features:\n * - http://tizen.org/feature/vision.barcode_detection\n @@ -218,10 +214,11 @@ * features, please define the features in your manifest file using the manifest * editor in the SDK.\n * More details on featuring your application can be found from - * <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"> + * <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"> * <b>Feature Element</b>. * </a> * + * @section CAPI_MEDIA_VISION_BARCODE_MODULE_OVERVIEW Overview * @ref CAPI_MEDIA_VISION_BARCODE_MODULE contains two submodules:\n * * Detection submodule, * * Generation submodule.\n diff --git a/media-vision-config.json b/media-vision-config.json index 207e575c..2830a121 100644 --- a/media-vision-config.json +++ b/media-vision-config.json @@ -36,7 +36,8 @@ "type" : "integer", "value" : -1 }, - { "name" : "MV_BARCODE_GENERATE_ATTR_TEXT", + { + "name" : "MV_BARCODE_GENERATE_ATTR_TEXT", "type" : "integer", "value" : 0 }, |