From a670b0b2676035f0873cb70a1625b4991588d136 Mon Sep 17 00:00:00 2001 From: Jit Ray Chowdhury Date: Fri, 21 Jul 2017 16:52:02 -0800 Subject: [PATCH 1/3] darknet without OpenCV as C on openCV 3 and CUDA does not work in darkent --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee41c4c..15d87c4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Fully check out this repository with submodule ```darknet```. Compile the ```dar ``` cd darknet;mkdir build;cd build -cmake -DCMAKE_INSTALL_PREFIX= .. +cmake -DOPENCV=OFF -DCMAKE_INSTALL_PREFIX= .. make install ``` From 0af74cb61c053ea8f09cd3ba5adc87c20d7d3ca8 Mon Sep 17 00:00:00 2001 From: Jit Ray Chowdhury Date: Fri, 21 Jul 2017 16:52:25 -0800 Subject: [PATCH 2/3] auto detect version of opencv for including headers --- src/MultiClassObjectDetector.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/MultiClassObjectDetector.cpp diff --git a/src/MultiClassObjectDetector.cpp b/src/MultiClassObjectDetector.cpp old mode 100644 new mode 100755 index 9ceac54..90eaa84 --- a/src/MultiClassObjectDetector.cpp +++ b/src/MultiClassObjectDetector.cpp @@ -5,9 +5,16 @@ // Created by Xun Wang on 12/05/16. // Copyright (c) 2016 Xun Wang. All rights reserved. // +#include "opencv2/core/version.hpp" +#if CV_MAJOR_VERSION == 3 + #include + #include + #include +#else + #include + #include +#endif -#include -#include #include #include @@ -275,7 +282,7 @@ void MultiClassObjectDetector::startDetection() cv_ptr_.reset(); imgMsgPtr_.reset(); - image_transport::TransportHints hints( "compressed" ); + image_transport::TransportHints hints( "raw" ); imgSub_ = imgTrans_.subscribe( cameraDevice_, 1, &MultiClassObjectDetector::processingRawImages, this, hints ); From 1a48902c78e474249bb3cb324f36c138dfd87187 Mon Sep 17 00:00:00 2001 From: Jit Ray Chowdhury Date: Fri, 21 Jul 2017 16:53:44 -0800 Subject: [PATCH 3/3] adding ipl_to_image to make the code work without OpenCV --- src/MultiClassObjectDetector.cpp | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/MultiClassObjectDetector.cpp b/src/MultiClassObjectDetector.cpp index 90eaa84..044608d 100755 --- a/src/MultiClassObjectDetector.cpp +++ b/src/MultiClassObjectDetector.cpp @@ -5,16 +5,6 @@ // Created by Xun Wang on 12/05/16. // Copyright (c) 2016 Xun Wang. All rights reserved. // -#include "opencv2/core/version.hpp" -#if CV_MAJOR_VERSION == 3 - #include - #include - #include -#else - #include - #include -#endif - #include #include @@ -37,6 +27,25 @@ #include "dn_object_detect/DetectedObjects.h" +image ipl_to_image(IplImage* src) +{ + unsigned char *data = (unsigned char *)src->imageData; + int h = src->height; + int w = src->width; + int c = src->nChannels; + int step = src->widthStep; + image out = make_image(w, h, c); + int i, j, k, count=0;; + + for(k= 0; k < c; ++k){ + for(i = 0; i < h; ++i){ + for(j = 0; j < w; ++j){ + out.data[count++] = data[i*step + j*c + k]/255.; + } + } + } + return out; +} namespace uts_perp { using namespace std;