From aeb15b3cb9157f5d0b2a9962e17de22560b8a1b2 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 07 Jan 2018 22:47:50 +0000
Subject: [PATCH] Detection and Tracking work well
---
src/utils.c | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index b0ef0fc..db6e0c6 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -3,14 +3,14 @@
#include <string.h>
#include <math.h>
#include <assert.h>
-#include "unistd.h"
#include <float.h>
#include <limits.h>
#ifdef WIN32
-#include "utils.h"
+#include "unistd.h"
#else
-#include <utils.h>
+#include <unistd.h>
#endif
+#include "utils.h"
#pragma warning(disable: 4996)
@@ -126,6 +126,7 @@
{
c = next+1;
}
+ if(!next) while ((next = strchr(c, '\\'))) { c = next + 1; }
c = copy_string(c);
next = strchr(c, '.');
if (next) *next = 0;
@@ -285,6 +286,7 @@
fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
+ if(line[curr-2] == '\r') line[curr-2] = '\0';
if(line[curr-1] == '\n') line[curr-1] = '\0';
return line;
@@ -607,12 +609,13 @@
max = swap;
}
return ((float)rand()/RAND_MAX * (max - min)) + min;
+ //return (random_float() * (max - min)) + min;
}
float rand_scale(float s)
{
- float scale = rand_uniform(1, s);
- if(rand()%2) return scale;
+ float scale = rand_uniform_strong(1, s);
+ if(random_gen()%2) return scale;
return 1./scale;
}
@@ -628,3 +631,32 @@
return t;
}
+unsigned int random_gen()
+{
+ unsigned int rnd = 0;
+#ifdef WIN32
+ rand_s(&rnd);
+#else
+ rnd = rand();
+#endif
+ return rnd;
+}
+
+float random_float()
+{
+#ifdef WIN32
+ return ((float)random_gen() / (float)UINT_MAX);
+#else
+ return ((float)random_gen() / (float)RAND_MAX);
+#endif
+}
+
+float rand_uniform_strong(float min, float max)
+{
+ if (max < min) {
+ float swap = min;
+ min = max;
+ max = swap;
+ }
+ return (random_float() * (max - min)) + min;
+}
\ No newline at end of file
--
Gitblit v1.10.0