Merge pull request #16 from liurs1990/master

fix the calcLBP bug when samples is bigger than 8, for example: 16

LBP.cpp

@@ -416,20 +416,20 @@ LBP & LBP::calcLBP( Mat d_img, double radius, bool borderCopy ) {
 
 	}
     delete[] spoints;
-	result.convertTo( result, CV_8U );
     //	endTime = clock();
     //	times.push_back( (endTime - startTime) );
     //	cout << "lbp calc took " << times.back() << " cycles" << endl;
 
     //	startTime = clock();
 	// Apply mapping if it is defined
 	if( type != LBP_MAPPING_NONE ) {
-		MatIterator_<unsigned char> it = result.begin<unsigned char>(), it_end = result.end<
-        unsigned char>();
+		MatIterator_<double> it = result.begin<double>(), it_end = result.end<
+        double>();
 		for( ; it != it_end; ++it ) {
 			*it = table[(*it)];
 		}
 	}
+	result.convertTo( result, CV_8U );
     //	endTime = clock();
     //	times.push_back( (endTime - startTime) );
     //	cout << "mapping took " << times.back() << " cycles" << endl;