From 65e430588d76adbcf435db6b2e3aec791de651d0 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 26 May 2018 13:36:30 +0000
Subject: [PATCH] Merge pull request #909 from jing-vision/master
---
src/utils.c | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index d9d796e..7b25e9c 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -169,33 +169,60 @@
void find_replace(char *str, char *orig, char *rep, char *output)
{
- char buffer[4096] = {0};
+ char *buffer = calloc(8192, sizeof(char));
char *p;
sprintf(buffer, "%s", str);
if(!(p = strstr(buffer, orig))){ // Is 'orig' even in 'str'?
sprintf(output, "%s", str);
+ free(buffer);
return;
}
*p = '\0';
sprintf(output, "%s%s%s", buffer, rep, p+strlen(orig));
+ free(buffer);
+}
+
+void find_replace_extension(char *str, char *orig, char *rep, char *output)
+{
+ char *buffer = calloc(8192, sizeof(char));
+
+ sprintf(buffer, "%s", str);
+ char *p = strstr(buffer, orig);
+ int offset = (p - buffer);
+ int chars_from_end = strlen(buffer) - offset;
+ if (!p || chars_from_end != strlen(orig)) { // Is 'orig' even in 'str' AND is 'orig' found at the end of 'str'?
+ sprintf(output, "%s", str);
+ free(buffer);
+ return;
+ }
+
+ *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);
- find_replace(output_path, "JPEGImages", "labels", output_path);
- find_replace(output_path, ".jpg", ".txt", output_path);
- find_replace(output_path, ".JPG", ".txt", output_path);
- find_replace(output_path, ".jpeg", ".txt", output_path);
- find_replace(output_path, ".JPEG", ".txt", output_path);
- find_replace(output_path, ".png", ".txt", output_path);
- find_replace(output_path, ".PNG", ".txt", output_path);
- find_replace(output_path, ".bmp", ".txt", output_path);
- find_replace(output_path, ".BMP", ".txt", output_path);
- find_replace(output_path, ".ppm", ".txt", output_path);
- find_replace(output_path, ".PPM", ".txt", output_path);
+ //find_replace(input_path, "images", "labels", output_path); // COCO
+ 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(output_path, "VOC2007/JPEGImages", "VOC2007/labels", output_path); // PascalVOC
+ find_replace(output_path, "VOC2012/JPEGImages", "VOC2012/labels", output_path); // PascalVOC
+ // replace only ext of files
+ find_replace_extension(output_path, ".jpg", ".txt", output_path);
+ find_replace_extension(output_path, ".JPG", ".txt", output_path); // error
+ find_replace_extension(output_path, ".jpeg", ".txt", output_path);
+ find_replace_extension(output_path, ".JPEG", ".txt", output_path);
+ find_replace_extension(output_path, ".png", ".txt", output_path);
+ find_replace_extension(output_path, ".PNG", ".txt", output_path);
+ find_replace_extension(output_path, ".bmp", ".txt", output_path);
+ find_replace_extension(output_path, ".BMP", ".txt", output_path);
+ find_replace_extension(output_path, ".ppm", ".txt", output_path);
+ find_replace_extension(output_path, ".PPM", ".txt", output_path);
}
float sec(clock_t clocks)
@@ -260,7 +287,7 @@
size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
- if(c==' '||c=='\t'||c=='\n'||c =='\r') ++offset;
+ if(c==' '||c=='\t'||c=='\n'||c =='\r'||c==0x0d||c==0x0a) ++offset;
else s[i-offset] = c;
}
s[len-offset] = '\0';
--
Gitblit v1.10.0