Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
12 years ago |
Roman Donchenko
|
06742247be
|
Removed unused PACKAGE_* macros.
|
12 years ago |
Andrey Kamaev
|
3890a74565
|
Drop outdated definitions from internal.hpp
This also fixes few clang build errors
|
12 years ago |
|
Andrey Kamaev
|
be7bbe3aa9
|
Drop cv:: prefix from cv::String used inside the cv namespace
|
12 years ago |
|
Andrey Kamaev
|
762aefd71b
|
Compile opencv_test_core with cv::String instead of std::string
All tests passed!
|
12 years ago |
|
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.
|
12 years ago |
Andy Maloney
|
e87355463f
|
{highgui} Fix copy-paste error in conditional
|
12 years ago |
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
|
15 years ago |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
15 years ago |
