modify feature link and refactoring

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I3021c9b6081812f178d5ff78ad92387b4cad0763

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49c3ed3..5898b98 100644 (file)
--- 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 8402b85..3458f3c 100644 (file)
--- 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 207e575..2830a12 100644 (file)
--- 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
         },