merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/samples/c/pyramid_segmentation.c
+++ b/samples/c/pyramid_segmentation.c
@@ -34,6 +34,7 @@ CvPoint pt1, pt2;

 static void ON_SEGMENT(int a)
 {
+    (void)a;
    cvPyrSegmentation(image0, image1, storage, &comp,
                      level, threshold1+1, threshold2+1);