merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/samples/c/contours.c
+++ b/samples/c/contours.c
@@ -49,7 +49,7 @@ static void findCComp( IplImage* img )
 }


-int main( int argc, char** argv )
+int main()
 {
    int i, j;
    CvMemStorage* storage = cvCreateMemStorage(0);