From 573d7e80814a4cc3c08897f6c0f67ea189339856 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 16 May 2018 00:03:23 +0000
Subject: [PATCH] Added def array_to_image(arr): to the darknet.py Usage: import scipy.misc sci_image = scipy.misc.imread(image) im, arr = array_to_image(sci_image)
---
src/utils.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 615d836..8b1dcf5 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -208,19 +208,19 @@
{
perror(s);
assert(0);
- exit(-1);
+ exit(EXIT_FAILURE);
}
void malloc_error()
{
fprintf(stderr, "Malloc error\n");
- exit(-1);
+ exit(EXIT_FAILURE);
}
void file_error(char *s)
{
fprintf(stderr, "Couldn't open file: %s\n", s);
- exit(0);
+ exit(EXIT_FAILURE);
}
list *split_str(char *s, char delim)
@@ -297,8 +297,11 @@
fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- if(line[curr-2] == 0x0d) line[curr-2] = 0x00;
- if(line[curr-1] == 0x0a) line[curr-1] = 0x00;
+ if(curr >= 2)
+ if(line[curr-2] == 0x0d) line[curr-2] = 0x00;
+
+ if(curr >= 1)
+ if(line[curr-1] == 0x0a) line[curr-1] = 0x00;
return line;
}
--
Gitblit v1.10.0