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 |
|
ShengyinWu
|
ef5578a7ce
|
Fixs: After scaling back to original image, some detected ROI will outside the original image ROI
|
2013-04-29 12:16:42 +08:00 |
|
Andrey Kamaev
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
5e048d1fa5
|
Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
|
2013-04-12 14:37:01 +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
|
befd696720
|
Update documentation
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
jackculpepper
|
297e6d0b73
|
mark multiple return arguments for python bindings
|
2013-04-04 00:51:52 -07:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
3890a74565
|
Drop outdated definitions from internal.hpp
This also fixes few clang build errors
|
2013-04-01 15:24:35 +04:00 |
|
Andrey Kamaev
|
4ab650d15b
|
Remove gcd function from core headers
|
2013-04-01 15:24:34 +04:00 |
|
Andrey Kamaev
|
2b1ef95415
|
Completely separate C and C++ API of OpenCV core
|
2013-04-01 15:24:34 +04:00 |
|
Andrey Kamaev
|
715fa3303e
|
Move cv::Mat out of core.hpp
|
2013-04-01 15:24:34 +04:00 |
|
Andrey Kamaev
|
62adc01980
|
Move cv::Rect_
|
2013-04-01 15:24:33 +04:00 |
|
Andrey Kamaev
|
addf0309ec
|
Move cv::Size_
|
2013-04-01 15:24:32 +04:00 |
|
Andrey Kamaev
|
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 |
|
Andrey Kamaev
|
19f8f85c51
|
Move C structures wrappers from core.hpp to core_c.h
Also move RTTIImpl class to the only usage
|
2013-04-01 15:24:32 +04:00 |
|
Vladislav Vinogradov
|
b62cf65b91
|
fixed inconsistent new/delete operators
|
2013-04-01 11:55:02 +04:00 |
|
Andrey Kamaev
|
04eabf8d9f
|
Merge pull request #699 from jacob-baines/patch-1
Mismatching new[] / delete
|
2013-03-25 03:26:18 -07:00 |
|
Jacob Baines
|
1e1645e214
|
Mismatching new[] / delete
|
2013-03-24 22:45:31 -03:00 |
|
Andrey Kamaev
|
33ef7990b0
|
Update documentation
|
2013-03-22 22:14:54 +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
|
75513a46dc
|
Remove all include directives for <string>
|
2013-03-22 22:14:47 +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
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +04:00 |
|
Andrey Kamaev
|
0b0c9be771
|
Merge pull request #636 from ilya-lavrenov:SSE2_HOG
|
2013-03-18 15:56:16 +04:00 |
|
Andrey Kamaev
|
a42a0f5fca
|
Added compatibility headers
|
2013-03-13 17:26:56 +04:00 |
|
Andrey Kamaev
|
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 |
|
Ilya Lavrenov
|
8b510ad8dc
|
sse2 hog
|
2013-03-11 20:21:48 +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 |
|
Haoxiang Li
|
3f86fd82f8
|
update: detected rectangles may be partially outside the image
|
2013-02-15 11:05:56 -05:00 |
|
Andrey Kamaev
|
b44b920997
|
Merge branch '2.4'
|
2013-02-12 16:30:18 +04:00 |
|
Andrey Kamaev
|
37d695a62e
|
Use gtest assertions in cascade test
This simplifies test debugging a lot
|
2013-02-06 15:07:31 +04:00 |
|
Andrey Kamaev
|
c527340cb6
|
Merge branch 2.4
|
2013-02-04 17:15:55 +04:00 |
|
Andy Maloney
|
b79e8053c1
|
Check memory allocation
Declare vars as locally as possible
|
2013-02-02 08:44:25 -05:00 |
|
Andy Maloney
|
bc68dfb4e8
|
Remove unused vars
|
2013-02-01 18:09:58 -05:00 |
|
cuda-geek
|
f52ce6529b
|
Merge pull request #322 from cuda-geek:training
|
2013-02-01 18:45:12 +04:00 |
|
Andrey Kamaev
|
61079547f0
|
Merge branch '2.4'
|
2013-02-01 14:59:40 +04:00 |
|
marina.kolpakova
|
1b43b0e2df
|
move soft cascade functionality into dedicated module
|
2013-02-01 14:36:05 +04:00 |
|
marina.kolpakova
|
a28f5a89b3
|
move preprocessor to objdetect
|
2013-02-01 14:35:27 +04:00 |
|
Vadim Pisarevsky
|
638c0d1bf4
|
fixed compile warnings
|
2013-02-01 10:47:27 +04:00 |
|
Vadim Pisarevsky
|
50299c1d5e
|
disabled the use of SSE4 instructions as well to make the code compatible with the old Intel and AMD chips
|
2013-01-31 22:57:46 +04:00 |
|
Vadim Pisarevsky
|
18039d7829
|
added test for the old cvHaarDetectObjects. disabled AVX optimization in haar.cpp. it should cover tickets #2534, #2591, #2669
|
2013-01-31 22:55:04 +04:00 |
|
cuda-geek
|
d874d93e24
|
Merge pull request #372 from cuda-geek:gpu-cascade-fixes
|
2013-01-31 20:13:31 +04:00 |
|
Andrey Kamaev
|
57d3152cd0
|
Merge branch '2.4'
|
2013-01-31 14:35:27 +04:00 |
|
cuda-geek
|
53b0df87f1
|
Merge pull request #385 from etalanin:bug2607
|
2013-01-31 13:46:01 +04:00 |
|
Evgeny Talanin
|
50c2f87add
|
Fix and test for #2607
|
2013-01-31 12:23:08 +04:00 |
|
marina.kolpakova
|
5b03d47fb8
|
fix broken links in cascade classification documentation
|
2013-01-30 19:28:16 +04:00 |
|
marina.kolpakova
|
cb329400df
|
fix tests
|
2013-01-30 15:55:04 +04:00 |
|