Merge branch '2.4'

2026-07-29 15:23:05 +04:00 · 2013-03-21 20:59:18 +04:00
parent bbae05413d b6365699ee
commit 1ca8f33b4e
276 changed files with 11834 additions and 5170 deletions
@@ -43,9 +43,7 @@
 //
 //M*/

-#include <iomanip>
 #include "precomp.hpp"
-#include "mcwutil.hpp"

 using namespace cv;
 using namespace cv::ocl;