diff options
author | Tae-Young Chung <ty83.chung@samsung.com> | 2017-09-12 13:55:42 +0900 |
---|---|---|
committer | Tae-Young Chung <ty83.chung@samsung.com> | 2017-09-12 13:58:19 +0900 |
commit | 8dd33e02084208a7464575df073ec56777524113 (patch) | |
tree | a69b28d3db42c6293f772a6b19b040a8526d5f7d | |
parent | 68ea52fcc93936cb059d57240a92102ec65919cc (diff) | |
download | mediavision-8dd33e02084208a7464575df073ec56777524113.tar.gz mediavision-8dd33e02084208a7464575df073ec56777524113.tar.bz2 mediavision-8dd33e02084208a7464575df073ec56777524113.zip |
Fix violations of C coding rule
1. code indent should be tabs, not space
2. unnecessary braces{} for single statement
Change-Id: I920172c7d6f9c975b4a89415463e21079426c873
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
-rw-r--r-- | include/mv_barcode_detect.h | 24 | ||||
-rw-r--r-- | include/mv_barcode_generate.h | 50 | ||||
-rw-r--r-- | include/mv_face.h | 170 | ||||
-rw-r--r-- | include/mv_image.h | 96 | ||||
-rw-r--r-- | include/mv_surveillance.h | 34 | ||||
-rw-r--r-- | mv_surveillance/surveillance/include/mv_surveillance_open.h | 2 | ||||
-rw-r--r-- | mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h | 2 | ||||
-rw-r--r-- | packaging/capi-media-vision.spec | 2 | ||||
-rw-r--r-- | test/testsuites/face/face_test_suite.c | 4 |
9 files changed, 192 insertions, 192 deletions
diff --git a/include/mv_barcode_detect.h b/include/mv_barcode_detect.h index b209440b..6322593a 100644 --- a/include/mv_barcode_detect.h +++ b/include/mv_barcode_detect.h @@ -75,13 +75,13 @@ typedef enum { * @see mv_barcode_detect() */ typedef void (*mv_barcode_detected_cb)( - mv_source_h source, - mv_engine_config_h engine_cfg, - const mv_quadrangle_s *barcode_locations, - const char* messages[], - const mv_barcode_type_e *types, - int number_of_barcodes, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + const mv_quadrangle_s *barcode_locations, + const char* messages[], + const mv_barcode_type_e *types, + int number_of_barcodes, + void *user_data); /** * @brief Detects barcode(s) on source and reads message from it. @@ -109,11 +109,11 @@ typedef void (*mv_barcode_detected_cb)( * @see mv_barcode_detected_cb() */ int mv_barcode_detect( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_rectangle_s roi, - mv_barcode_detected_cb detect_cb, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_rectangle_s roi, + mv_barcode_detected_cb detect_cb, + void *user_data); /** * @} diff --git a/include/mv_barcode_generate.h b/include/mv_barcode_generate.h index bb078fff..c2a4ff6c 100644 --- a/include/mv_barcode_generate.h +++ b/include/mv_barcode_generate.h @@ -36,7 +36,7 @@ extern "C" { /** * @brief Define MV_BARCODE_GENERATE_ATTR_TEXT to set text attribute - of the engine configuration + * of the engine configuration * * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks This attribute is only available for 1D barcode generation @@ -44,8 +44,8 @@ extern "C" { * @see mv_barcode_generate_attr_text_e */ #define MV_BARCODE_GENERATE_ATTR_TEXT "MV_BARCODE_GENERATE_ATTR_TEXT" /**< Text: - 0-invisible, - 1-visible */ + 0-invisible, + 1-visible */ /** * @brief Defines MV_BARCODE_GENERATE_ATTR_COLOR_FRONT to set @@ -71,8 +71,8 @@ extern "C" { * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { - MV_BARCODE_GENERATE_ATTR_TEXT_INVISIBLE, /**< Invisible */ - MV_BARCODE_GENERATE_ATTR_TEXT_VISIBLE, /**< Visible */ + MV_BARCODE_GENERATE_ATTR_TEXT_INVISIBLE, /**< Invisible */ + MV_BARCODE_GENERATE_ATTR_TEXT_VISIBLE, /**< Visible */ } mv_barcode_generate_attr_text_e; @@ -117,13 +117,13 @@ typedef enum { * @see mv_barcode_generate_image() */ int mv_barcode_generate_source( - mv_engine_config_h engine_cfg, - const char *message, - mv_barcode_type_e type, - mv_barcode_qr_mode_e qr_enc_mode, - mv_barcode_qr_ecc_e qr_ecc, - int qr_version, - mv_source_h image); + mv_engine_config_h engine_cfg, + const char *message, + mv_barcode_type_e type, + mv_barcode_qr_mode_e qr_enc_mode, + mv_barcode_qr_ecc_e qr_ecc, + int qr_version, + mv_source_h image); /** * @brief Generates image file with barcode. @@ -139,9 +139,9 @@ int mv_barcode_generate_source( * when @a type is MV_BARCODE_QR * * @remarks The mediastorage privilege http://tizen.org/privilege/mediastorage is needed \n - if @a image_path is relevant to media storage.\n - The externalstorage privilege http://tizen.org/privilege/externalstorage is needed \n - if @a image_path is relevant to external storage. + * if @a image_path is relevant to media storage.\n + * The externalstorage privilege http://tizen.org/privilege/externalstorage is needed \n + * if @a image_path is relevant to external storage. * @param [in] engine_cfg The handle to the configuration of the engine * @param [in] message The message to be encoded in the barcode * @param [in] image_width The width of the generated image @@ -174,16 +174,16 @@ int mv_barcode_generate_source( * @see mv_barcode_generate_source() */ int mv_barcode_generate_image( - mv_engine_config_h engine_cfg, - const char *message, - int image_width, - int image_height, - mv_barcode_type_e type, - mv_barcode_qr_mode_e qr_enc_mode, - mv_barcode_qr_ecc_e qr_ecc, - int qr_version, - const char *image_path, - mv_barcode_image_format_e image_format); + mv_engine_config_h engine_cfg, + const char *message, + int image_width, + int image_height, + mv_barcode_type_e type, + mv_barcode_qr_mode_e qr_enc_mode, + mv_barcode_qr_ecc_e qr_ecc, + int qr_version, + const char *image_path, + mv_barcode_image_format_e image_format); /** * @} diff --git a/include/mv_face.h b/include/mv_face.h index c68955a2..584948b0 100644 --- a/include/mv_face.h +++ b/include/mv_face.h @@ -164,11 +164,11 @@ extern "C" { * @see mv_face_detect() */ typedef void (*mv_face_detected_cb)( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_rectangle_s *faces_locations, - int number_of_faces, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_rectangle_s *faces_locations, + int number_of_faces, + void *user_data); /** * @brief Performs face detection on the @a source for the @a engine_conf. @@ -203,10 +203,10 @@ typedef void (*mv_face_detected_cb)( * @see mv_face_detected_cb */ int mv_face_detect( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_face_detected_cb detected_cb, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_face_detected_cb detected_cb, + void *user_data); /********************/ @@ -250,13 +250,13 @@ int mv_face_detect( * @see mv_face_recognize() */ typedef void (*mv_face_recognized_cb)( - mv_source_h source, - mv_face_recognition_model_h recognition_model, - mv_engine_config_h engine_cfg, - mv_rectangle_s *face_location, - const int *face_label, - double confidence, - void *user_data); + mv_source_h source, + mv_face_recognition_model_h recognition_model, + mv_engine_config_h engine_cfg, + mv_rectangle_s *face_location, + const int *face_label, + double confidence, + void *user_data); /** * @brief Performs face recognition on the @a source image. @@ -309,12 +309,12 @@ typedef void (*mv_face_recognized_cb)( * @see mv_face_recognized_cb */ int mv_face_recognize( - mv_source_h source, - mv_face_recognition_model_h recognition_model, - mv_engine_config_h engine_cfg, - mv_rectangle_s *face_location, - mv_face_recognized_cb recognized_cb, - void *user_data); + mv_source_h source, + mv_face_recognition_model_h recognition_model, + mv_engine_config_h engine_cfg, + mv_rectangle_s *face_location, + mv_face_recognized_cb recognized_cb, + void *user_data); /*****************/ @@ -353,12 +353,12 @@ int mv_face_recognize( * @see mv_face_track() */ typedef void (*mv_face_tracked_cb)( - mv_source_h source, - mv_face_tracking_model_h tracking_model, - mv_engine_config_h engine_cfg, - mv_quadrangle_s *location, - double confidence, - void *user_data); + mv_source_h source, + mv_face_tracking_model_h tracking_model, + mv_engine_config_h engine_cfg, + mv_quadrangle_s *location, + double confidence, + void *user_data); /** * @brief Performs face tracking on the @a source for the @a tracking_model. @@ -412,12 +412,12 @@ typedef void (*mv_face_tracked_cb)( * @see mv_face_tracked_cb */ int mv_face_track( - mv_source_h source, - mv_face_tracking_model_h tracking_model, - mv_engine_config_h engine_cfg, - mv_face_tracked_cb tracked_cb, - bool do_learn, - void *user_data); + mv_source_h source, + mv_face_tracking_model_h tracking_model, + mv_engine_config_h engine_cfg, + mv_face_tracked_cb tracked_cb, + bool do_learn, + void *user_data); /********************************/ @@ -450,11 +450,11 @@ int mv_face_track( * @see mv_face_eye_condition_recognize() */ typedef void (*mv_face_eye_condition_recognized_cb)( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_rectangle_s face_location, - mv_face_eye_condition_e eye_condition, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_rectangle_s face_location, + mv_face_eye_condition_e eye_condition, + void *user_data); /** * @brief Determines eye-blink condition for @a face_location on media @a source. @@ -487,11 +487,11 @@ typedef void (*mv_face_eye_condition_recognized_cb)( * @see mv_face_eye_condition_recognized_cb */ int mv_face_eye_condition_recognize( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_rectangle_s face_location, - mv_face_eye_condition_recognized_cb eye_condition_recognized_cb, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_rectangle_s face_location, + mv_face_eye_condition_recognized_cb eye_condition_recognized_cb, + void *user_data); /************************************/ @@ -522,11 +522,11 @@ int mv_face_eye_condition_recognize( * @see mv_face_facial_expression_recognize() */ typedef void (*mv_face_facial_expression_recognized_cb)( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_rectangle_s face_location, - mv_face_facial_expression_e facial_expression, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_rectangle_s face_location, + mv_face_facial_expression_e facial_expression, + void *user_data); /** * @brief Determines facial expression for @a face_location on media @a source. @@ -558,11 +558,11 @@ typedef void (*mv_face_facial_expression_recognized_cb)( * @see mv_face_facial_expression_recognized_cb */ int mv_face_facial_expression_recognize( - mv_source_h source, - mv_engine_config_h engine_cfg, - mv_rectangle_s face_location, - mv_face_facial_expression_recognized_cb expression_recognized_cb, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + mv_rectangle_s face_location, + mv_face_facial_expression_recognized_cb expression_recognized_cb, + void *user_data); /*******************************/ /* Recognition model behavior */ @@ -605,7 +605,7 @@ int mv_face_facial_expression_recognize( * @see mv_face_recognition_model_destroy() */ int mv_face_recognition_model_create( - mv_face_recognition_model_h *recognition_model); + mv_face_recognition_model_h *recognition_model); /** * @brief Destroys the face recognition model handle and releases all its @@ -624,7 +624,7 @@ int mv_face_recognition_model_create( * @see mv_face_recognition_model_create() */ int mv_face_recognition_model_destroy( - mv_face_recognition_model_h recognition_model); + mv_face_recognition_model_h recognition_model); /** * @brief Creates a copy of existed recognition model handle and clones all its @@ -649,8 +649,8 @@ int mv_face_recognition_model_destroy( * @see mv_face_recognition_model_create() */ int mv_face_recognition_model_clone( - mv_face_recognition_model_h src, - mv_face_recognition_model_h *dst); + mv_face_recognition_model_h src, + mv_face_recognition_model_h *dst); /** * @brief Saves recognition model to the file. @@ -687,8 +687,8 @@ int mv_face_recognition_model_clone( * @see app_get_data_path() */ int mv_face_recognition_model_save( - const char *file_name, - mv_face_recognition_model_h recognition_model); + const char *file_name, + mv_face_recognition_model_h recognition_model); /** * @brief Loads recognition model from file. @@ -725,8 +725,8 @@ int mv_face_recognition_model_save( * @see app_get_data_path() */ int mv_face_recognition_model_load( - const char *file_name, - mv_face_recognition_model_h *recognition_model); + const char *file_name, + mv_face_recognition_model_h *recognition_model); /** * @brief Adds face image example to be used for face recognition model learning @@ -769,10 +769,10 @@ int mv_face_recognition_model_load( * @see mv_face_recognition_model_learn() */ int mv_face_recognition_model_add( - const mv_source_h source, - mv_face_recognition_model_h recognition_model, - const mv_rectangle_s *example_location, - int face_label); + const mv_source_h source, + mv_face_recognition_model_h recognition_model, + const mv_rectangle_s *example_location, + int face_label); /** * @brief Removes from @a recognition_model all collected with @@ -806,8 +806,8 @@ int mv_face_recognition_model_add( * @see mv_face_recognition_model_learn() */ int mv_face_recognition_model_reset( - mv_face_recognition_model_h recognition_model, - int *face_label); + mv_face_recognition_model_h recognition_model, + int *face_label); /** * @brief Learns face recognition model. @@ -866,8 +866,8 @@ int mv_face_recognition_model_reset( * @see mv_face_recognize() */ int mv_face_recognition_model_learn( - mv_engine_config_h engine_cfg, - mv_face_recognition_model_h recognition_model); + mv_engine_config_h engine_cfg, + mv_face_recognition_model_h recognition_model); /** * @brief Queries labels list and number of labels had been learned by the model. @@ -896,9 +896,9 @@ int mv_face_recognition_model_learn( * @see mv_face_recognition_model_learn() */ int mv_face_recognition_model_query_labels( - mv_face_recognition_model_h recognition_model, - int **labels, - unsigned int *number_of_labels); + mv_face_recognition_model_h recognition_model, + int **labels, + unsigned int *number_of_labels); /***************************/ /* Tracking model behavior */ @@ -938,7 +938,7 @@ int mv_face_recognition_model_query_labels( * @see mv_face_tracking_model_load() */ int mv_face_tracking_model_create( - mv_face_tracking_model_h *tracking_model); + mv_face_tracking_model_h *tracking_model); /** * @brief Calls this function to destroy the face tracking model handle and @@ -957,7 +957,7 @@ int mv_face_tracking_model_create( * @see mv_face_tracking_model_create() */ int mv_face_tracking_model_destroy( - mv_face_tracking_model_h tracking_model); + mv_face_tracking_model_h tracking_model); /** * @brief Calls this function to initialize tracking model by the location of the @@ -1002,10 +1002,10 @@ int mv_face_tracking_model_destroy( * @see mv_face_track() */ int mv_face_tracking_model_prepare( - mv_face_tracking_model_h tracking_model, - mv_engine_config_h engine_cfg, - mv_source_h source, - mv_quadrangle_s *location); + mv_face_tracking_model_h tracking_model, + mv_engine_config_h engine_cfg, + mv_source_h source, + mv_quadrangle_s *location); /** * @brief Calls this function to make a copy of existed tracking model handle and @@ -1030,8 +1030,8 @@ int mv_face_tracking_model_prepare( * @see mv_face_tracking_model_create() */ int mv_face_tracking_model_clone( - mv_face_tracking_model_h src, - mv_face_tracking_model_h *dst); + mv_face_tracking_model_h src, + mv_face_tracking_model_h *dst); /** * @brief Calls this method to save tracking model to the file. @@ -1063,8 +1063,8 @@ int mv_face_tracking_model_clone( * @see app_get_data_path() */ int mv_face_tracking_model_save( - const char *file_name, - mv_face_tracking_model_h tracking_model); + const char *file_name, + mv_face_tracking_model_h tracking_model); /** * @brief Calls this method to load a tracking model from file. @@ -1099,8 +1099,8 @@ int mv_face_tracking_model_save( * @see app_get_data_path() */ int mv_face_tracking_model_load( - const char *file_name, - mv_face_tracking_model_h *tracking_model); + const char *file_name, + mv_face_tracking_model_h *tracking_model); /** * @} diff --git a/include/mv_image.h b/include/mv_image.h index ec18dcda..c525b1ca 100644 --- a/include/mv_image.h +++ b/include/mv_image.h @@ -254,12 +254,12 @@ extern "C" { * @see mv_quadrangle_s */ typedef void (*mv_image_recognized_cb)( - mv_source_h source, - mv_engine_config_h engine_cfg, - const mv_image_object_h *image_objects, - mv_quadrangle_s **locations, - unsigned int number_of_objects, - void *user_data); + mv_source_h source, + mv_engine_config_h engine_cfg, + const mv_image_object_h *image_objects, + mv_quadrangle_s **locations, + unsigned int number_of_objects, + void *user_data); /** * @brief Recognizes the given image objects on the source image. @@ -306,12 +306,12 @@ typedef void (*mv_image_recognized_cb)( * @see mv_engine_config_h */ int mv_image_recognize( - mv_source_h source, - const mv_image_object_h *image_objects, - int number_of_objects, - mv_engine_config_h engine_cfg, - mv_image_recognized_cb recognized_cb, - void *user_data); + mv_source_h source, + const mv_image_object_h *image_objects, + int number_of_objects, + mv_engine_config_h engine_cfg, + mv_image_recognized_cb recognized_cb, + void *user_data); /*************************/ /* Image object tracking */ @@ -353,11 +353,11 @@ int mv_image_recognize( * @see mv_quadrangle_s */ typedef void (*mv_image_tracked_cb)( - mv_source_h source, - mv_image_tracking_model_h image_tracking_model, - mv_engine_config_h engine_cfg, - mv_quadrangle_s *location, - void *user_data); + mv_source_h source, + mv_image_tracking_model_h image_tracking_model, + mv_engine_config_h engine_cfg, + mv_quadrangle_s *location, + void *user_data); /** * @brief Tracks the given image tracking model on the current frame @@ -412,11 +412,11 @@ typedef void (*mv_image_tracked_cb)( * @see mv_image_tracking_model_destroy() */ int mv_image_track( - mv_source_h source, - mv_image_tracking_model_h image_tracking_model, - mv_engine_config_h engine_cfg, - mv_image_tracked_cb tracked_cb, - void *user_data); + mv_source_h source, + mv_image_tracking_model_h image_tracking_model, + mv_engine_config_h engine_cfg, + mv_image_tracked_cb tracked_cb, + void *user_data); /**************************/ /* Image object behaviour */ @@ -439,7 +439,7 @@ int mv_image_track( * @see mv_image_object_h */ int mv_image_object_create( - mv_image_object_h *image_object); + mv_image_object_h *image_object); /** * @brief Destroys the image object. @@ -457,7 +457,7 @@ int mv_image_object_create( * @see mv_image_object_h */ int mv_image_object_destroy( - mv_image_object_h image_object); + mv_image_object_h image_object); /** * @brief Fills the image object. @@ -498,10 +498,10 @@ int mv_image_object_destroy( * @see mv_engine_config_h */ int mv_image_object_fill( - mv_image_object_h image_object, - mv_engine_config_h engine_cfg, - mv_source_h source, - mv_rectangle_s *location); + mv_image_object_h image_object, + mv_engine_config_h engine_cfg, + mv_source_h source, + mv_rectangle_s *location); /** * @brief Gets a value that determines how well an image object can be recognized. @@ -534,8 +534,8 @@ int mv_image_object_fill( * @see mv_engine_config_h */ int mv_image_object_get_recognition_rate( - mv_image_object_h image_object, - double *recognition_rate); + mv_image_object_h image_object, + double *recognition_rate); /** * @brief Sets a label for the image object. @@ -560,8 +560,8 @@ int mv_image_object_get_recognition_rate( * @see mv_image_object_destroy() */ int mv_image_object_set_label( - mv_image_object_h image_object, - int label); + mv_image_object_h image_object, + int label); /** * @brief Gets a label of image object. @@ -588,8 +588,8 @@ int mv_image_object_set_label( * @see mv_image_object_destroy() */ int mv_image_object_get_label( - mv_image_object_h image_object, - int *label); + mv_image_object_h image_object, + int *label); /** * @brief Clones the image object. @@ -610,8 +610,8 @@ int mv_image_object_get_label( * @see mv_image_object_destroy() */ int mv_image_object_clone( - mv_image_object_h src, - mv_image_object_h *dst); + mv_image_object_h src, + mv_image_object_h *dst); /** * @brief Saves the image object. @@ -637,7 +637,7 @@ int mv_image_object_clone( * @see mv_image_object_destroy() */ int mv_image_object_save( - const char *file_name, mv_image_object_h image_object); + const char *file_name, mv_image_object_h image_object); /** * @brief Loads an image object from the file. @@ -665,7 +665,7 @@ int mv_image_object_save( * @see mv_image_object_destroy() */ int mv_image_object_load( - const char *file_name, mv_image_object_h *image_object); + const char *file_name, mv_image_object_h *image_object); /**********************************/ /* Image tracking model behaviour */ @@ -686,7 +686,7 @@ int mv_image_object_load( * @see mv_image_tracking_model_destroy() */ int mv_image_tracking_model_create( - mv_image_tracking_model_h *image_tracking_model); + mv_image_tracking_model_h *image_tracking_model); /** * @brief Sets target of image tracking model. @@ -720,8 +720,8 @@ int mv_image_tracking_model_create( * @see mv_image_tracking_model_destroy() */ int mv_image_tracking_model_set_target( - mv_image_object_h image_object, - mv_image_tracking_model_h image_tracking_model); + mv_image_object_h image_object, + mv_image_tracking_model_h image_tracking_model); /** * @brief Destroys the image tracking model. @@ -739,7 +739,7 @@ int mv_image_tracking_model_set_target( * @see mv_image_tracking_model_create() */ int mv_image_tracking_model_destroy( - mv_image_tracking_model_h image_tracking_model); + mv_image_tracking_model_h image_tracking_model); /** * @brief Refreshes the state of image tracking model. @@ -771,8 +771,8 @@ int mv_image_tracking_model_destroy( * @see mv_image_tracking_model_destroy() */ int mv_image_tracking_model_refresh( - mv_image_tracking_model_h image_tracking_model, - mv_engine_config_h engine_cfg); + mv_image_tracking_model_h image_tracking_model, + mv_engine_config_h engine_cfg); /** * @brief Clones the image tracking model. @@ -794,8 +794,8 @@ int mv_image_tracking_model_refresh( * @see mv_image_tracking_model_destroy() */ int mv_image_tracking_model_clone( - mv_image_tracking_model_h src, - mv_image_tracking_model_h *dst); + mv_image_tracking_model_h src, + mv_image_tracking_model_h *dst); /** * @brief Saves the image tracking model. @@ -823,7 +823,7 @@ int mv_image_tracking_model_clone( * @see mv_image_tracking_model_destroy() */ int mv_image_tracking_model_save( - const char *file_name, mv_image_tracking_model_h image_tracking_model); + const char *file_name, mv_image_tracking_model_h image_tracking_model); /** * @brief Loads an image tracking model from the file. @@ -851,7 +851,7 @@ int mv_image_tracking_model_save( * @see mv_image_tracking_model_destroy() */ int mv_image_tracking_model_load( - const char *file_name, mv_image_tracking_model_h *image_tracking_model); + const char *file_name, mv_image_tracking_model_h *image_tracking_model); /** * @} diff --git a/include/mv_surveillance.h b/include/mv_surveillance.h index ecf57b16..5ca50d27 100644 --- a/include/mv_surveillance.h +++ b/include/mv_surveillance.h @@ -49,7 +49,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_EVENT_TYPE_MOVEMENT_DETECTED \ - "MV_SURVEILLANCE_EVENT_MOVEMENT_DETECTED" + "MV_SURVEILLANCE_EVENT_MOVEMENT_DETECTED" /** * @brief Name of the event result value that contains number of regions where @@ -91,7 +91,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_MOVEMENT_NUMBER_OF_REGIONS \ - "NUMBER_OF_MOVEMENT_REGIONS" + "NUMBER_OF_MOVEMENT_REGIONS" /** * @brief Name of the event result value that contains rectangular regions where @@ -176,7 +176,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_EVENT_TYPE_PERSON_APPEARED_DISAPPEARED \ - "MV_SURVEILLANCE_EVENT_PERSON_APPEARED_DISAPEARED" + "MV_SURVEILLANCE_EVENT_PERSON_APPEARED_DISAPEARED" /** * @brief Name of the event result value that contains number @@ -217,7 +217,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_APPEARED_NUMBER \ - "NUMBER_OF_APPEARED_PERSONS" + "NUMBER_OF_APPEARED_PERSONS" /** * @brief Name of the event result value that contains number @@ -258,7 +258,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_DISAPPEARED_NUMBER \ - "NUMBER_OF_DISAPPEARED_PERSONS" + "NUMBER_OF_DISAPPEARED_PERSONS" /** * @brief Name of the event result value that contains number @@ -299,7 +299,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_TRACKED_NUMBER \ - "NUMBER_OF_TRACKED_PERSONS" + "NUMBER_OF_TRACKED_PERSONS" /** * @brief Name of the event result value that contains a set of rectangular @@ -352,7 +352,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_APPEARED_LOCATIONS \ - "APPEARED_PERSONS_LOCATIONS" + "APPEARED_PERSONS_LOCATIONS" /** * @brief Name of the event result value that contains a set of rectangular @@ -405,7 +405,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_DISAPPEARED_LOCATIONS \ - "DISAPPEARED_PERSONS_LOCATIONS" + "DISAPPEARED_PERSONS_LOCATIONS" /** * @brief Name of the event result value that contains a set of rectangular @@ -457,7 +457,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_TRACKED_LOCATIONS \ - "TRACKED_PERSONS_LOCATIONS" + "TRACKED_PERSONS_LOCATIONS" /** * @brief Name of the person recognition event type. @@ -488,7 +488,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_EVENT_TYPE_PERSON_RECOGNIZED \ - "MV_SURVEILLANCE_EVENT_PERSON_RECOGNIZED" + "MV_SURVEILLANCE_EVENT_PERSON_RECOGNIZED" /** * @brief Name of the event result value that contains number of locations where @@ -529,7 +529,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_RECOGNIZED_NUMBER \ - "NUMBER_OF_PERSONS" + "NUMBER_OF_PERSONS" /** * @brief Name of the event result value that contains a set of rectangular @@ -580,7 +580,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_RECOGNIZED_LOCATIONS \ - "PERSONS_LOCATIONS" + "PERSONS_LOCATIONS" /** * @brief Name of the event result value that contains a set of labels that @@ -630,7 +630,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_RECOGNIZED_LABELS \ - "PERSONS_LABELS" + "PERSONS_LABELS" /** * @brief Name of the event result value that contains a set of confidence @@ -680,7 +680,7 @@ extern "C" { * @since_tizen 3.0 */ #define MV_SURVEILLANCE_PERSONS_RECOGNIZED_CONFIDENCES \ - "PERSONS_CONFIDENCES" + "PERSONS_CONFIDENCES" /** * @} @@ -703,7 +703,7 @@ extern "C" { * @see mv_engine_config_get_string_attribute() */ #define MV_SURVEILLANCE_FACE_RECOGNITION_MODEL_FILE_PATH \ - "MV_SURVEILLANCE_FACE_RECOGNITION_MODEL_FILE_PATH" + "MV_SURVEILLANCE_FACE_RECOGNITION_MODEL_FILE_PATH" /** * @brief Defines MV_SURVEILLANCE_MOVEMENT_DETECTION_THRESOLD to set movement @@ -720,7 +720,7 @@ extern "C" { * @see mv_engine_config_get_int_attribute() */ #define MV_SURVEILLANCE_MOVEMENT_DETECTION_THRESHOLD \ - "MV_SURVEILLANCE_MOVEMENT_DETECTION_THRESHOLD" + "MV_SURVEILLANCE_MOVEMENT_DETECTION_THRESHOLD" /** * @brief Defines MV_SURVEILLANCE_SKIP_FRAMES_COUNT to set how many frames @@ -1003,7 +1003,7 @@ int mv_surveillance_subscribe_event_trigger( * * @since_tizen 3.0 * @remarks To start handling trigger activation use - @ref mv_surveillance_subscribe_event_trigger(). + * @ref mv_surveillance_subscribe_event_trigger(). * @param [in] trigger The handle to the event trigger for which * subscription will be stopped * @param [in] video_stream_id The identifier of the video source for which diff --git a/mv_surveillance/surveillance/include/mv_surveillance_open.h b/mv_surveillance/surveillance/include/mv_surveillance_open.h index a5241fa9..3f7cfd18 100644 --- a/mv_surveillance/surveillance/include/mv_surveillance_open.h +++ b/mv_surveillance/surveillance/include/mv_surveillance_open.h @@ -67,7 +67,7 @@ int mv_surveillance_subscribe_event_trigger_open( * * @since_tizen 3.0 * @remarks To start handling trigger activation use - @ref mv_surveillance_subscribe_event_trigger_open(). + * @ref mv_surveillance_subscribe_event_trigger_open(). * @param [in] event_trigger The event trigger for which subscription will * be stopped * @param [in] video_stream_id The identifier of the video source for which diff --git a/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h b/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h index 4ad91599..6f5f9881 100644 --- a/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h +++ b/mv_surveillance/surveillance_lic/include/mv_surveillance_lic.h @@ -65,7 +65,7 @@ int mv_surveillance_subscribe_event_trigger_lic( * * @since_tizen 3.0 * @remarks To start handling trigger activation use - @ref mv_surveillance_subscribe_event_trigger_lic(). + * @ref mv_surveillance_subscribe_event_trigger_lic(). * @param [in] event_trigger The event trigger for which subscription will * be stopped * @param [in] video_stream_id The identifier of the video source for which diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 9683593d..12af7e0f 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,7 +1,7 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API Version: 0.3.27 -Release: 1 +Release: 2 Group: Multimedia/Framework License: Apache-2.0 and BSD-3-Clause Source0: %{name}-%{version}.tar.gz diff --git a/test/testsuites/face/face_test_suite.c b/test/testsuites/face/face_test_suite.c index 74fe5b78..2004d726 100644 --- a/test/testsuites/face/face_test_suite.c +++ b/test/testsuites/face/face_test_suite.c @@ -862,9 +862,9 @@ int perform_model_evaluation(mv_face_recognition_model_h model) labels[dir_n] = known_label ? face_label : -1; char *directory = directories[dir_n]; - if (directory != NULL) { + if (directory != NULL) snprintf(directories[dir_n], 1024, "%s", in_file_name); - } + label_count += (0 == unique_checks[face_label] ? 1 : 0); if (labels[dir_n] >= 0) unique_checks[labels[dir_n]] += 1; |