From 56bff1dc8cbafd718b5733f22bdb63ab4767703b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 19 Jun 2018 22:06:39 +0000
Subject: [PATCH] Fixed darknet.py when OpenCV is used (added BGR to RGB conversion)
---
build/darknet/x64/darknet.py | 4 +++-
darknet.py | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build/darknet/x64/darknet.py b/build/darknet/x64/darknet.py
index dff0a31..a8e1d12 100644
--- a/build/darknet/x64/darknet.py
+++ b/build/darknet/x64/darknet.py
@@ -224,7 +224,8 @@
#pylint: disable= C0321
im = load_image(image, 0, 0)
#import cv2
- #custom_image = cv2.imread(image) # use: detect(,,imagePath,)
+ #custom_image_bgr = cv2.imread(image) # use: detect(,,imagePath,)
+ #custom_image = cv2.cvtColor(custom_image_bgr, cv2.COLOR_BGR2RGB)
#import scipy.misc
#custom_image = scipy.misc.imread(image)
#im, arr = array_to_image(custom_image) # you should comment line below: free_image(im)
@@ -362,6 +363,7 @@
if not os.path.exists(imagePath):
raise ValueError("Invalid image path `"+os.path.abspath(imagePath)+"`")
# Do the detection
+ #detections = detect(netMain, metaMain, imagePath, thresh) # if is used cv2.imread(image)
detections = detect(netMain, metaMain, imagePath.encode("ascii"), thresh)
if showImage:
try:
diff --git a/darknet.py b/darknet.py
index dff0a31..a8e1d12 100644
--- a/darknet.py
+++ b/darknet.py
@@ -224,7 +224,8 @@
#pylint: disable= C0321
im = load_image(image, 0, 0)
#import cv2
- #custom_image = cv2.imread(image) # use: detect(,,imagePath,)
+ #custom_image_bgr = cv2.imread(image) # use: detect(,,imagePath,)
+ #custom_image = cv2.cvtColor(custom_image_bgr, cv2.COLOR_BGR2RGB)
#import scipy.misc
#custom_image = scipy.misc.imread(image)
#im, arr = array_to_image(custom_image) # you should comment line below: free_image(im)
@@ -362,6 +363,7 @@
if not os.path.exists(imagePath):
raise ValueError("Invalid image path `"+os.path.abspath(imagePath)+"`")
# Do the detection
+ #detections = detect(netMain, metaMain, imagePath, thresh) # if is used cv2.imread(image)
detections = detect(netMain, metaMain, imagePath.encode("ascii"), thresh)
if showImage:
try:
--
Gitblit v1.10.0