From 45f262118125fbade14623e122c136f0ddf50727 Mon Sep 17 00:00:00 2001 From: Hyunwoo Kim Date: Thu, 23 Aug 2012 17:01:42 +0900 Subject: Update libface-engine Change-Id: Ie7f9622a5487367712f9acbde4c8024252070f50 --- packaging/capi-uix-face.spec | 2 +- src/face.c | 11 +++++++---- src/face_image.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packaging/capi-uix-face.spec b/packaging/capi-uix-face.spec index 88af548..211498c 100755 --- a/packaging/capi-uix-face.spec +++ b/packaging/capi-uix-face.spec @@ -1,6 +1,6 @@ Name: capi-uix-face Summary: Face detector & recognizer C-API v1.0 -Version: 0.1.28 +Version: 0.1.30 Release: 1 Group: misc License: Apache diff --git a/src/face.c b/src/face.c index 62454a9..883c317 100755 --- a/src/face.c +++ b/src/face.c @@ -273,7 +273,6 @@ static void _copy_feature_face_to_face_engine(const face_feature_h src, face_eng // Extern APIs EXPORT_API int face_create(__inout face_h *face) { - if ( face == NULL ) { LOG_ERROR("[%s] Outparam is NULL", _face_convert_error(FACE_ERROR_INVALID_PARAMTER)); @@ -315,6 +314,8 @@ EXPORT_API int face_create(__inout face_h *face) EXPORT_API int face_destroy(__in face_h face) { + LOG_INFO("face destroy. handle=0x%08x", face); + if ( _validate_face_h(face) == false ) { LOG_ERROR("[%s] Invalid face handle", _face_convert_error(FACE_ERROR_INVALID_PARAMTER)); @@ -377,11 +378,11 @@ EXPORT_API int face_detect_faces( __in face_h face, if ( image_type == FACE_IMAGE_TYPE_SINGLE ) { - ferr = face_engine_detect_faces(face->fengine, FACE_ENGINE_IMAGE_TYPE_SINGLE, &img , &frect, &nCount); + ferr = face_engine_detect_faces(face->fengine, FACE_ENGINE_IMAGE_TYPE_SINGLE, &img , &frect, NULL, &nCount); } else if ( image_type == FACE_IMAGE_TYPE_CONTINIOUS ) { - ferr = face_engine_detect_faces(face->fengine, FACE_ENGINE_IMAGE_TYPE_CONTINIOUS, &img , &frect, &nCount); + ferr = face_engine_detect_faces(face->fengine, FACE_ENGINE_IMAGE_TYPE_CONTINIOUS, &img , &frect, NULL, &nCount); } else { @@ -394,6 +395,8 @@ EXPORT_API int face_detect_faces( __in face_h face, *count = 0; *face_rect = NULL; + LOG_INFO("No face is founded"); + return FACE_ERROR_NONE; } @@ -822,7 +825,7 @@ EXPORT_API int face_compare_feature(__in const face_feature_h A, __in const face int nSimilarity; - ferr = face_engine_compare_face_feature(&ffA, &ffB, &nSimilarity); + ferr = face_engine_compare_face_feature(NULL, &ffA, &ffB, &nSimilarity); if ( ferr != FACE_ENGINE_ERROR_NONE ) { diff --git a/src/face_image.c b/src/face_image.c index bd7e20d..6c67be7 100755 --- a/src/face_image.c +++ b/src/face_image.c @@ -93,7 +93,7 @@ EXPORT_API int face_image_create(__in face_image_colorspace_e colorspace, __in u if ( buffer == NULL ) { - LOG_ERROR("Invalid image data. %s", _face_convert_error(FACE_ERROR_INVALID_PARAMTER)); + LOG_ERROR("Buffer Cannot be NULL. %s", _face_convert_error(FACE_ERROR_INVALID_PARAMTER)); return FACE_ERROR_INVALID_PARAMTER; } -- cgit v1.2.3