bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
f90fd5b0da
Split CLAHE into its own file, because it's faster that way.
...
Yes, it's as ludicrous as it sounds, but it's still true. Bizarrely,
the previous commit makes CLAHE run about 10% slower on Android, even
though it doesn't even touch any CLAHE code. Splitting it off fixes that,
although the reason it does is a mystery for the ages.
It's cleaner when it's in its own file, anyway. ;=]
2013-05-31 12:22:04 +04:00
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
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
e7995b4d5d
Take account of multi-channel matrices when comparing histograms
...
Ensure that all channels are considered when comparing multi-channel histograms
2013-05-18 23:31:22 +02:00
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
19794e6857
Fix for spurious assert in cv::compareHist
...
When comparing histograms that look like multi-channel images (e.g a 3D histogram, of 4x4x4 bins, might appear as a CV_32FC4 matrix), cv::compareHist would complain because it was expecting the matrix type() == CV_32F. Now we test matrix depth() == CV_32F instead.
2013-04-29 19:52:41 +02:00
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
a914088f29
Build warning fixes.
2013-04-04 07:29:53 -07:00
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
d62bc8cfbf
Remove more old definitions from internal.hpp
2013-04-01 16:32:08 +04:00
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
605382562d
Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create
2013-04-01 15:24:35 +04:00
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
62adc01980
Move cv::Rect_
2013-04-01 15:24:33 +04:00
13b31b0804
Move C++ basic structures to separate header and inverse dependency from C API
...
cv::Complex, cv::Point_ and cv::Point3_ are moved.
2013-04-01 15:24:32 +04:00
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
2013-04-01 15:14:45 +04:00
5a4fa4607b
fixed misprint in imgwarp.cpp
2013-04-01 11:26:49 +04:00
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
d620ef0d55
Merge pull request #577 from ilya-lavrenov:BilateralFilter
2013-02-27 19:44:56 +04:00
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
3eed5d8c72
additional improvements for 32f
2013-02-27 17:54:22 +04:00
efad6942e2
some improvements of existing sse3 optimization of bilateral filter in case of 8uc3. Now perf tests take 6120ms instead of previous 7250ms (1.18x speed-up)
2013-02-27 16:53:09 +04:00
cf5e272878
Added multithreaded implementation for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
d586f4a103
Fix x64 build warnings
2013-02-25 15:04:19 +04:00
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
7255ede3af
Added implementation for RGB to YUV420p color conversion
2013-02-24 23:07:05 +04:00
62655b05f4
Indentation ok
2013-02-21 15:25:22 +01:00
8a2b50dca6
Fixed undistort.cpp
2013-02-21 10:00:28 +01:00
76d03fccb9
Added Thin Prism Distortion Model
...
Only the code.
2013-02-20 15:11:47 +01:00
4cc3dfe27c
Merge pull request #482 from vpisarev:c2cpp_imgproc_part2
2013-02-14 20:13:45 +04:00
3c25ddd9ff
restored 8u->32f cvGetQuadrangleSubPix() mode (need better test for it)
2013-02-14 18:14:55 +04:00
78402bf596
made several minor fixes as pointed out by Andrey
2013-02-14 15:36:20 +04:00
77d647b675
2 more warnings on Windows fixed
2013-02-13 02:32:10 +04:00
bd063e47d7
fixed the remaining warning in houghlines
2013-02-13 01:47:17 +04:00
8f33e80515
fixed bug in the new version of cornerSubPix
2013-02-13 01:46:02 +04:00
16d825adbc
fixed compile warnings and opencv_perf_imgproc failures
2013-02-13 01:23:57 +04:00
944588e732
converted houghlines to C++
2013-02-12 23:16:06 +04:00
7f8c925319
finished distance transform; fixed warnings
2013-02-12 21:35:37 +04:00
05ea571b08
almost finished distance transform conversion (discrete voronoi diagram mode is not ready yet)
2013-02-12 18:56:22 +04:00
Roman Donchenko
ericgreveson
Andrey Kamaev
Alexander Smorkalov
Vladislav Vinogradov
Ilya Lavrenov
Daniil Osokin
alegarda
Vadim Pisarevsky