From 026a679dedbc45486a11ecabf56c898372d8cac5 Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Thu, 21 Jun 2018 19:23:30 +0300 Subject: [PATCH] Minor fix: darknet.py for OpenCV --- build/darknet/x64/darknet.py | 2 ++ darknet.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build/darknet/x64/darknet.py b/build/darknet/x64/darknet.py index a8e1d12f..4bca5f5a 100644 --- a/build/darknet/x64/darknet.py +++ b/build/darknet/x64/darknet.py @@ -226,6 +226,7 @@ def detect(net, meta, image, thresh=.5, hier_thresh=.5, nms=.45, debug= False): #import cv2 #custom_image_bgr = cv2.imread(image) # use: detect(,,imagePath,) #custom_image = cv2.cvtColor(custom_image_bgr, cv2.COLOR_BGR2RGB) + #custom_image = cv2.resize(custom_image,(lib.network_width(net), lib.network_height(net)), interpolation = cv2.INTER_LINEAR) #import scipy.misc #custom_image = scipy.misc.imread(image) #im, arr = array_to_image(custom_image) # you should comment line below: free_image(im) @@ -236,6 +237,7 @@ def detect(net, meta, image, thresh=.5, hier_thresh=.5, nms=.45, debug= False): if debug: print("Assigned pnum") predict_image(net, im) if debug: print("did prediction") + #dets = get_network_boxes(net, custom_image_bgr.shape[1], custom_image_bgr.shape[0], thresh, hier_thresh, None, 0, pnum, 0) # OpenCV dets = get_network_boxes(net, im.w, im.h, thresh, hier_thresh, None, 0, pnum, 0) if debug: print("Got dets") num = pnum[0] diff --git a/darknet.py b/darknet.py index a8e1d12f..4bca5f5a 100644 --- a/darknet.py +++ b/darknet.py @@ -226,6 +226,7 @@ def detect(net, meta, image, thresh=.5, hier_thresh=.5, nms=.45, debug= False): #import cv2 #custom_image_bgr = cv2.imread(image) # use: detect(,,imagePath,) #custom_image = cv2.cvtColor(custom_image_bgr, cv2.COLOR_BGR2RGB) + #custom_image = cv2.resize(custom_image,(lib.network_width(net), lib.network_height(net)), interpolation = cv2.INTER_LINEAR) #import scipy.misc #custom_image = scipy.misc.imread(image) #im, arr = array_to_image(custom_image) # you should comment line below: free_image(im) @@ -236,6 +237,7 @@ def detect(net, meta, image, thresh=.5, hier_thresh=.5, nms=.45, debug= False): if debug: print("Assigned pnum") predict_image(net, im) if debug: print("did prediction") + #dets = get_network_boxes(net, custom_image_bgr.shape[1], custom_image_bgr.shape[0], thresh, hier_thresh, None, 0, pnum, 0) # OpenCV dets = get_network_boxes(net, im.w, im.h, thresh, hier_thresh, None, 0, pnum, 0) if debug: print("Got dets") num = pnum[0]