Roman Donchenko
|
fee2ed37fc
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
|
2014-01-14 11:53:59 +04:00 |
|
Ilya Lavrenov
|
6b9ebcbf3d
|
deleted extra semicolons
|
2014-01-07 02:52:30 +04:00 |
|
Andrey Kamaev
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
2013-04-10 19:14:24 +04:00 |
|
Andrey Kamaev
|
cc6bdfb045
|
Remove inline sorting algorithms from core headers
|
2013-03-28 17:22:50 +04:00 |
|
Andrey Kamaev
|
be7bbe3aa9
|
Drop cv:: prefix from cv::String used inside the cv namespace
|
2013-03-22 22:14:50 +04:00 |
|
Andrey Kamaev
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Andrey Kamaev
|
2a06fd98c0
|
Fix build errors with c++11
|
2013-03-11 16:03:48 +04:00 |
|
Andrey Kamaev
|
ec8637a990
|
Fix build errors
|
2013-03-11 14:52:22 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Andrey Kamaev
|
9944282b09
|
Fix build with STLPort from NDK r8d
|
2012-12-22 00:59:56 +04:00 |
|
marina.kolpakova
|
23699acca0
|
fix for bug 2264
fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7
|
2012-10-08 02:37:22 +04:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Andrey Kamaev
|
72f2523d0f
|
Fixed ~20 potential errors identified by the MS complier.
|
2012-03-31 11:09:16 +00:00 |
|
Vadim Pisarevsky
|
beb7fc3c92
|
a LOT of obsolete stuff has been moved to the legacy module.
|
2012-03-30 12:19:25 +00:00 |
|
Vadim Pisarevsky
|
ff5e97c8e4
|
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
|
2011-07-19 12:27:07 +00:00 |
|
Vadim Pisarevsky
|
de913bd63f
|
added missing "#include <functional>"
|
2011-02-18 12:08:28 +00:00 |
|
Vadim Pisarevsky
|
75cf8c1b47
|
a few more warnings fixed
|
2010-07-16 22:44:48 +00:00 |
|
Vadim Pisarevsky
|
f78a3b4cc1
|
updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings
|
2010-07-16 12:54:53 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|