From 721d5e410e5a2b47ec2de722cc02fd6b9ed6b2fd Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sun, 16 Sep 2018 03:19:06 +0000
Subject: [PATCH] reverting merge

---
 src/utils.c |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/utils.c b/src/utils.c
index d20c633..14d647b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -185,6 +185,24 @@
     free(buffer);
 }
 
+void trim(char *str)
+{
+    char *buffer = calloc(8192, sizeof(char));
+    sprintf(buffer, "%s", str);
+
+    char *p = buffer;
+    while (*p == ' ' || *p == '\t') ++p;
+
+    char *end = p + strlen(p) - 1;
+    while (*end == ' ' || *end == '\t') {
+        *end = '\0';
+        --end;
+    }
+    sprintf(str, "%s", p);
+
+    free(buffer);
+}
+
 void find_replace_extension(char *str, char *orig, char *rep, char *output)
 {
     char *buffer = calloc(8192, sizeof(char));
@@ -200,23 +218,24 @@
     }
 
     *p = '\0';
-
     sprintf(output, "%s%s%s", buffer, rep, p + strlen(orig));
     free(buffer);
 }
 
-void replace_image_to_label(char *input_path, char *output_path) {
-    //find_replace(input_path, "/images/", "/labels/", output_path);    // COCO
+void replace_image_to_label(char *input_path, char *output_path)
+{
     find_replace(input_path, "/images/train2014/", "/labels/train2014/", output_path);    // COCO
     find_replace(output_path, "/images/val2014/", "/labels/val2014/", output_path);        // COCO
     find_replace(output_path, "/JPEGImages/", "/labels/", output_path);    // PascalVOC
-    find_replace(input_path, "\\images\\train2014\\", "\\labels\\train2014\\", output_path);    // COCO
+    find_replace(output_path, "\\images\\train2014\\", "\\labels\\train2014\\", output_path);    // COCO
     find_replace(output_path, "\\images\\val2014\\", "\\labels\\val2014\\", output_path);        // COCO
     find_replace(output_path, "\\JPEGImages\\", "\\labels\\", output_path);    // PascalVOC
+    //find_replace(output_path, "/images/", "/labels/", output_path);    // COCO
     //find_replace(output_path, "/VOC2007/JPEGImages/", "/VOC2007/labels/", output_path);        // PascalVOC
     //find_replace(output_path, "/VOC2012/JPEGImages/", "/VOC2012/labels/", output_path);        // PascalVOC
 
     //find_replace(output_path, "/raw/", "/labels/", output_path);
+    trim(output_path);
 
     // replace only ext of files
     find_replace_extension(output_path, ".jpg", ".txt", output_path);

--
Gitblit v1.10.0