From 5a7e4df7470c3b54f00d118540251101ada28486 Mon Sep 17 00:00:00 2001 From: hj kim Date: Thu, 16 Nov 2017 11:09:20 +0900 Subject: [PATCH] Just change input paramter Change-Id: I12773f36c07b5eab2f6ca6fc93bb85cffe23eca7 --- src/dcm_svc_detect_face.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/dcm_svc_detect_face.c b/src/dcm_svc_detect_face.c index b6b1091..303461e 100755 --- a/src/dcm_svc_detect_face.c +++ b/src/dcm_svc_detect_face.c @@ -24,25 +24,23 @@ static dcm_face_h dcm_face_handle = NULL; -static double __calculate_scale_factor(dcm_image_info_s *image_info) +static double __calculate_scale_factor(unsigned int original_width, unsigned int original_height, unsigned int buffer_width, unsigned int buffer_height) { double scale_factor = 0.0; - DCM_CHECK_VAL(image_info, 0.0); - - if (image_info->original_width >= image_info->original_height) { - if (image_info->buffer_width >= image_info->buffer_height) - scale_factor = ((double) (image_info->original_width)) / ((double) (image_info->buffer_width)); + if (original_width >= original_height) { + if (buffer_width >= buffer_height) + scale_factor = ((double) (original_width)) / ((double) (buffer_width)); else - scale_factor = ((double) (image_info->original_width)) / ((double) (image_info->buffer_height)); + scale_factor = ((double) (original_width)) / ((double) (buffer_height)); } else { - if (image_info->buffer_height >= image_info->buffer_width) - scale_factor = ((double) (image_info->original_height)) / ((double) (image_info->buffer_height)); + if (buffer_height >= buffer_width) + scale_factor = ((double) (original_height)) / ((double) (buffer_height)); else - scale_factor = ((double) (image_info->original_height)) / ((double) (image_info->buffer_width)); + scale_factor = ((double) (original_height)) / ((double) (buffer_width)); } - dcm_debug("scale_factor: %lf", scale_factor); + dcm_debug("scale_factor: [%lf]", scale_factor); return scale_factor; } @@ -128,7 +126,7 @@ int dcm_face_detect_process(dcm_svc_item_s *scan_item, dcm_face_scan_status_e sc scan_item->face_count = face_info->count; /* Compute scale factor between decode size and original size */ - scale_factor = __calculate_scale_factor(image_info); + scale_factor = __calculate_scale_factor(image_info->original_width, image_info->original_height, image_info->buffer_width, image_info->buffer_height); /* Insert every face rectangle into database */ for (i = 0; i < face_info->count; i++) { -- 2.34.1