Commit Graph

5837 Commits

Author SHA1 Message Date
Vadim Pisarevsky
d79c05fec9 Merge pull request #872 from pengx17:2.4_create2dimage_fix 2013-05-13 23:12:25 +04:00
Vadim Pisarevsky
6eb5a95a59 Merge pull request #871 from bitwangyaoyao:2.4_acry 2013-05-13 23:04:11 +04:00
Vadim Pisarevsky
14c50d2fce Merge pull request #874 from pengx17:master_queryDeviceInfo_rewrite 2013-05-13 23:03:24 +04:00
Vadim Pisarevsky
fd83f2f5ca Merge pull request #819 from bitwangyaoyao:2.4_haarBuf 2013-05-13 22:36:10 +04:00
Vadim Pisarevsky
c549ec8371 Merge pull request #850 from SpecLad:convhull-orientation 2013-05-13 22:18:54 +04:00
Vadim Pisarevsky
6e44e0a476 Merge pull request #881 from apavlenko:hidden_visibility 2013-05-13 22:08:45 +04:00
Andrey Pavlenko
885566295a Merge pull request #840 from pablospe:master 2013-05-13 21:22:27 +04:00
Andrey Pavlenko
d94ecf40e6 Merge pull request #880 from apavlenko:qt-5.0 2013-05-13 21:18:47 +04:00
Andrey Pavlenko
0fec2eb6e5 Merge pull request #879 from apavlenko:gcc-4.8 2013-05-13 21:17:04 +04:00
Vadim Pisarevsky
e4d4b07f00 Merge pull request #873 from prclibo:2.4 2013-05-13 21:06:54 +04:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Kamaev
f856f78ac0 Update CMake scripts to recognize Qt 5.0 2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
yao
e23884a238 fix the warnings in fft tests 2013-05-13 15:04:23 +08:00
Vadim Pisarevsky
9cce8ca4b6 Merge pull request #864 from pengx17:2.4_stereobm 2013-05-12 22:16:03 +04:00
Andrey Pavlenko
d5881bc00a adding version info to test log 2013-05-12 18:36:55 +04:00
Vadim Pisarevsky
103ee12f00 Merge pull request #845 from githubuser0xFFFF:master 2013-05-12 12:54:44 +04:00
Vadim Pisarevsky
4b49b84976 Merge pull request #848 from pengx17:master_ocl_platform_name 2013-05-12 12:54:25 +04:00
Vadim Pisarevsky
f1e8f69d2c Merge pull request #861 from albenoit:master 2013-05-12 12:53:14 +04:00
yao
ada8f92cc7 fix warnings, unify test names 2013-05-09 17:57:13 +08:00
peng xiao
e5ea018185 Let surf.ocl use the new queryDeviceInfo interface. 2013-05-09 17:19:51 +08:00
peng xiao
bfa0f02303 Rewrite queryDeviceInfo interface.
Previously the function may cause some unsafe issue. It is fixed now by introducing a template parameter.
2013-05-09 17:15:26 +08:00
Bo Li
81779d8287 fixed pca bug for fixed mean input 2013-05-09 15:20:00 +08:00
peng xiao
e14acabb3d Fix ocl moudle build with latest Intel OpenCL SDK.
We found that cl.h file provided in latest Intel SDK muted deprecated interfaces.
2013-05-09 14:00:36 +08:00
peng xiao
69e6d0016e Optimize stereobm a bit.
Speedup about 30% on 6730M GPU.
2013-05-08 17:29:24 +08:00
peng xiao
861de8a6e9 CL_PLATFORM_VENDOR should be CL_PLATFORM_NAME. 2013-05-08 17:19:34 +08:00
yao
b6313951dc use clean EXPECT_MAT_NEAR (no string output) 2013-05-08 17:07:44 +08:00
yao
35c6860f06 further simplify the logics in filter tests 2013-05-08 16:08:33 +08:00
yao
1a53e2cfb2 remove interpolation.hpp 2013-05-08 15:27:35 +08:00
yao
3928c1ee26 add copyrights 2013-05-08 15:21:53 +08:00
yao
e4d3378230 simplify logics in filter tests, remove redundant code in arithm tests 2013-05-08 15:12:12 +08:00
Andrey Pavlenko
2aa5f1bfd1 Merge pull request #866 from MadEgg:RetrieveFrame_index_argument 2013-05-07 17:00:29 +04:00
Vadim Pisarevsky
741fb9b7d1 Merge pull request #865 from pengx17:2.4_ocl_ver 2013-05-07 16:39:49 +04:00
Andrey Pavlenko
2faa2adae2 Merge pull request #846 from smart-mobile-software:tuto_crash 2013-05-07 15:15:16 +04:00
yao
52dbbae82c some cleanup, remove some commented codes 2013-05-07 16:14:50 +08:00
Brian McKinnon
36745a80c3 Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
peng xiao
d34e7eca60 Suppress warning when compiling deprecated OpenCL function on GNU compilers. 2013-05-06 17:16:45 +08:00
Egbert van der Wal
dc6a144396 add (optional) index argument to RetrieveFrame method 2013-05-04 17:18:12 +02:00
alexandre benoit
a5acc9ee1f nicer interface with the use of InputArray and OutptArray instated of (const Mat&) 2013-05-03 11:45:13 +02:00
peng xiao
ed2199a497 Fix build 2013-05-03 09:54:11 +08:00
peng xiao
1eca49f40b ocl: Enable backward binary portability for setTo function. 2013-05-03 09:45:56 +08:00
peng xiao
168c0b0385 Optimize ocl::stereobm.
1. Use macro defines for some parameters(radius).
2. Reduce local memory usage.
3. Fix accuracy problem on Intel GPU.
2013-05-02 16:14:28 +08:00
peng xiao
355bc691fc Add OpenCL version 1.2 query into ocl::Context::supportsFeature().
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
2013-05-02 14:44:59 +08:00
alexandre benoit
b58d9f1c2a enhancing documentation 2013-05-01 19:35:32 +02:00
poiuytrez
bef6de9025 Fix tuto3 picture taken crash on all devices
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
2013-05-01 16:58:15 +02:00
alexandre benoit
f5d2d7b29b enhancing documentation 2013-05-01 13:58:53 +02:00
alexandre benoit
cf6e833169 trying to solve valarray pointer access problem, enhancing documentation 2013-05-01 11:47:26 +02:00
Luis Díaz Más
d13d5c0c12 Added setting feature of FPS in cap_libv4l 2013-05-01 01:07:03 +02:00
alexandre benoit
9adde75be3 updated doc+minor typo/buildbot reports correction 2013-04-30 20:26:00 +02:00
alexandre benoit
9c26387ce0 updated sources to correct buildbot warnings 2013-04-30 17:32:47 +02:00
alexandre benoit
25b482f1c9 updated/corrected documentation 2013-04-30 16:52:47 +02:00
alexandre benoit
a659e287fb minor error correction 2013-04-30 14:52:14 +02:00
alexandre benoit
80e65e08b5 updated doc and interface code to solve compile warnings and errors 2013-04-30 14:40:03 +02:00
alexandre benoit
b70b5a3011 corrections required for portability. To be validated by buildbot 2013-04-30 13:13:50 +02:00
alexandre benoit
1976b3d9b6 updated doc 2013-04-29 20:08:13 +02:00
alexandre benoit
72742f5316 resolved conflicts, updated retina class interface and optimized a heavy retinacolor process 2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228 minor chnges for conflict removal 2013-04-29 15:12:44 +02:00
Alexander Smorkalov
456c56fe90 NullPointerException in case of error on opening native camera fixed. 2013-04-29 11:00:52 +04:00
Andrey Pavlenko
5ce4e3c265 Merge pull request #800 from asmorkalov:android_cam_idx_semantic 2013-04-29 10:00:08 +04:00
Andrey Pavlenko
6d89e1f412 Merge pull request #827 from apavlenko:fix_android_tutorial1 2013-04-29 09:59:19 +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
albenoit
9e1ce1ed52 Merge pull request #2 from albenoit/retina_devel
Retina devel
2013-04-27 13:47:30 -07:00
Vadim Pisarevsky
2068c4582c Merge pull request #844 from bitwangyaoyao:2.4_integral 2013-04-28 00:37:40 +04:00
alexandre benoit
737046916c activated parallelized gradient computation 2013-04-27 21:30:35 +02:00
alexandre benoit
3b15eefcad forgot method name update 2013-04-27 21:22:57 +02:00
alexandre benoit
b62d101115 updated retina interface for cleaner use, following OpenCV standards 2013-04-27 21:13:45 +02:00
Roman Donchenko
2dc8642508 Changed convexHull's documentation to essentially invert the meaning of `clockwise`.
The orientation of convexHull's result is currently the opposite of what the
documentation would suggest:

