Merge pull request peterbraden#289 from mvines/master

peterbraden · peterbraden · commit e8eaef2e1fc2 · 2015-08-31T12:25:26.000+02:00
Only run equalizeHist() if an BGR matrix was provided
diff --git a/src/CascadeClassifierWrap.cc b/src/CascadeClassifierWrap.cc
@@ -61,10 +61,10 @@ class AsyncDetectMultiScale : public NanAsyncWorker {
 
       if(this->im->mat.channels() != 1) {
         cvtColor(this->im->mat, gray, CV_BGR2GRAY);
+        equalizeHist( gray, gray);
       } else {
         gray = this->im->mat;
       }
-      equalizeHist( gray, gray);
       this->cc->cc.detectMultiScale(gray, objects, this->scale, this->neighbors, 0 | CV_HAAR_SCALE_IMAGE, cv::Size(this->minw, this->minh));
       res = objects;
     }

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,10 @@ class AsyncDetectMultiScale : public NanAsyncWorker {`
`61`	`61`
`62`	`62`	`if(this->im->mat.channels() != 1) {`
`63`	`63`	`cvtColor(this->im->mat, gray, CV_BGR2GRAY);`
	`64`	`+ equalizeHist( gray, gray);`
`64`	`65`	`} else {`
`65`	`66`	`gray = this->im->mat;`
`66`	`67`	`}`
`67`		`- equalizeHist( gray, gray);`
`68`	`68`	`this->cc->cc.detectMultiScale(gray, objects, this->scale, this->neighbors, 0 \| CV_HAAR_SCALE_IMAGE, cv::Size(this->minw, this->minh));`
`69`	`69`	`res = objects;`
`70`	`70`	`}`