From cd8a3dcb4ca42f22ad8f46a95e00977c92be6bbd Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 08 Feb 2018 23:22:42 +0000
Subject: [PATCH] Compile fixes
---
src/utils.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index b5181d7..d6bdbf6 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -3,12 +3,17 @@
#include <string.h>
#include <math.h>
#include <assert.h>
-#include <unistd.h>
#include <float.h>
#include <limits.h>
-
+#ifdef WIN32
+#include "unistd.h"
+#else
+#include <unistd.h>
+#endif
#include "utils.h"
+#pragma warning(disable: 4996)
+
int *read_map(char *filename)
{
int n = 0;
@@ -31,7 +36,7 @@
size_t start = n*i/sections;
size_t end = n*(i+1)/sections;
size_t num = end-start;
- shuffle(arr+(start*size), num, size);
+ shuffle((char*)arr+(start*size), num, size);
}
}
@@ -41,9 +46,9 @@
void *swp = calloc(1, size);
for(i = 0; i < n-1; ++i){
size_t j = i + rand()/(RAND_MAX / (n-i)+1);
- memcpy(swp, arr+(j*size), size);
- memcpy(arr+(j*size), arr+(i*size), size);
- memcpy(arr+(i*size), swp, size);
+ memcpy(swp, (char*)arr+(j*size), size);
+ memcpy((char*)arr+(j*size), (char*)arr+(i*size), size);
+ memcpy((char*)arr+(i*size), swp, size);
}
}
@@ -121,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;
@@ -228,7 +234,7 @@
size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
- if(c==' '||c=='\t'||c=='\n') ++offset;
+ if(c==' '||c=='\t'||c=='\n'||c =='\r') ++offset;
else s[i-offset] = c;
}
s[len-offset] = '\0';
@@ -280,7 +286,8 @@
fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- if(line[curr-1] == '\n') line[curr-1] = '\0';
+ if(line[curr-2] == 0x0d) line[curr-2] = 0x00;
+ if(line[curr-1] == 0x0a) line[curr-1] = 0x00;
return line;
}
@@ -602,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;
}
@@ -623,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