remove warnings

Change-Id: Ib444593a0bf641bb4b0f2a3bd86fb7ea4041c304
Signed-off-by: sangho park <sangho.g.park@samsung.com>

diff --git a/test/testsuites/image/image_test_suite.c b/test/testsuites/image/image_test_suite.c
index f1fb4fe..f9c89c4 100644 (file)
--- a/test/testsuites/image/image_test_suite.c
+++ b/test/testsuites/image/image_test_suite.c
@@ -28,8 +28,6 @@
 #include <pthread.h>
 
 #define FILE_PATH_SIZE 1024
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
 
 typedef enum {
        SOURCE_TYPE_GENERATION,
@@ -178,6 +176,10 @@ void testing_object_destroy(testing_object_h *target)
                }
                break;
        }
+       case OBJECT_TYPE_INVALID :
+               printf("\nERROR: Errors were occurred during image tracking "
+                                       "model destroying; OBJECT_TYPE_INVALID\n");
+               break;
        }
        free(*target);
        (*target) = NULL;
@@ -239,12 +241,12 @@ void handle_recognition_result(
                const recognition_result *result,
                int number_of_objects,
                mv_source_h *source,
-               char *file_name)
+               const char *file_name)
 {
        int is_source_data_loaded = 0;
 
        unsigned char *out_buffer = NULL;
-       int buffer_size = 0;
+       unsigned int buffer_size = 0;
        image_data_s image_data = { 0, 0, MEDIA_VISION_COLORSPACE_INVALID };
 
        if (MEDIA_VISION_ERROR_NONE != mv_source_get_buffer(source, &(out_buffer), &buffer_size) ||
@@ -825,7 +827,7 @@ int handle_tracking_video_result(
                        return err;
                }
        } else {
-               usleep(33000);
+               g_usleep(33000);
                printf("Frame #%i: object isn't found.\n", frame_number);
        }
 
@@ -917,7 +919,7 @@ int handle_tracking_image_result(
                        return err;
                }
        } else {
-               usleep(330000);
+               g_usleep(330000);
                printf("Frame #%i: object isn't found.\n", frame_number);
        }
 
@@ -1006,7 +1008,7 @@ void new_frame_cb(
 
        err = mv_source_fill_by_buffer(
                        frame,
-                       buffer,
+                       (unsigned char*)buffer,
                        buffer_size,
                        image_data.image_width,
                        image_data.image_height,
@@ -1034,7 +1036,7 @@ void new_frame_cb(
 
        release_resources()
 
-#undef release_resources()
+#undef release_resources
 }
 
 void eos_frame_cb(
@@ -1204,7 +1206,7 @@ int perform_track_video(mv_image_tracking_model_h target)
        pthread_mutex_destroy(&block_during_tracking_mutex);
        release_resources();
 
-#undef release_resources()
+#undef release_resources
 
        printf("\nTracking process is finished\n");
 
@@ -1243,10 +1245,8 @@ int perform_track_image(mv_image_tracking_model_h target)
        int frame_idx;
        int err = MEDIA_VISION_ERROR_NONE;
        int frames_counter = 0;
-       char (*frames)[FILE_PATH_SIZE] = (char **)malloc(0);
+       char (*frames)[FILE_PATH_SIZE] = malloc(0);
 
-       int ret = 0;
-       struct dirent ent;
        struct dirent *ent_eof;
        DIR *dir = opendir(path_to_image);
 
@@ -1257,17 +1257,17 @@ int perform_track_image(mv_image_tracking_model_h target)
                return MEDIA_VISION_ERROR_INVALID_PATH;
        }
 
-       while ((ret = readdir_r(dir, &ent, &ent_eof)) == 0 && ent_eof != NULL) {
-               if (ent.d_name[0] == '.' || strlen(ent.d_name) < 4)
+       while ((ent_eof = readdir(dir))) {
+               if (ent_eof->d_name[0] == '.' || strlen(ent_eof->d_name) < 4)
                        continue;
 
-               if (strcmp(".jpg", ent.d_name + strlen(ent.d_name) -4) != 0)
+               if (strcmp(".jpg", ent_eof->d_name + strlen(ent_eof->d_name) -4) != 0)
                        continue;
 
                frames_counter++;
-               frames = (char**)realloc(frames, frames_counter * FILE_PATH_SIZE);
+               frames = realloc(frames, frames_counter * FILE_PATH_SIZE);
 
-               snprintf(frames[frames_counter -1], FILE_PATH_SIZE, "%s/%s", path_to_image, ent.d_name);
+               snprintf(frames[frames_counter -1], FILE_PATH_SIZE, "%s/%s", path_to_image, ent_eof->d_name);
        }
        closedir(dir);