Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
Alexander Smorkalov
|
4c1ed13846
|
Warning fixes for GCC 4.8.
|
2014-02-18 23:53:35 +04:00 |
|
Alexander Smorkalov
|
1aaeb52a4c
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:36:12 +04:00 |
|
Alexander Smorkalov
|
ccb48ddee0
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:23:50 +04:00 |
|
Roman Donchenko
|
029fce10c9
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
|
2013-05-21 17:19:23 +04:00 |
|
Andrey Kamaev
|
2665c39a0d
|
Fix build warnings from gcc 4.8
|
2013-05-13 17:07:30 +04:00 |
|
Andrey Kamaev
|
d586f4a103
|
Fix x64 build warnings
|
2013-02-25 15:04:19 +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 |
|
Vadim Pisarevsky
|
06f4a56469
|
converted flood fill, getrectsubpix & cornersubpix to C++
|
2013-02-11 23:49:10 +04:00 |
|
Evgeny Talanin
|
8528b0abcd
|
#1941 fix
|
2012-10-11 13:45:21 +04:00 |
|
Evgeny Talanin
|
7c71c8fa52
|
#2258 fix
|
2012-10-09 14:52:47 +04:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Andrey Kamaev
|
0d18d19ad6
|
Fixed Android build warnings
|
2012-03-30 16:10:52 +00:00 |
|
Vadim Pisarevsky
|
0b234b7a69
|
rewritten floodfill in generic style; added CV_32S flavor (ticket #1482)
|
2012-03-29 17:08:03 +00:00 |
|
Vadim Pisarevsky
|
0c096b3dc2
|
fixed floodfill with mask parameter when no mask is passed
|
2011-07-28 14:10:17 +00:00 |
|
Vadim Pisarevsky
|
abeeb40d46
|
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
|
2011-04-17 13:14:45 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|