>>> import cv2, numpy as np
>>> points = np.array([[0,0],[0,1],[1,0]], dtype=np.int32)
>>> cv2.convexHull(points, clockwise=False)
array([[[1, 0]],
       [[0, 1]],
       [[0, 0]]], dtype=int32)
>>> cv2.convexHull(points, clockwise=True)
array([[[0, 0]],
       [[0, 1]],
       [[1, 0]]], dtype=int32)

Changing the function itself is probably not a good idea at this point, so
this fixes the documentation by flipping the coordinate system.

I also removed the mention of the origin, since it's irrelevant for this
function.
2013-04-26 14:22:55 +04:00
Dominik Rose
cfaae5917b Calib3d documentation:
- fixed reference to Slabaugh
2013-04-26 11:34:35 +02:00
peng xiao
bb4b410512 Add ocl::PlatformName to ocl::Info. 2013-04-25 15:00:50 +08:00
Alexander Smorkalov
8606ee4beb Front/Back camera semantic support added to Android VideoCapture back-end. 2013-04-24 10:56:16 +04:00
yao
f788d010f7 fix a crash on CPU OCL for some specified image sizes 2013-04-24 14:12:41 +08:00
Uwe Kindler
ca42a50de6 Changed visibility of the virtual functions in OnePassStabilizer and TwoPassStabilizer that are derived from StabilizerBase from private to protected to enable stabilizer implementations that are derived from OnePassStabilizer and TwoPassStabilier to properly overwrite these functions 2013-04-24 07:33:22 +02:00
peng xiao
9cfa24e515 Fix thread sync for csbp. 2013-04-23 17:35:40 +08:00
yao
b386ea72aa use float when sum overflow 2013-04-23 17:23:05 +08:00
peng xiao
3282aaa1f5 Fix a bug found on Intel OpenCL SDK. 2013-04-23 15:34:40 +08:00
Peng Xiao
c701d54281 Fix build errors 2013-04-21 11:19:37 +08:00
Pablo Speciale
caf449a991 The deletion of "cv.py" file (Commit b2ba8b9) breaks "make install" 2013-04-20 15:55:48 -07:00
Peng Xiao
7b08d5ec69 Add OpenCL stereo CSBP implementation 2013-04-20 00:34:37 +08:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
787e56ab5c disabled gpucodec module on MacOS 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
3be997cfa9 gpulegacy module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
6d735c11c6 removed const qualifier (it produces warnings) 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
0ce10532b3 softcascade module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
13d087e62d videostab module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
fdeec6896c stitching module fixes 2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
033dd77504 superres module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
f375c86dfb photo module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
12f16b7a26 nonfree module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
5d7bbdc837 gpu module fixes 2013-04-18 12:36:07 +04:00
Vladislav Vinogradov
3156e803be gpuoptflow module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
f531dd839c gpubgsegm module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
c0b3424a23 gpuimgproc module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
b4f3d08725 gpuarithm module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
43d5e2d8b4 removed gpu BORDER_* constants 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
d5ee931287 fixed compilation issues 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
ac0f506d0e split gpuvideo onto gpuoptflow and gpubgsegm 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
eda124ec32 removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
28b1caa730 gpustereo module for stereo correspondence 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
cad9518928 moved image labeling to gpu module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
e72ba73e70 moved gpu nlm to photo module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
fc3730fcc2 gpuwarping module for image warping 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
71eeaa7276 gpuarithm module fixes 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
508fb6aa5b renamed gpunvidia -> gpulegacy 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
7e91e1871d simplify CMakeLists.txt for gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
77aafc2984 removed unused includes 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
623c7da747 removed obsolete source files from gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
a981dc93d0 removed obsolete headers from gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
96ac27e68c removed nv_perf_test (it is a duplicate for perf4au) 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
a6648b5372 gpuobjdetect module for object detection 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
b08b9ab83b gpucalib3d module for camera calibration and stereo correspondence 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556 gpuvideo module for video processing 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
7544ddbfef gpufeatures2d module 2d for feature detection and matching 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e41aea0acf gpuimgproc module for image processing 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
d569e72ad4 moved mulSpectrums, dft and convolve to gpuarithm 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
c56bdbc1c5 moved integral to gpuarithm module 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
10ac854358 moved copyMakeBorder to gpuarithm module 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
d08ebfe4d3 moved rectStdDev to gpuarithm 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
ca474de639 made objdetect dependecy for gpunvidia optional 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e654714973 replaced NCV_EXPORTS with CV_EXPORTS 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
ed006a0612 added private header to gpunvidia module 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
c2402053b9 removed columnSum function (it is a duplicate for reduce) 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
229ca0914a gpunvidia module for NCV & NPP API 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
bc0e563092 CV_GPU_TEST_MAIN macros 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
84de6ce036 gpufilters module for image filtering 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
1b00a3ed54 gpucodec module for video decoding/encoding 2013-04-18 11:33:29 +04:00
Andrey Kamaev
02131ffb62 Merge pull request #828 from tim36272:patch-1 2013-04-17 22:30:39 +04:00
Kevin Hughes
eedb6fa3c4 removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface 2013-04-17 13:20:32 -04:00
Andrey Kamaev
28aefc4f5a Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup 2013-04-17 15:45:38 +04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
tim36272
5ef3ef9c4a Clarified floodfill documentation
Clarified what value floodfill sets pixels in the mask to when FOODFILL_MASK_ONLY is set.
2013-04-17 00:34:20 -07:00
Andrey Kamaev
f6848b66d6 Merge pull request #826 from pengx17:2.4_canny_clampfix 2013-04-17 11:09:49 +04:00
Andrey Kamaev
bf551df4cf Merge pull request #825 from pengx17:2.4_query_cpu_wavesize 2013-04-17 11:09:37 +04:00
Andrey Pavlenko
8c40f0ccf2 fixing build and lint warnings 2013-04-16 15:30:43 +04:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
peng xiao
0f7d7100e5 Add clamping for y dimension. 2013-04-16 15:49:15 +08:00
peng xiao
6f63a5d8d5 Let wave_size=1 on CPU. 2013-04-16 14:41:30 +08:00
Andrey Kamaev
4223a59497 Merge pull request #809 from taka-no-me:drop_python1 2013-04-16 10:15:51 +04:00
Andrey Kamaev
96b008cd29 Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
yao
69a0b5dde5 Add OclCascadeClassifierBuf interface 2013-04-15 17:24:30 +08:00
yao
dec6a3b080 make boxfilter kernel compile on Mac GPU OCL 2013-04-15 16:46:25 +08:00
Andrey Kamaev
2ae3ab11e3 Merge pull request #814 from taka-no-me:gtest_r652 2013-04-15 12:13:16 +04:00
Andrey Kamaev
f7641be434 Merge pull request #812 from bitwangyaoyao:master_uhp 2013-04-15 12:12:46 +04:00
peng xiao
06a4bad809 Merge ocl and/or/xor operators into one kernel each. 2013-04-15 10:36:03 +08:00
Andrey Kamaev
802d004bbb Fix build issues 2013-04-13 16:53:59 +04:00
Andrey Kamaev
6168bf0062 Merge pull request #813 from bitwangyaoyao:master_fix 2013-04-13 16:34:07 +04:00
Andrey Kamaev
a54a307386 Merge pull request #810 from pengx17:master_fix_ocl_tmflag 2013-04-13 16:33:53 +04:00
Andrey Kamaev
9deea80b83 Update gtest to upstream r652
It is already marked as a gtest 1.7.0
2013-04-13 16:29:05 +04:00
yao
2f781a53a9 Fix arithm's substract mismatch caused by incomplete merge 2013-04-13 15:57:12 +08:00