Merge branch 'master', remote branch 'origin/master'

baselib/progs/testProgressBar.cpp

@@ -11,7 +11,7 @@
 
 
 #include "core/basics/Config.h"
-
+#include <unistd.h>
 #include "core/basics/StringTools.h"
 // #include "features/simplefeatures/FourierLibrary.h"
 #include "vislearning/baselib/ProgressBar.h"

cbaselib/KernelUtils.cpp

@@ -143,9 +143,9 @@ void KernelUtils::selectExamples ( const Config *conf, const Vector & labels,
 		}
 
 		map<uint, uint> counts;
-		for ( uint i = 0 ; i < labels.size(); i++ )
+		for ( uint j = 0 ; j < labels.size(); j++ )
 		{
-			uint classno = (uint)labels[i];
+			uint classno = (uint)labels[j];
 			map<uint, uint>::iterator i = counts.find( classno );
 			if ( i == counts.end() )
 				counts.insert ( pair<uint, uint> ( classno, 1 ) );

features/gradientfeatures/progs/testPHOGFeatures.cpp

@@ -1,6 +1,7 @@
 #include <iostream>
 #include "core/basics/Config.h"
 #include "vislearning/features/gradientfeatures/PHOGFeature.h"
+#include <unistd.h>
 
 using namespace std;
 using namespace NICE;