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/modules/nonfree/include/opencv2/nonfree/nonfree.hpp
+++ b/modules/nonfree/include/opencv2/nonfree/nonfree.hpp
@@ -48,7 +48,7 @@
 namespace cv
 {

-CV_EXPORTS bool initModule_nonfree(void);
+CV_EXPORTS_W bool initModule_nonfree();
    
 }