Merge remote branch 'origin/current' into current

duvanjamid · Oct 20, 2010 · c0223f4 · c0223f4
2 parents ba2ee64 + 19976e6
commit c0223f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/ccv_bbf.c b/lib/ccv_bbf.c
@@ -661,7 +661,7 @@ static ccv_bbf_feature_t __ccv_bbf_convex_optimize(unsigned char** posdata, int
 	 * the three rules applied exhaustively, no heuristic used. */
 	for (t = 0; ; ++t)
 	{
-		int g = 0;
+		g = 0;
 		for (i = 0; i < 3; i++)
 			for (j = 0; j < cols[i]; j++)
 				for (k = 0; k < rows[i]; k++)