Just change input paramter 81/160381/1
authorhj kim <backto.kim@samsung.com>
Thu, 16 Nov 2017 02:09:20 +0000 (11:09 +0900)
committerhj kim <backto.kim@samsung.com>
Thu, 16 Nov 2017 02:09:20 +0000 (11:09 +0900)
Change-Id: I12773f36c07b5eab2f6ca6fc93bb85cffe23eca7

src/dcm_svc_detect_face.c

index b6b10912c295afd11648fe2f917c152d176268db..303461e6f357821d7c8f98a75347c53cb454158b 100755 (executable)
 
 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++) {