Merged the trunk r8459:8466 (inclusive)

2012-05-30 09:00:32 +00:00
parent 949c4edf41
commit 052d2dc23a
9 changed files with 332 additions and 335 deletions
--- a/samples/c/fback_c.c
+++ b/samples/c/fback_c.c
@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 #include <stdio.h>
 void help()
 {