Merge branch 'devel'

Author: luca-nardelli

example/main.cpp

@@ -176,9 +176,11 @@ void testJoin(){
 	Mat img,imt,im2;
 	cvtColor(im,img,CV_BGR2GRAY);
 	threshold(img,imt,254,255,CV_THRESH_BINARY_INV);
+	//imt = imt(Rect(30,50,100,100));
 	imshow("binImage",imt);
 	CBlobResult res(imt,Mat(),NUMCORES);
 	im2 = im.clone();
+	//im2 = im(Rect(30,50,100,100)).clone();
 	stringstream s;
 	for(int i=0;i<res.GetNumBlobs();i++){
 		Scalar mean, stddev;

library/ComponentLabeling.cpp

@@ -452,40 +452,45 @@ myCompLabelerGroup::~myCompLabelerGroup()
 		delete [] labels;
 }
 
-void myCompLabelerGroup::set( int numThreads, Mat img )
+void myCompLabelerGroup::set( int nThreads, Mat binIm )
 {
-	this->numThreads=numThreads;
-	this->img=img;
+	this->numThreads=nThreads;
+	if(binIm.isContinuous()){
+		this->img=binIm;
+	}
+	else{
+		this->img=binIm.clone();
+	}
 	//this->labels = Mat_<int>::zeros(img.size());
 	if (labels){
 		delete [] labels;
 	}
-	int nPts = img.size().width*img.size().height;
+	int nPts = binIm.size().width*binIm.size().height;
 	labels = new CBlobContour*[nPts];
 	memset(labels,0,nPts*sizeof(CBlob*));
 
 	if(tIds)
 		delete []tIds;
 	if(labelers){
-		for(int i=0;i<numThreads;i++){
+		for(int i=0;i<nThreads;i++){
 			delete labelers[i];
 		}
 		delete []labelers;
 	}
-	tIds = new pthread_t[numThreads];
-	labelers = new myCompLabeler*[numThreads];
-	Size sz = img.size();
+	tIds = new pthread_t[nThreads];
+	labelers = new myCompLabeler*[nThreads];
+	Size sz = binIm.size();
 	int numPx = sz.width*sz.width;
 	int i=0;
-	for(i;i<numThreads-1;i++){
-		int yStart = (int)((float)i/numThreads*sz.height);
-		int yEnd = (int)((float)(i+1)/numThreads*sz.height);
+	for(i;i<nThreads-1;i++){
+		int yStart = (int)((float)i/nThreads*sz.height);
+		int yEnd = (int)((float)(i+1)/nThreads*sz.height);
 		Point st(0,yStart);
 		Point en(sz.width,yEnd);
 		labelers[i] = new myCompLabeler(img,labels,st,en);
 		labelers[i]->parent=this;
 	}
-	Point st(0,(int)((float)i/numThreads*sz.height));
+	Point st(0,(int)((float)i/nThreads*sz.height));
 	Point en(sz.width,sz.height);
 	//st = Point(0,187);
 	labelers[i] = new myCompLabeler(img,labels,st,en);

library/ComponentLabeling.h

@@ -23,7 +23,7 @@ class myCompLabeler{
 	CBlobContour** labels;
 	int currentLabel;	//currentLabel
 	int r,c,pos;
-	int w,h; //Width & height of image
+	int w,h; //Width& Height of image
 	uchar dir;
 	static int freemanR[8],freemanC[8];
 	bool singlePixBlob;

library/blob.cpp

@@ -794,7 +794,7 @@ void CBlob::FillBlob( IplImage *image, CvScalar color, int offsetX , int offsetY
 void CBlob::FillBlob( Mat image, CvScalar color, int offsetX, int offsetY, bool intContours, const Mat srcImage){
 	CV_FUNCNAME("CBlob::FillBlob");
 	__CV_BEGIN__;
-	if(srcImage.data)
+	if(srcImage.data && intContours)
 		CV_ASSERT(image.size()==srcImage.size() && image.type() == srcImage.type());
   {
     Rect bbox = GetBoundingBox();