From 132251d72325e1005ef6c47f83d6a4e9b9355d12 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 03 Jun 2018 21:37:08 +0000
Subject: [PATCH] You can do: fuse_conv_batchnorm(network net) from DLL/SO-library

---
 src/utils.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/utils.c b/src/utils.c
index fe89eb0..f1cc21a 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -175,6 +175,7 @@
     sprintf(buffer, "%s", str);
     if(!(p = strstr(buffer, orig))){  // Is 'orig' even in 'str'?
         sprintf(output, "%s", str);
+		free(buffer);
         return;
     }
 
@@ -194,6 +195,7 @@
 	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;
 	}
 
@@ -206,13 +208,16 @@
 void replace_image_to_label(char *input_path, char *output_path) {
 	//find_replace(input_path, "images", "labels", output_path);	// COCO
 	find_replace(input_path, "images/train2014/", "labels/train2014/", output_path);	// COCO
-	find_replace(input_path, "images/val2014/", "labels/val2014/", 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
+
+	//find_replace(output_path, "/raw/", "/labels/", output_path);
+
 	// replace only ext of files
 	find_replace_extension(output_path, ".jpg", ".txt", output_path);
-	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);
@@ -285,7 +290,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