From 54f83e153549dd1a63bcc8fa5e55fb171621a989 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 17 Jan 2018 18:05:07 +0000
Subject: [PATCH] Some fixes
---
src/classifier.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/classifier.c b/src/classifier.c
index fbfe5e7..37f02d5 100644
--- a/src/classifier.c
+++ b/src/classifier.c
@@ -6,13 +6,20 @@
#include "assert.h"
#include "classifier.h"
#include "cuda.h"
-//#include <sys/time.h>
+#ifdef WIN32
#include <time.h>
#include <winsock.h>
#include "gettimeofday.h"
+#else
+#include <sys/time.h>
+#endif
#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/core/version.hpp"
+#ifndef CV_VERSION_EPOCH
+#include "opencv2/videoio/videoio_c.h"
+#endif
image get_image_from_stream(CvCapture *cap);
#endif
@@ -699,8 +706,9 @@
strtok(input, "\n");
}
image im = load_image_color(input, 0, 0);
- image r = resize_min(im, size);
- resize_network(&net, r.w, r.h);
+ image r = letterbox_image(im, net.w, net.h);
+ //image r = resize_min(im, size);
+ //resize_network(&net, r.w, r.h);
printf("%d %d\n", r.w, r.h);
float *X = r.data;
--
Gitblit v1.10.0