From a779491cd7b6dbe5f5c3ea153afbaaf4723129e9 Mon Sep 17 00:00:00 2001 From: "Haejeong, Kim" Date: Tue, 13 Oct 2015 19:06:07 +0900 Subject: [PATCH] Apply tizen coding rule Change-Id: I3019d23be9940531a0dc6c1c387256bb1d0cb1b9 --- libdcm-face/dcm-face.c | 45 +++++++++++++++--------------- libdcm-face/dcm-face_mediavision.c | 44 ++++++++++++++--------------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/libdcm-face/dcm-face.c b/libdcm-face/dcm-face.c index 5533958..3f117e2 100755 --- a/libdcm-face/dcm-face.c +++ b/libdcm-face/dcm-face.c @@ -21,20 +21,20 @@ #include "dcm-face_priv.h" -#define FACE_MAGIC_VALID (0xFF993311) -#define FACE_MAGIC_INVALID (0x393A3B3C) +#define FACE_MAGIC_VALID (0xFF993311) +#define FACE_MAGIC_INVALID (0x393A3B3C) EXPORT_API int dcm_face_create(__inout dcm_face_h *handle) { int ret = FACE_ERROR_NONE; - dcm_retvm_if (handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); + dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); FaceHandleT *pFaceHandle = (FaceHandleT *)calloc(1, sizeof(FaceHandleT)); - dcm_retvm_if (pFaceHandle == NULL, FACE_ERROR_OUT_OF_MEMORY, "malloc fail"); + dcm_retvm_if(pFaceHandle == NULL, FACE_ERROR_OUT_OF_MEMORY, "malloc fail"); ret = _face_handle_create(&(pFaceHandle->fengine)); - dcm_retvm_if (ret != FACE_ERROR_NONE, ret, "fail to _face_handle_create"); + dcm_retvm_if(ret != FACE_ERROR_NONE, ret, "fail to _face_handle_create"); pFaceHandle->magic = FACE_MAGIC_VALID; @@ -50,7 +50,7 @@ EXPORT_API int dcm_face_destroy(__in dcm_face_h handle) int ret = FACE_ERROR_NONE; dcm_info("face destroy. handle=0x%08x", handle); - dcm_retvm_if (handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); + dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); ret = _face_handle_destroy(handle->fengine); if (ret != FACE_ERROR_NONE) { @@ -70,8 +70,8 @@ EXPORT_API int dcm_face_destroy(__in dcm_face_h handle) EXPORT_API int dcm_face_get_prefered_colorspace(__in dcm_face_h handle, __out face_image_colorspace_e *colorspace) { - dcm_retvm_if (handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); - dcm_retvm_if (colorspace == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid colorspace"); + dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); + dcm_retvm_if(colorspace == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid colorspace"); *colorspace = FACE_IMAGE_COLORSPACE_RGB888; @@ -85,18 +85,18 @@ EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_ dcm_debug_fenter(); - dcm_retvm_if (handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); - dcm_retvm_if (buffer == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid buffer"); + dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); + dcm_retvm_if(buffer == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid buffer"); switch (colorspace) { - case FACE_IMAGE_COLORSPACE_YUV420: - case FACE_IMAGE_COLORSPACE_RGB888: - data = (unsigned char *)calloc(1, size); - memcpy(data, buffer, size); - break; - default: - dcm_error("Invalid colorspace : [%d]", colorspace); - return FACE_ERROR_INVALID_PARAMTER; + case FACE_IMAGE_COLORSPACE_YUV420: + case FACE_IMAGE_COLORSPACE_RGB888: + data = (unsigned char *)calloc(1, size); + memcpy(data, buffer, size); + break; + default: + dcm_error("Invalid colorspace : [%d]", colorspace); + return FACE_ERROR_INVALID_PARAMTER; } if (_handle->image_info != NULL) @@ -129,13 +129,12 @@ EXPORT_API int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s dcm_debug_fenter(); - dcm_retvm_if (handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); - dcm_retvm_if (face_info == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid face_info"); + dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle"); + dcm_retvm_if(face_info == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid face_info"); ret = _face_detect_faces(handle, &(face_info->rects), &(face_info->count)); - if (ret != FACE_ERROR_NONE) { + if (ret != FACE_ERROR_NONE) dcm_error("fail to _face_detect_faces"); - } dcm_debug_fleave(); @@ -144,7 +143,7 @@ EXPORT_API int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s EXPORT_API int dcm_face_destroy_face_info(face_info_s *face_info) { - dcm_retvm_if (face_info == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid face_info"); + dcm_retvm_if(face_info == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid face_info"); DCM_SAFE_FREE(face_info->rects); DCM_SAFE_FREE(face_info); diff --git a/libdcm-face/dcm-face_mediavision.c b/libdcm-face/dcm-face_mediavision.c index 60a16d2..c1f42f4 100755 --- a/libdcm-face/dcm-face_mediavision.c +++ b/libdcm-face/dcm-face_mediavision.c @@ -40,23 +40,23 @@ static face_error_e __convert_to_mv_error_e(mv_error_e err) dcm_error("Error from media vision : %d", err); switch (err) { - case MEDIA_VISION_ERROR_NONE: - return FACE_ERROR_NONE; + case MEDIA_VISION_ERROR_NONE: + return FACE_ERROR_NONE; - case MEDIA_VISION_ERROR_NOT_SUPPORTED: - return FACE_ERROR_INVALID_PARAMTER; + case MEDIA_VISION_ERROR_NOT_SUPPORTED: + return FACE_ERROR_INVALID_PARAMTER; - case MEDIA_VISION_ERROR_INVALID_PARAMETER: - return FACE_ERROR_INVALID_PARAMTER; + case MEDIA_VISION_ERROR_INVALID_PARAMETER: + return FACE_ERROR_INVALID_PARAMTER; - case MEDIA_VISION_ERROR_NOT_SUPPORTED_FORMAT: - return FACE_ERROR_INVALID_PARAMTER; + case MEDIA_VISION_ERROR_NOT_SUPPORTED_FORMAT: + return FACE_ERROR_INVALID_PARAMTER; - case MEDIA_VISION_ERROR_OUT_OF_MEMORY: - return FACE_ERROR_OUT_OF_MEMORY; + case MEDIA_VISION_ERROR_OUT_OF_MEMORY: + return FACE_ERROR_OUT_OF_MEMORY; - default: - break; + default: + break; } return FACE_ERROR_OPERATION_FAILED; @@ -65,16 +65,16 @@ static face_error_e __convert_to_mv_error_e(mv_error_e err) static int __convert_to_mv_colorspace_e(face_image_colorspace_e src, mv_colorspace_e *dst) { switch (src) { - case FACE_IMAGE_COLORSPACE_YUV420: - *dst = MEDIA_VISION_COLORSPACE_I420; - return FACE_ERROR_NONE; - case FACE_IMAGE_COLORSPACE_RGB888: - *dst = MEDIA_VISION_COLORSPACE_RGB888; - return FACE_ERROR_NONE; - default: - *dst = MEDIA_VISION_COLORSPACE_INVALID; - dcm_error("Unknown colorspace : %d", src); - break; + case FACE_IMAGE_COLORSPACE_YUV420: + *dst = MEDIA_VISION_COLORSPACE_I420; + return FACE_ERROR_NONE; + case FACE_IMAGE_COLORSPACE_RGB888: + *dst = MEDIA_VISION_COLORSPACE_RGB888; + return FACE_ERROR_NONE; + default: + *dst = MEDIA_VISION_COLORSPACE_INVALID; + dcm_error("Unknown colorspace : %d", src); + break; } return FACE_ERROR_INVALID_PARAMTER; -- 2.34.1