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 ``` diff --git a/src/MultiClassObjectDetector.cpp b/src/MultiClassObjectDetector.cpp old mode 100644 new mode 100755 index 9ceac54..044608d --- a/src/MultiClassObjectDetector.cpp +++ b/src/MultiClassObjectDetector.cpp @@ -6,9 +6,6 @@ // Copyright (c) 2016 Xun Wang. All rights reserved. // -#include -#include - #include #include #include @@ -30,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; @@ -275,7 +291,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 );