mirror of
https://github.com/pjreddie/darknet.git
synced 2023-08-10 21:13:14 +03:00
Sources fixed - Yolo v2 can be used on Windows (MSVS 2015 + CUDA 8.0)
This commit is contained in:
14
src/utils.c
14
src/utils.c
@ -3,12 +3,14 @@
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
#include "unistd.h"
|
||||
#include <float.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "utils.h"
|
||||
|
||||
#pragma warning(disable: 4996)
|
||||
|
||||
int *read_map(char *filename)
|
||||
{
|
||||
int n = 0;
|
||||
@ -31,7 +33,7 @@ void sorta_shuffle(void *arr, size_t n, size_t size, size_t sections)
|
||||
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 +43,9 @@ void shuffle(void *arr, size_t n, size_t size)
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -228,7 +230,7 @@ void strip(char *s)
|
||||
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';
|
||||
|
Reference in New Issue
Block a user