From 8782484c89418758b483642506669ded95586b7e Mon Sep 17 00:00:00 2001 From: SeokHoon Lee Date: Tue, 22 Mar 2016 15:52:58 +0900 Subject: [PATCH] Change tizen version to MOBILE and 2.4 others 3.0 Signed-off-by: SeokHoon Lee Change-Id: Ibd099eebf99f3586b0005a4f465af6a41f39318c --- include/mv_barcode_detect.h | 8 +-- include/mv_barcode_generate.h | 8 +-- include/mv_barcode_type.h | 8 +-- include/mv_common.h | 58 +++++++++++----------- mv_barcode/barcode_detector/include/Barcode.h | 10 ++-- mv_barcode/barcode_detector/include/BarcodeUtils.h | 2 +- .../include/mv_barcode_detect_open.h | 2 +- .../include/mv_barcode_detect_lic.h | 2 +- .../barcode_generator/include/BarcodeGenerator.h | 6 +-- .../barcode_generator/include/BarcodeOptions.h | 12 ++--- .../include/mv_barcode_generate_open.h | 4 +- .../include/mv_barcode_generate_lic.h | 4 +- mv_common/include/EngineConfig.h | 18 +++---- mv_common/include/MediaSource.h | 18 +++---- mv_common/include/mv_common_c.h | 40 +++++++-------- packaging/capi-media-vision.spec | 2 +- 16 files changed, 101 insertions(+), 101 deletions(-) diff --git a/include/mv_barcode_detect.h b/include/mv_barcode_detect.h index b3981b6..b209440 100644 --- a/include/mv_barcode_detect.h +++ b/include/mv_barcode_detect.h @@ -37,7 +37,7 @@ extern "C" { /** * @brief Define MV_BARCODE_DETECT_ATTR_TARGET to set target attribute of the engine configuration * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * * @see mv_barcode_detect_attr_target_e */ @@ -46,7 +46,7 @@ extern "C" { /** * @brief Enumeration to target attribute * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { MV_BARCODE_DETECT_ATTR_TARGET_ALL, /**< 1D and 2D */ @@ -60,7 +60,7 @@ typedef enum { * @details If no barcode is detected then the method will be called, barcodes * and states will be equal to NULL, and @a number_of_barcodes - 0. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the media source * @param [in] engine_cfg The handle to the configuration of the engine * @param [in] barcode_locations The quadrangle locations of detected barcodes @@ -86,7 +86,7 @@ typedef void (*mv_barcode_detected_cb)( /** * @brief Detects barcode(s) on source and reads message from it. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The media source handle * @param [in] engine_cfg The handle to the configuration of the engine * @param [in] roi Region of interest - rectangular area on the diff --git a/include/mv_barcode_generate.h b/include/mv_barcode_generate.h index 1662525..134c824 100644 --- a/include/mv_barcode_generate.h +++ b/include/mv_barcode_generate.h @@ -38,7 +38,7 @@ extern "C" { * @brief Define MV_BARCODE_GENERATE_ATTR_TEXT to set text attribute of the engine configuration * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks This attribute is only available for 1D barcode generation * * @see mv_barcode_generate_attr_text_e @@ -50,7 +50,7 @@ extern "C" { /** * @brief Enumeration to text attribute * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { MV_BARCODE_GENERATE_ATTR_TEXT_INVISIBLE, /**< Invisible */ @@ -65,7 +65,7 @@ typedef enum { * message length. Also for QR codes the version may be selected as minimum * required to generate QR code with the input message length. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks If the text attribute of engine configuration is set to * MV_BARCODE_GENERATE_ATTR_TEXT_VISIBLE, * MEDIA_VISION_ERROR_INVALID_OPERATION will be return @@ -114,7 +114,7 @@ int mv_barcode_generate_source( * message length. Also for QR codes the version may be selected as minimum * required to generate QR code with the input message length. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks If the text attribute of engine configuration is set to * MV_BARCODE_GENERATE_ATTR_TEXT_VISIBLE, * MEDIA_VISION_ERROR_INVALID_OPERATION will be return diff --git a/include/mv_barcode_type.h b/include/mv_barcode_type.h index d8b2e74..ca9e4e6 100644 --- a/include/mv_barcode_type.h +++ b/include/mv_barcode_type.h @@ -35,7 +35,7 @@ extern "C" { * @brief Enumeration for supported barcode types. * @details QR codes (versions 1 to 40) and set of 1D barcodes are supported * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { @@ -53,7 +53,7 @@ typedef enum /** * @brief Enumeration for supported QR code error correction level. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks This is unavailable for 1D barcodes */ typedef enum @@ -68,7 +68,7 @@ typedef enum /** * @brief Enumeration for supported QR code encoding mode. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks This is unavailable for 1D barcodes */ typedef enum @@ -83,7 +83,7 @@ typedef enum /** * @brief Enumeration for supported image formats for the barcode generating. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { diff --git a/include/mv_common.h b/include/mv_common.h index f8eb83e..e26068e 100644 --- a/include/mv_common.h +++ b/include/mv_common.h @@ -36,7 +36,7 @@ extern "C" { /** * @brief Point in 2D space. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef struct { @@ -47,7 +47,7 @@ typedef struct /** * @brief Location of the object bounded by quadrangle defined by four 2D points. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef struct { @@ -59,7 +59,7 @@ typedef struct * @brief Location of the object bounded by rectangle defined by * coordinates of top left corner, width and height. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef struct { @@ -71,7 +71,7 @@ typedef struct /** * @brief Enumeration for Media Vision error. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { @@ -107,7 +107,7 @@ typedef enum * @brief Enumeration for Media Vision @ref mv_engine_config_h handle attribute * type. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { @@ -120,7 +120,7 @@ typedef enum /** * @brief Enumeration for Media Vision colorspace. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef enum { @@ -150,7 +150,7 @@ typedef enum * destroy it and release resources by @ref mv_destroy_engine_config() * function. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * * @see mv_create_engine_config() * @see mv_destroy_engine_config() @@ -160,14 +160,14 @@ typedef void *mv_engine_config_h; /** * @brief The handle to the source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ typedef void *mv_source_h; /** * @brief Creates a source handle. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks You must release @a source by using @ref mv_destroy_source(). * @param [out] source A new handle to the source * @return @c 0 on success, otherwise a negative error value @@ -184,7 +184,7 @@ int mv_create_source( /** * @brief Destroys the source handle and releases all its resources. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source to be destroyed * @return @c 0 on success, otherwise a negative error value * @retval #MEDIA_VISION_ERROR_NONE Successful @@ -199,7 +199,7 @@ int mv_destroy_source( /** * @brief Fills the media source based on the media packet. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in,out] source The handle to the source * @param [in] media_packet The handle to the media packet from which * will be filled the source @@ -223,7 +223,7 @@ int mv_source_fill_by_media_packet( /** * @brief Fills the media source based on the buffer and metadata. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in,out] source The handle to the source * @param [in] data_buffer The buffer of image data * @param [in] buffer_size The buffer size @@ -251,7 +251,7 @@ int mv_source_fill_by_buffer( /** * @brief Clears the buffer of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in,out] source The handle to the source * @return @c 0 on success, otherwise a negative error value * @retval #MEDIA_VISION_ERROR_NONE Successful @@ -266,7 +266,7 @@ int mv_source_clear( /** * @brief Gets buffer of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks Note that the retrieved buffer will be destroyed when * @ref mv_destroy_source() or @ref mv_source_clear() function * is called for the @a source. @@ -291,7 +291,7 @@ int mv_source_get_buffer( /** * @brief Gets height of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @param [out] image_height The height of an image in the source * @return @c 0 on success, otherwise a negative error value @@ -310,7 +310,7 @@ int mv_source_get_height( /** * @brief Gets width of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @param [out] image_width The width of an image in the source * @return @c 0 on success, otherwise a negative error value @@ -329,7 +329,7 @@ int mv_source_get_width( /** * @brief Gets colorspace of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @param [out] image_colorspace The colorspace of an image in the source * @return @c 0 on success, otherwise a negative error value @@ -348,7 +348,7 @@ int mv_source_get_colorspace( /** * @brief Creates the handle to the configuration of engine. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks Available engine configuration attributes can be get by using * @ref mv_engine_config_foreach_supported_attribute(). * The attributes can be changed by @ref mv_engine_config_h @@ -379,7 +379,7 @@ int mv_create_engine_config( * @brief Destroys the engine configuration handle and releases all its * resources. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg The handle to the engine configuration * to be destroyed * @return @c 0 on success, otherwise a negative error value @@ -396,7 +396,7 @@ int mv_destroy_engine_config( /** * @brief Sets the double attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -422,7 +422,7 @@ int mv_engine_config_set_double_attribute( /** * @brief Sets the integer attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -450,7 +450,7 @@ int mv_engine_config_set_int_attribute( /** * @brief Sets the boolean attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -476,7 +476,7 @@ int mv_engine_config_set_bool_attribute( /** * @brief Sets the string attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -502,7 +502,7 @@ int mv_engine_config_set_string_attribute( /** * @brief Gets the double attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration from which @a value * has to be gotten * @param [in] name String key of the attribute will be used for @@ -529,7 +529,7 @@ int mv_engine_config_get_double_attribute( /** * @brief Gets the integer attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration from which @a value * has to be gotten * @param [in] name String key of the attribute will be used for @@ -558,7 +558,7 @@ int mv_engine_config_get_int_attribute( /** * @brief Gets the boolean attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration from which @a value * has to be gotten * @param [in] name String key of the attribute will be used for @@ -585,7 +585,7 @@ int mv_engine_config_get_bool_attribute( /** * @brief Gets the string attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks Function allocates memory required for output @a value, so * it has to be removed by the user himself. * @param [in] engine_cfg Engine configuration from which @a value @@ -615,7 +615,7 @@ int mv_engine_config_get_string_attribute( * @brief Called to get information (type and name) once for each supported * attribute. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] attribute_type The supported attribute type * @param [in] attribute_name The supported attribute name * @param [in] user_data The user data passed from the @@ -638,7 +638,7 @@ typedef bool (*mv_supported_attribute_cb)( * Names of the attributes can be used with @ref mv_engine_config_h * related getters and setters to get/set appropriate attribute values. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks If @a callback is called zero times after * @ref mv_engine_config_foreach_supported_attribute() call, then * engine configuration is not supported and setting of attributes will diff --git a/mv_barcode/barcode_detector/include/Barcode.h b/mv_barcode/barcode_detector/include/Barcode.h index b47cacd..5a595c2 100644 --- a/mv_barcode/barcode_detector/include/Barcode.h +++ b/mv_barcode/barcode_detector/include/Barcode.h @@ -33,7 +33,7 @@ public: /** * @brief Barcode constructor. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks create copy of bar_obj * @param [in] barObj zbar barcode handle * @@ -43,14 +43,14 @@ public: /** * @brief Barcode destructor. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ ~Barcode(); /** * @brief Gets encoded message from barcode object. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Encoded message */ std::string getMessage(void) const; @@ -58,7 +58,7 @@ public: /** * @brief Gets the type of the barcode. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Enumeration value corresponding to the barcode type */ mv_barcode_type_e getType(void) const; @@ -67,7 +67,7 @@ public: * @brief Calculates location of barcode handle from zbar. * location polygon. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [out] location Quadrangle that contains barcode on image * @return @c MEDIA_VISION_ERROR_NONE on success, * otherwise a negative error value diff --git a/mv_barcode/barcode_detector/include/BarcodeUtils.h b/mv_barcode/barcode_detector/include/BarcodeUtils.h index d386cc0..10f3f8e 100644 --- a/mv_barcode/barcode_detector/include/BarcodeUtils.h +++ b/mv_barcode/barcode_detector/include/BarcodeUtils.h @@ -29,7 +29,7 @@ namespace Barcode { /** * @brief This function converts media vision image handle to zbar image handle. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] mvSource Media vision image handle * @param [out] zbarSource Zbar image handle * @return @c MEDIA_VISION_ERROR_NONE on success, diff --git a/mv_barcode/barcode_detector/include/mv_barcode_detect_open.h b/mv_barcode/barcode_detector/include/mv_barcode_detect_open.h index c6a3495..9f90e35 100644 --- a/mv_barcode/barcode_detector/include/mv_barcode_detect_open.h +++ b/mv_barcode/barcode_detector/include/mv_barcode_detect_open.h @@ -32,7 +32,7 @@ extern "C" { /** * @brief Detects barcode(s) on source and reads message from it. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The media source handle * @param [in] engine_cfg The handle to the configuration of the engine * @param [in] roi Region of interest - rectangular area on the diff --git a/mv_barcode/barcode_detector_lic/include/mv_barcode_detect_lic.h b/mv_barcode/barcode_detector_lic/include/mv_barcode_detect_lic.h index 40d7163..9346f86 100644 --- a/mv_barcode/barcode_detector_lic/include/mv_barcode_detect_lic.h +++ b/mv_barcode/barcode_detector_lic/include/mv_barcode_detect_lic.h @@ -32,7 +32,7 @@ extern "C" { /** * @brief Detects barcode(s) on source and reads message from it. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The media source handle * @param [in] engine_cfg The handle to the configuration of the engine * @param [in] roi Region of interest - rectangular area on the diff --git a/mv_barcode/barcode_generator/include/BarcodeGenerator.h b/mv_barcode/barcode_generator/include/BarcodeGenerator.h index 9fb0104..7e13532 100644 --- a/mv_barcode/barcode_generator/include/BarcodeGenerator.h +++ b/mv_barcode/barcode_generator/include/BarcodeGenerator.h @@ -32,14 +32,14 @@ namespace Barcode { * @brief This class implements barcode generation. * @details 1D Barcodes and 2D QR codes are supported. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ class BarcodeGenerator { public: /** * @brief This method generates Barcodes image according to options. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] imageFileName Image file name which will be generated * @param [in] imageFormat Image file format which will be generated * @param [in] imageWidth Image file width which will be generated @@ -68,7 +68,7 @@ public: /** * @brief This method generates Barcodes image buffer according to options. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [out] imageBuffer Image buffer with image to be generated * @param [out] imageWidth Image buffer width which will be generated * @param [out] imageHeight Image buffer height which will be generated diff --git a/mv_barcode/barcode_generator/include/BarcodeOptions.h b/mv_barcode/barcode_generator/include/BarcodeOptions.h index 2ebf402..0eefd4a 100644 --- a/mv_barcode/barcode_generator/include/BarcodeOptions.h +++ b/mv_barcode/barcode_generator/include/BarcodeOptions.h @@ -27,7 +27,7 @@ namespace Barcode { /** * @brief The Barcode type enumeration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ enum BarcodeType { BARCODE_QR = 58, @@ -43,7 +43,7 @@ enum BarcodeType { /** * @brief The Barcode error correction level enumeration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks This is unavailable for 1D barcodes. */ enum BarcodeQRErrorCorrectionLevel { @@ -57,7 +57,7 @@ enum BarcodeQRErrorCorrectionLevel { /** * @brief The Barcode encoding mode enumeration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks This is unavailable for 1D barcodes. */ enum BarcodeQREncodingMode { @@ -72,7 +72,7 @@ enum BarcodeQREncodingMode { /** * @brief The Barcode image format enumeration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ enum BarcodeImageFormat { BARCODE_IMAGE_JPG, @@ -83,7 +83,7 @@ enum BarcodeImageFormat { /** * @brief The Barcode generation text option enumeration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ enum BarcodeGenTextOpt { BARCODE_GEN_TEXT_INVISIBLE, @@ -93,7 +93,7 @@ enum BarcodeGenTextOpt { /** * @brief The Barcode error enumeration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ enum BarcodeError { BARCODE_ERROR_NONE = 0, diff --git a/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h b/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h index bb1e8b6..2664ad3 100644 --- a/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h +++ b/mv_barcode/barcode_generator/include/mv_barcode_generate_open.h @@ -32,7 +32,7 @@ extern "C" { /** * @brief Generates @ref mv_source_h with barcode image. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @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] type Type of the barcode to be generated @@ -65,7 +65,7 @@ int mv_barcode_generate_source_open(mv_engine_config_h engine_cfg, /** * @brief Generates image file with barcode. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @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 diff --git a/mv_barcode/barcode_generator_lic/include/mv_barcode_generate_lic.h b/mv_barcode/barcode_generator_lic/include/mv_barcode_generate_lic.h index 2fbd935..76fec39 100644 --- a/mv_barcode/barcode_generator_lic/include/mv_barcode_generate_lic.h +++ b/mv_barcode/barcode_generator_lic/include/mv_barcode_generate_lic.h @@ -32,7 +32,7 @@ extern "C" { /** * @brief Generates @ref mv_source_h with barcode image. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @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 @@ -66,7 +66,7 @@ int mv_barcode_generate_source_lic( /** * @brief Generates image file with barcode. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @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 diff --git a/mv_common/include/EngineConfig.h b/mv_common/include/EngineConfig.h index 5b7e871..7083910 100644 --- a/mv_common/include/EngineConfig.h +++ b/mv_common/include/EngineConfig.h @@ -42,7 +42,7 @@ public: * @details Create new engine configuration dictionary and set default * attributes values. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif */ EngineConfig(); @@ -54,7 +54,7 @@ public: /** * @brief Sets attribute with double value. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [in] value The double attribute value to be set * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -65,7 +65,7 @@ public: /** * @brief Sets attribute with integer value. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [in] value The integer attribute value to be set * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -76,7 +76,7 @@ public: /** * @brief Sets attribute with boolean value. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [in] value The boolean attribute value to be set * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -87,7 +87,7 @@ public: /** * @brief Sets attribute with string value. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [in] value The string attribute value to be set * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -98,7 +98,7 @@ public: /** * @brief Gets double attribute value by attribute name. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [out] value r The double attribute value to be obtained * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -111,7 +111,7 @@ public: /** * @brief Gets integer attribute value by attribute name. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [out] value The integer attribute value to be obtained * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -124,7 +124,7 @@ public: /** * @brief Gets boolean attribute value by attribute name. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [out] value The boolean attribute value to be obtained * @return @c MEDIA_VISION_ERROR_NONE on success,\n @@ -137,7 +137,7 @@ public: /** * @brief Gets string attribute value by attribute name. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] key The string name of the attribute * @param [out] value The string attribute value to be obtained * @return @c MEDIA_VISION_ERROR_NONE on success,\n diff --git a/mv_common/include/MediaSource.h b/mv_common/include/MediaSource.h index cc79f74..5e3ce58 100644 --- a/mv_common/include/MediaSource.h +++ b/mv_common/include/MediaSource.h @@ -41,7 +41,7 @@ public: * width, height and buffer size; NULL for buffer; * MEDIA_VISION_COLORSPACE_INVALID for colorspace. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * * @see MediaSource::~MediaSource() */ @@ -50,7 +50,7 @@ public: /** * @brief Destroys the MediaSource and releases all its resources. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * * @see MediaSource::MediaSource() */ @@ -60,7 +60,7 @@ public: * @brief Clears the MediaSource. * @details Releases all internal resources and set parameters to default values. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * * @see MediaSource::MediaSource() * @see MediaSource::fill() @@ -70,7 +70,7 @@ public: /** * @brief Fills the MediaSource based on the buffer and metadata. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] buffer The buffer of image data * @param [in] bufferSize The buffer size * @param [in] width The image width @@ -87,7 +87,7 @@ public: /** * @brief Gets data buffer of the MediaSource. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Pointer to the data buffer. */ unsigned char *getBuffer(void) const; @@ -95,7 +95,7 @@ public: /** * @brief Gets buffer size of the MediaSource. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Size of data buffer. */ unsigned int getBufferSize(void) const; @@ -103,7 +103,7 @@ public: /** * @brief Gets image width of the MediaSource. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Width of image. */ unsigned int getWidth(void) const; @@ -111,7 +111,7 @@ public: /** * @brief Gets image height of the MediaSource. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Height of image. */ unsigned int getHeight(void) const; @@ -119,7 +119,7 @@ public: /** * @brief Gets image colorspace of the MediaSource. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @return Colorspace of image. */ mv_colorspace_e getColorspace(void) const; diff --git a/mv_common/include/mv_common_c.h b/mv_common/include/mv_common_c.h index 9afa2d1..a46a903 100644 --- a/mv_common/include/mv_common_c.h +++ b/mv_common/include/mv_common_c.h @@ -31,7 +31,7 @@ extern "C" { /** * @brief Creates a source handle. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks You must release @a source by using @ref mv_destroy_source_c(). * @param [out] source A new handle to the source * @return @c 0 on success, otherwise a negative error value @@ -47,7 +47,7 @@ int mv_create_source_c( /** * @brief Destroys the source handle and releases all its resources. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source to be destroyed * @return @c 0 on success, otherwise a negative error value * @retval #MEDIA_VISION_ERROR_NONE Successful @@ -61,7 +61,7 @@ int mv_destroy_source_c( /** * @brief Fills the media source based on the media packet. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in,out] source The handle to the source * @param [in] media_packet The handle to the media packet from which * will be filled the source @@ -84,7 +84,7 @@ int mv_source_fill_by_media_packet_c( /** * @brief Fills the media source based on the buffer and metadata. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in,out] source The handle to the source * @param [in] data_buffer The buffer of image data * @param [in] buffer_size The buffer size @@ -111,7 +111,7 @@ int mv_source_fill_by_buffer_c( /** * @brief Clears the buffer of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @return @c 0 on success, otherwise a negative error value * @retval #MEDIA_VISION_ERROR_NONE Successful @@ -125,7 +125,7 @@ int mv_source_clear_c( /** * @brief Gets buffer of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks Note that the retrieved buffer will be destroyed when * @ref mv_destroy_source_c() or @ref mv_source_clear_c() function * is called for the @a source. @@ -149,7 +149,7 @@ int mv_source_get_buffer_c( /** * @brief Gets height of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @param [out] image_height The height of the source * @return @c 0 on success, otherwise a negative error value @@ -167,7 +167,7 @@ int mv_source_get_height_c( /** * @brief Gets width of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @param [out] image_width The width of the source * @return @c 0 on success, otherwise a negative error value @@ -185,7 +185,7 @@ int mv_source_get_width_c( /** * @brief Gets colorspace of the media source. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] source The handle to the source * @param [out] image_colorspace The colorspace of the source * @return @c 0 on success, otherwise a negative error value @@ -203,7 +203,7 @@ int mv_source_get_colorspace_c( /** * @brief Creates the handle to the configuration of engine. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [out] engine_cfg The handle to the engine to be created * @return @c 0 on success, otherwise a negative error value * @retval #MEDIA_VISION_ERROR_NONE Successful @@ -228,7 +228,7 @@ int mv_create_engine_config_c( * @brief Destroys the engine configuration handle and releases all its * resources. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg The handle to the engine configuration * to be destroyed * @return @c 0 on success, otherwise a negative error value @@ -244,7 +244,7 @@ int mv_destroy_engine_config_c( /** * @brief Sets the double attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -268,7 +268,7 @@ int mv_engine_config_set_double_attribute_c( /** * @brief Sets the integer attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -292,7 +292,7 @@ int mv_engine_config_set_int_attribute_c( /** * @brief Sets the boolean attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -316,7 +316,7 @@ int mv_engine_config_set_bool_attribute_c( /** * @brief Sets the string attribute to the configuration. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration for which @a value has * to be set * @param [in] name String key of the attribute will be used for @@ -340,7 +340,7 @@ int mv_engine_config_set_string_attribute_c( /** * @brief Gets the double attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration from which @a value * has to be gotten * @param [in] name String key of the attribute will be used for @@ -366,7 +366,7 @@ int mv_engine_config_get_double_attribute_c( /** * @brief Gets the integer attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration from which @a value * has to be gotten * @param [in] name String key of the attribute will be used for @@ -392,7 +392,7 @@ int mv_engine_config_get_int_attribute_c( /** * @brief Gets the boolean attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @param [in] engine_cfg Engine configuration from which @a value * has to be gotten * @param [in] name String key of the attribute will be used for @@ -418,7 +418,7 @@ int mv_engine_config_get_bool_attribute_c( /** * @brief Gets the string attribute from the configuration dictionary. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks Function allocates memory required for output @a value, so * it has to be removed by the user himself. * @param [in] engine_cfg Engine configuration from which @a value @@ -449,7 +449,7 @@ int mv_engine_config_get_string_attribute_c( * Names of the attributes can be used with @ref mv_engine_config_h * related getters and setters to get/set appropriate attribute values. * - * @since_tizen 2.4 + * @since_tizen @if MOBILE 2.4 @else 3.0 @endif * @remarks If @a callback is called zero times after * @ref mv_engine_config_foreach_supported_attribute() call, then * engine configuration is not supported and setting of attributes will diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 0695c26..ba1a363 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,6 +1,6 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.3.9 +Version: 0.3.10 Release: 0 Group: Multimedia/Framework License: Apache-2.0 and BSD-2.0 -- 2.7.4