From 5a95dcd9150c279776acc64a633895ca806f56bf Mon Sep 17 00:00:00 2001 From: Tae-Young Chung Date: Thu, 10 Sep 2015 18:08:26 +0900 Subject: fixed feature support Change-Id: Ifafe4eb5d510109df9a17e48c4f89c5a3d254b21 Signed-off-by: Tae-Young Chung --- src/mv_common.c | 40 ++++++++++++++++++++-------------------- src/mv_face.c | 40 ++++++++++++++++++++-------------------- src/mv_image.c | 36 ++++++++++++++++++------------------ src/mv_private.c | 24 ++---------------------- 4 files changed, 60 insertions(+), 80 deletions(-) diff --git a/src/mv_common.c b/src/mv_common.c index d11ca6b7..66f51df8 100644 --- a/src/mv_common.c +++ b/src/mv_common.c @@ -21,7 +21,7 @@ int mv_create_source( mv_source_h *source) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(source); MEDIA_VISION_FUNCTION_ENTER(); @@ -34,7 +34,7 @@ int mv_create_source( int mv_destroy_source( mv_source_h source) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_FUNCTION_ENTER(); @@ -48,7 +48,7 @@ int mv_source_fill_by_media_packet( mv_source_h source, media_packet_h media_packet) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_INSTANCE_CHECK(media_packet); @@ -67,7 +67,7 @@ int mv_source_fill_by_buffer( unsigned int image_height, mv_colorspace_e image_colorspace) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(data_buffer); @@ -83,7 +83,7 @@ int mv_source_fill_by_buffer( int mv_source_clear( mv_source_h source) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_FUNCTION_ENTER(); @@ -98,7 +98,7 @@ int mv_source_get_buffer( unsigned char **data_buffer, unsigned int *buffer_size) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(data_buffer); MEDIA_VISION_NULL_ARG_CHECK(buffer_size); @@ -114,7 +114,7 @@ int mv_source_get_height( mv_source_h source, unsigned int *image_height) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(image_height); @@ -129,7 +129,7 @@ int mv_source_get_width( mv_source_h source, unsigned int *image_width) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(image_width); @@ -144,7 +144,7 @@ int mv_source_get_colorspace( mv_source_h source, mv_colorspace_e *image_colorspace) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(image_colorspace); @@ -158,7 +158,7 @@ int mv_source_get_colorspace( int mv_create_engine_config( mv_engine_config_h *engine_cfg) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(engine_cfg); MEDIA_VISION_FUNCTION_ENTER(); @@ -171,7 +171,7 @@ int mv_create_engine_config( int mv_destroy_engine_config( mv_engine_config_h engine_cfg) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_FUNCTION_ENTER(); @@ -186,7 +186,7 @@ int mv_engine_config_set_double_attribute( const char *name, double value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); @@ -203,7 +203,7 @@ int mv_engine_config_set_int_attribute( const char *name, int value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); @@ -220,7 +220,7 @@ int mv_engine_config_set_bool_attribute( const char *name, bool value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); @@ -237,7 +237,7 @@ int mv_engine_config_set_string_attribute( const char *name, const char *value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); MEDIA_VISION_NULL_ARG_CHECK(value); @@ -255,7 +255,7 @@ int mv_engine_config_get_double_attribute( const char *name, double *value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); MEDIA_VISION_NULL_ARG_CHECK(value); @@ -273,7 +273,7 @@ int mv_engine_config_get_int_attribute( const char *name, int *value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); MEDIA_VISION_NULL_ARG_CHECK(value); @@ -291,7 +291,7 @@ int mv_engine_config_get_bool_attribute( const char *name, bool *value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); MEDIA_VISION_NULL_ARG_CHECK(value); @@ -309,7 +309,7 @@ int mv_engine_config_get_string_attribute( const char *name, char **value) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(engine_cfg); MEDIA_VISION_NULL_ARG_CHECK(name); MEDIA_VISION_NULL_ARG_CHECK(value); @@ -326,7 +326,7 @@ int mv_engine_config_foreach_supported_attribute( mv_supported_attribute_cb callback, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(callback); MEDIA_VISION_FUNCTION_ENTER(); diff --git a/src/mv_face.c b/src/mv_face.c index bf229a9c..2dbb1e7c 100644 --- a/src/mv_face.c +++ b/src/mv_face.c @@ -120,7 +120,7 @@ int mv_face_detect( mv_face_detected_cb detected_cb, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(detected_cb); @@ -150,7 +150,7 @@ int mv_face_recognize( mv_face_recognized_cb recognized_cb, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_INSTANCE_CHECK(recognition_model); MEDIA_VISION_NULL_ARG_CHECK(recognized_cb); @@ -198,7 +198,7 @@ int mv_face_track( bool do_learn, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_INSTANCE_CHECK(tracking_model); MEDIA_VISION_NULL_ARG_CHECK(tracked_cb); @@ -240,7 +240,7 @@ int mv_face_eye_condition_recognize( mv_face_eye_condition_recognized_cb eye_condition_recognized_cb, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(eye_condition_recognized_cb); @@ -279,7 +279,7 @@ int mv_face_facial_expression_recognize( mv_face_facial_expression_recognized_cb expression_recognized_cb, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(expression_recognized_cb); @@ -319,7 +319,7 @@ int mv_face_facial_expression_recognize( int mv_face_recognition_model_create( mv_face_recognition_model_h *recognition_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(recognition_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -343,7 +343,7 @@ int mv_face_recognition_model_create( int mv_face_recognition_model_destroy( mv_face_recognition_model_h recognition_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(recognition_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -368,7 +368,7 @@ int mv_face_recognition_model_clone( mv_face_recognition_model_h src, mv_face_recognition_model_h *dst) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(src); MEDIA_VISION_NULL_ARG_CHECK(dst); @@ -394,7 +394,7 @@ int mv_face_recognition_model_save( const char *file_name, mv_face_recognition_model_h recognition_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(recognition_model); if (file_name == NULL) @@ -429,7 +429,7 @@ int mv_face_recognition_model_load( const char *file_name, mv_face_recognition_model_h *recognition_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(recognition_model); if (file_name == NULL) @@ -466,7 +466,7 @@ int mv_face_recognition_model_add( const mv_rectangle_s *example_location, int face_label) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_INSTANCE_CHECK(recognition_model); @@ -504,7 +504,7 @@ int mv_face_recognition_model_reset( mv_face_recognition_model_h recognition_model, int *face_label) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(recognition_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -533,7 +533,7 @@ int mv_face_recognition_model_learn( mv_engine_config_h engine_cfg, mv_face_recognition_model_h recognition_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(recognition_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -559,7 +559,7 @@ int mv_face_recognition_model_query_labels( int **labels, unsigned int *number_of_labels) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(recognition_model); MEDIA_VISION_NULL_ARG_CHECK(labels); MEDIA_VISION_NULL_ARG_CHECK(number_of_labels); @@ -585,7 +585,7 @@ int mv_face_recognition_model_query_labels( int mv_face_tracking_model_create( mv_face_tracking_model_h *tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(tracking_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -609,7 +609,7 @@ int mv_face_tracking_model_create( int mv_face_tracking_model_destroy( mv_face_tracking_model_h tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(tracking_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -636,7 +636,7 @@ int mv_face_tracking_model_prepare( mv_source_h source, mv_quadrangle_s *location) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(tracking_model); MEDIA_VISION_INSTANCE_CHECK(source); @@ -669,7 +669,7 @@ int mv_face_tracking_model_clone( mv_face_tracking_model_h src, mv_face_tracking_model_h *dst) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(src); MEDIA_VISION_NULL_ARG_CHECK(dst); @@ -695,7 +695,7 @@ int mv_face_tracking_model_save( const char *file_name, mv_face_tracking_model_h tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(tracking_model); if (file_name == NULL) @@ -730,7 +730,7 @@ int mv_face_tracking_model_load( const char *file_name, mv_face_tracking_model_h *tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_face_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(tracking_model); if (file_name == NULL) diff --git a/src/mv_image.c b/src/mv_image.c index f0419248..5d60e983 100644 --- a/src/mv_image.c +++ b/src/mv_image.c @@ -42,7 +42,7 @@ int mv_image_recognize( mv_image_recognized_cb recognized_cb, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_NULL_ARG_CHECK(image_objects); int object_num = 0; @@ -79,7 +79,7 @@ int mv_image_track( mv_image_tracked_cb tracked_cb, void *user_data) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(source); MEDIA_VISION_INSTANCE_CHECK(image_tracking_model); MEDIA_VISION_NULL_ARG_CHECK(tracked_cb); @@ -105,7 +105,7 @@ int mv_image_track( int mv_image_object_create( mv_image_object_h *image_object) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(image_object); MEDIA_VISION_FUNCTION_ENTER(); @@ -128,7 +128,7 @@ int mv_image_object_create( int mv_image_object_destroy( mv_image_object_h image_object) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_object); MEDIA_VISION_FUNCTION_ENTER(); @@ -154,7 +154,7 @@ int mv_image_object_fill( mv_source_h source, mv_rectangle_s *location) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_object); MEDIA_VISION_INSTANCE_CHECK(source); @@ -180,7 +180,7 @@ int mv_image_object_get_recognition_rate( mv_image_object_h image_object, double *recognition_rate) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_object); MEDIA_VISION_NULL_ARG_CHECK(recognition_rate); @@ -206,7 +206,7 @@ int mv_image_object_set_label( mv_image_object_h image_object, int label) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_object); MEDIA_VISION_FUNCTION_ENTER(); @@ -231,7 +231,7 @@ int mv_image_object_get_label( mv_image_object_h image_object, int *label) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_object); MEDIA_VISION_NULL_ARG_CHECK(label); @@ -257,7 +257,7 @@ int mv_image_object_clone( mv_image_object_h src, mv_image_object_h *dst) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(src); MEDIA_VISION_NULL_ARG_CHECK(dst); @@ -282,7 +282,7 @@ int mv_image_object_clone( int mv_image_object_save( const char *file_name, mv_image_object_h image_object) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_object); if (file_name == NULL) @@ -312,7 +312,7 @@ int mv_image_object_save( int mv_image_object_load( const char *file_name, mv_image_object_h *image_object) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(image_object); if (file_name == NULL) @@ -342,7 +342,7 @@ int mv_image_object_load( int mv_image_tracking_model_create( mv_image_tracking_model_h *image_tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(image_tracking_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -367,7 +367,7 @@ int mv_image_tracking_model_set_target( mv_image_object_h image_object, mv_image_tracking_model_h image_tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_tracking_model); MEDIA_VISION_INSTANCE_CHECK(image_object); @@ -392,7 +392,7 @@ int mv_image_tracking_model_set_target( int mv_image_tracking_model_destroy( mv_image_tracking_model_h image_tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_tracking_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -417,7 +417,7 @@ int mv_image_tracking_model_refresh( mv_image_tracking_model_h image_tracking_model, mv_engine_config_h engine_cfg) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_tracking_model); MEDIA_VISION_FUNCTION_ENTER(); @@ -446,7 +446,7 @@ int mv_image_tracking_model_clone( mv_image_tracking_model_h src, mv_image_tracking_model_h *dst) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(src); MEDIA_VISION_NULL_ARG_CHECK(dst); @@ -471,7 +471,7 @@ int mv_image_tracking_model_clone( int mv_image_tracking_model_save( const char *file_name, mv_image_tracking_model_h image_tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_INSTANCE_CHECK(image_tracking_model); if (file_name == NULL) @@ -501,7 +501,7 @@ int mv_image_tracking_model_save( int mv_image_tracking_model_load( const char *file_name, mv_image_tracking_model_h *image_tracking_model) { - MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported); + MEDIA_VISION_SUPPORT_CHECK(__mv_image_check_system_info_feature_supported()); MEDIA_VISION_NULL_ARG_CHECK(image_tracking_model); if (file_name == NULL) diff --git a/src/mv_private.c b/src/mv_private.c index af4e7dfa..290cf51c 100644 --- a/src/mv_private.c +++ b/src/mv_private.c @@ -20,11 +20,6 @@ bool __mv_check_system_info_feature_supported() { - // return true is temporary added to allow correct flow for UTC - // todo: remove when vision.barcode_detection and vision.barcode_generation - // will be added - return true; - bool isBarcodeDetectionSupported = false; bool isBarcodeGenerationSupported = false; bool isFaceRecognitionSupported = false; @@ -56,11 +51,12 @@ bool __mv_check_system_info_feature_supported() const int nRetVal4 = system_info_get_platform_bool("http://tizen.org/feature/vision.image_recognition", &isImageRecognitionSupported); - if (nRetVal2 != SYSTEM_INFO_ERROR_NONE) + if (nRetVal4 != SYSTEM_INFO_ERROR_NONE) { LOGE("[%s] SYSTEM_INFO_ERROR: __FUNCTION__"); return false; } + (isBarcodeDetectionSupported || isBarcodeGenerationSupported || isFaceRecognitionSupported || isImageRecognitionSupported) ? LOGI("system_info_get_platform_bool returned" @@ -78,10 +74,6 @@ bool __mv_check_system_info_feature_supported() bool __mv_barcode_detect_check_system_info_feature_supported() { - // return true is temporary added to allow correct flow for UTC - // todo: remove when vision.barcode_detection feature will be added - return true; - bool isBarcodeDetectionSupported = false; const int nRetVal = system_info_get_platform_bool("http://tizen.org/feature/vision.barcode_detection", &isBarcodeDetectionSupported); @@ -103,10 +95,6 @@ bool __mv_barcode_detect_check_system_info_feature_supported() bool __mv_barcode_generate_check_system_info_feature_supported() { - // return true is temporary added to allow correct flow for UTC - // todo: remove when vision.barcode_generation feature will be added - return true; - bool isBarcodeGenerationSupported = false; const int nRetVal = system_info_get_platform_bool("http://tizen.org/feature/vision.barcode_generation", &isBarcodeGenerationSupported); @@ -128,10 +116,6 @@ bool __mv_barcode_generate_check_system_info_feature_supported() bool __mv_face_check_system_info_feature_supported() { - // return true is temporary added to allow correct flow for UTC - // todo: remove when vision.face_recognition feature will be added - return true; - bool isFaceRecognitionSupported = false; const int nRetVal = system_info_get_platform_bool("http://tizen.org/feature/vision.face_recognition", &isFaceRecognitionSupported); @@ -152,10 +136,6 @@ bool __mv_face_check_system_info_feature_supported() bool __mv_image_check_system_info_feature_supported() { - // return true is temporary added to allow correct flow for UTC - // todo: remove when vision.image_recognition feature will be added - return true; - bool isImageRecognitionSupported = false; const int nRetVal = system_info_get_platform_bool("http://tizen.org/feature/vision.image_recognition", &isImageRecognitionSupported); -- cgit v1.2.3