alex77git
445860d619
(typo)
2013-05-20 13:19:36 +02:00
alex77git
c8abaea368
(tab to space) 2x
2013-05-20 12:06:25 +02:00
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
Vadim Pisarevsky
b51a1a7d15
Merge pull request #895 from bitwangyaoyao:2.4_perf
2013-05-20 14:00:47 +04:00
Leszek Swirski
7542d66dbd
Fix drawing documentation referring to C API macros
2013-05-20 10:56:06 +01:00
Roman Donchenko
389be67605
Merge pull request #853 from icylord:2.4
2013-05-20 12:11:47 +04:00
yao
d8b192c84d
Fix the mismatch on NV GPUs
2013-05-20 14:46:17 +08:00
ograycode
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
2013-05-19 22:04:56 -04:00
alex77git
bc59428b3a
Bug #2966 , insert CV_Assert(size.width>0 && size.height>0); in imshow()
2013-05-20 02:28:40 +02:00
alex77git
6e7b1ef252
Bug #2967 , void DescriptorMatcher::radiusMatch() // description unclear,
...
only file: common_interfaces_of_descriptor_matchers.rst
2013-05-20 02:26:58 +02:00
alex77git
44a2b109b7
Bug #2967 , basic_structures.rst, fix 2 typos
2013-05-20 02:24:09 +02:00
Andrey Pavlenko
4af104aaae
'aapt' tool moved in SDK r22, adding support to run.py
2013-05-19 14:57:21 +04:00
ericgreveson
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
Vadim Pisarevsky
aee6a617a6
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
2013-05-19 00:23:24 +04:00
yao
04399a27d0
fix a warning
2013-05-17 15:44:22 +08:00
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
2013-05-17 15:34:22 +08:00
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
2013-05-17 11:27:00 +04:00
yao
03c55db4fb
fix the waring in gemm test
2013-05-17 13:19:09 +08:00
yao
5f20fce6fd
add accuracy tests while running perf
2013-05-17 13:18:46 +08:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
Leszek Swirski
0e8c2b0395
Fix visibility of g_linked_ptr_mutex on Windows
...
Reverts some changes in b8ed00bd64
2013-05-15 14:42:28 +01:00
Vadim Pisarevsky
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
2013-05-15 14:21:50 +04:00
peng xiao
d053f2165d
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
...
This adds a similar interface with pure-cpp and gpu versions.
2013-05-15 10:47:17 +08:00
peng xiao
3f93c3cc4e
Clean up spaces in ocl.hpp
2013-05-15 10:43:47 +08:00
peng xiao
1ecc765903
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
2013-05-15 08:55:43 +08:00
peng xiao
df3997b108
Fix ocl::pyrUp
...
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
2013-05-15 08:51:21 +08:00
Dominik Rose
86ec9b79fd
libd1394 2.x support for mingw on windows added
2013-05-14 16:30:12 +02:00
Vadim Pisarevsky
2a646f7626
Merge pull request #862 from piponazo:v4lFPS
2013-05-14 16:00:28 +04:00
Vadim Pisarevsky
25e6902a43
Merge pull request #818 from bitwangyaoyao:2.4_optBlur
2013-05-14 15:56:56 +04:00
Vadim Pisarevsky
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
2013-05-14 15:56:35 +04:00
Vadim Pisarevsky
bd1d7cd208
Merge pull request #839 from pengx17:2.4_ocl_csbp
2013-05-14 15:56:07 +04:00
Vadim Pisarevsky
87765c0f16
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments
2013-05-14 15:55:38 +04:00
yao
1d1d28baf2
fix black screen when input Mat is large
2013-05-14 18:02:53 +08:00
peng xiao
ac21cabda2
Copy ocl::queryDeviceInfo interface from master to 2.4.
...
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
2013-05-14 17:50:38 +08:00
Vadim Pisarevsky
35d8fa444b
Merge pull request #849 from dominikrose:dom_2.4
2013-05-13 23:38:26 +04:00
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
ericgreveson
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
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 fba72cb60d02131ffb62
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
yao
40d0e0eda0
use host data when DEVICE_MEM_UHP is set (the risk of vary align size is owned by users)
2013-04-13 14:58:49 +08:00
Peng Xiao
6dd6013546
Use a faster way to count 1's (used by Hamming)
2013-04-13 14:34:30 +08:00
Peng Xiao
6b6b1c9cbf
Allow more query/train types for ocl::bfmatcher
2013-04-13 14:08:58 +08:00
Peng Xiao
1db20099a9
Enable runtime type definition in kernels
2013-04-13 12:50:17 +08:00
Peng Xiao
fd1528795e
Pass query type T into kernel
2013-04-13 11:39:13 +08:00
Peng Xiao
63813e83ae
Untabify
2013-04-13 11:22:22 +08:00
Peng Xiao
6a40383aee
Add HammingDist test case
2013-04-13 11:07:26 +08:00
Andrey Kamaev
298ccf6487
Turn pyopencv_to and pyopencv_from into templates
...
This protects from unwanted implicit conversions between types at compile time.
2013-04-13 01:02:57 +04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
f886651cf0
Drop old python samples and tests
2013-04-12 19:37:40 +04:00
Andrey Kamaev
b2ba8b9969
Drop old python interface
2013-04-12 19:37:40 +04:00
Andrey Kamaev
909d6fcf51
Move legacy part of opencv_contrib to separate header
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Andrey Kamaev
b0933dd473
Merge pull request #803 from taka-no-me:split_c_cpp3
2013-04-12 15:01:48 +04:00
Andrey Kamaev
abe2ea59ed
Merge pull request #802 from SpecLad:shebang
2013-04-12 15:00:28 +04:00
Andrey Kamaev
36028bd8ad
Merge pull request #808 from bitwangyaoyao:2.4_mac
2013-04-12 14:59:45 +04:00
Andrey Kamaev
d2de68c14c
Merge pull request #804 from gpsinghsandhu:staticCast
2013-04-12 14:59:26 +04:00
Andrey Kamaev
8406312571
Remove C API from OpenCL module
2013-04-12 14:37:02 +04:00
Andrey Kamaev
4296b456e5
Add missed constants for reduce operation
2013-04-12 14:37:02 +04:00
Andrey Kamaev
bd59bc3e4a
Remove ifdef __cplusplus from nonfree headers
2013-04-12 14:37:02 +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
Vadim Pisarevsky
03e2a52e2c
Merge pull request #807 from pengx17:2.4_ocl_bfm_opt
2013-04-12 13:46:55 +04:00
Vadim Pisarevsky
c019d06de3
Merge pull request #805 from pengx17:master_canny_fix
2013-04-12 13:46:07 +04:00
Vadim Pisarevsky
5a2c5227f4
Merge pull request #798 from pengx17:master_ocl_mleak
2013-04-12 13:45:44 +04:00
Vadim Pisarevsky
a770d04e78
Merge pull request #781 from bitwangyaoyao:2.4_fixerr
2013-04-12 13:44:59 +04:00
yao
719e8674ad
fix the compile errors on Mac
2013-04-12 17:38:59 +08:00
peng xiao
2338a895f5
Capitalize macro namings.
2013-04-12 16:56:49 +08:00
peng xiao
1bea9ee26c
Rename test case category and code clean up.
2013-04-12 16:54:06 +08:00
peng xiao
c9d8eb7a84
Fix build error on linux.
2013-04-12 16:52:21 +08:00
peng xiao
6eefd276cf
Further optimize bfmatcher by passing macros.
2013-04-12 16:51:36 +08:00
peng xiao
113b7584e0
Optimize bfmatcher by passing macros.
2013-04-12 16:50:30 +08:00
peng xiao
1e49c00f4b
Replace create with ensureSizeIsEnough thus buffer objects can be reused.
2013-04-12 16:47:44 +08:00
peng xiao
5eb551b340
Remove my test codes.
2013-04-12 16:21:52 +08:00
peng xiao
4f328d8388
Fix a potential bug of ocl::CannyBuf.
...
The program would crash if release is called twice.
2013-04-12 15:43:33 +08:00
peng xiao
7586145235
Remove unused kernels.
2013-04-12 14:32:13 +08:00
peng xiao
33361929fe
Fix a compilation error when HAVE_CLAMDFFT is on.
2013-04-12 11:36:17 +08:00
peng xiao
aec7a67d0f
Fix a bug of ocl::Canny when src/dst using the same buffer.
2013-04-12 11:10:47 +08:00
peng xiao
242955ce22
Format ocl::Canny header
2013-04-12 11:01:56 +08:00
peng xiao
6c2079b778
Test code clean up.
2013-04-12 10:59:15 +08:00
peng xiao
22ca7e44d6
Change ocl::Canny test case category
2013-04-12 10:58:42 +08:00
Gurpinder Singh Sandhu
36aad46fe1
changed reinterpret_cast to static_cast
...
This issue seem to be lingering around for quite some time
https://github.com/Itseez/opencv/pull/639
http://code.opencv.org/issues/2819
2013-04-11 22:32:50 +05:30
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Roman Donchenko
57d4c86b2b
Fixed the shebang lines on the Python scripts.
...
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Andrey Kamaev
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
Andrey Kamaev
ca56e99a62
Merge pull request #796 from SpecLad:more-backports
2013-04-11 15:48:17 +04:00
Roman Donchenko
4143071e22
In CvBoost, delegated update_weights's implementation to a helper method.
...
This allows subclasses of CvBoost to override initial weights that
update_weights uses without duplicating its entire implementation.
2013-04-11 13:50:10 +04:00
peng xiao
a2f4b301f3
Fix an incorrect type cast.
2013-04-11 16:59:32 +08:00
Andrey Kamaev
62b593ca8b
Merge pull request #793 from SpecLad:auto-cuda
2013-04-11 12:24:04 +04:00
Andrey Kamaev
e27f4da9c6
Merge pull request #795 from taka-no-me:move_imgproc_utils_to_core
2013-04-11 11:35:15 +04:00
Andrey Kamaev
9ba25e9d09
Merge pull request #742 from bitwangyaoyao:2.4_fix
2013-04-11 11:33:45 +04:00
Andrey Kamaev
0c64fc61dc
Merge pull request #740 from evil0sheep:2.4
2013-04-11 11:33:31 +04:00
Roman Donchenko
484607fb6f
Backported RNG_MT19937 from master.
2013-04-10 19:39:38 +04:00
Roman Donchenko
f64d512774
Backported globbing from master.
2013-04-10 19:36:39 +04:00
Andrey Kamaev
4846dcdfeb
Move borderInterpolate and copyMakeBorder documentation
2013-04-10 19:14:25 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Alexander Smorkalov
6e8f5ae574
Front/back camera constants semantic for Android fixed (Bug #2839 ).
...
Front/Back camera constants' values changed;
Additional camera facing check added for JavaCameraView.
2013-04-10 16:57:34 +04:00
Roman Donchenko
e8721f1f6f
Automatically add CUDA support to a module if it has CUDA sources.
...
Backport from master.
2013-04-10 12:20:54 +04:00
Andrey Kamaev
ad793ee3f4
Update documentation
2013-04-09 13:36:32 +04:00
Andrey Kamaev
b0e6606b98
Cleanup core module API
...
* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray
2013-04-09 13:36:32 +04:00
Andrey Kamaev
f4ae0cf19c
Merge pull request #790 from jet47:fix-gpu-build
2013-04-09 13:14:37 +04:00
Vladislav Vinogradov
ba1a1aecaa
fixed gpu module compilation
2013-04-09 10:41:35 +04:00
Vladislav Vinogradov
f50aabf012
fixed bug #2938
2013-04-09 10:14:25 +04:00
Andrey Kamaev
913e6833d5
Merge pull request #785 from taka-no-me:split_c_cpp2
2013-04-09 08:53:50 +04:00
Andrey Kamaev
f03c7521c6
Merge pull request #783 from pengx17:master_matchTemplate_dft
2013-04-09 08:53:17 +04:00
Andrey Kamaev
6d7313cd3d
Merge pull request #776 from virtuald:2.4
2013-04-09 08:51:09 +04:00
Andrey Kamaev
2cd67cc92b
Merge pull request #761 from jet47:gpu-core-refactoring
2013-04-09 08:50:45 +04:00
Andrey Kamaev
3107f79cea
Cast to unsigned inside CV_XADD to quiet nvcc
2013-04-08 18:17:29 +04:00
Vladislav Vinogradov
a783f5c260
removed blank lines at then end of file
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
068fb03011
fixed compilation warnings
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
b50090f850
restore cudaSafeCall
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
2bad639aee
fixed source_group
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
d47e89d704
fixed windows build
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
6e28e67741
removed static_check.hpp
2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
910ef57109
renamed cuda namespace to cudev
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
1bb141c465
fixed build
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
193e857392
removed cu_safe_call.h and cu_safe_call.cpp
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
204a19b431
moved common gpu utility functionality to gpu_private.hpp
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
28b1e81883
renamed device -> cuda
2013-04-08 17:25:15 +04:00
Vladislav Vinogradov
a57707b8d8
moved device layer to core module
2013-04-08 17:25:15 +04:00
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
befd696720
Update documentation
2013-04-08 15:47:29 +04:00
Andrey Kamaev
ae4e76395f
Make flann headers independent from OpenCV C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
69648f0a6f
Make photo.hpp independent from C API
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
Vladislav Vinogradov
c89786bc2d
fixed sanity test on Windows
2013-04-08 15:18:26 +04:00
Vladislav Vinogradov
8d97d9598e
updated GPU version of TVL1
2013-04-08 15:18:26 +04:00
Stefan Walk
6062601c4d
Make rescaling flexible and add median filtering
...
Previously the pyramid was done with a rescaling factor of 2 (implied by the
use of pyrDown). This often leads to inferior results compared to a scale step
of e.g. 0.8 (a factor of 2 is obviously faster). This commit makes the scale
step configurable and uses a resonable default value.
The other change in this commit is that median filtering is added. This is not
described in this paper but it is done in the author's implementation. (See
e.g. "Secrets of optical flow estimation and their principles", Sun et al.,
CVPR 2010) This serves as periodic outlier removal during optimization, leading
to smoother flow fields while preserving motion edges. This includes splitting
the optimization loop into two loops.
2013-04-08 15:18:26 +04:00
Andrey Kamaev
7ac0d86992
Merge pull request #786 from cuda-geek:fix-build-gpu-off-cuda-on
2013-04-08 15:11:28 +04:00
marina.kolpakova
780a8cc149
fix build without gpu module with cuda
2013-04-08 14:13:19 +04:00
Vladislav Vinogradov
bf6c08a9ea
fixed compilation with CUDA
2013-04-08 13:29:04 +04:00
peng xiao
143f8f69d6
Add some documentation on ocl::convolve
2013-04-08 17:15:52 +08:00
peng xiao
3fea2620e6
Fix some compilation errors and warnings.
2013-04-08 16:22:20 +08:00
peng xiao
77501f3ed0
ocl: Add dft based convolve implementation.
...
Match template in ocl module now can be utilized with dft based
convolve. Note this feature needs OpenCV to be built with clAmdFft
library.
2013-04-08 15:19:44 +08:00
yao
7726e273a9
merge add and sub into one set of kernels
2013-04-06 13:37:36 +08:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
yao
bee970ab94
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
2013-04-05 21:29:29 +08:00
Andrey Kamaev
72e49dc790
Merge pull request #777 from taka-no-me:ocl_win_hang
2013-04-05 13:00:03 +04:00
Andrey Kamaev
a2d27429e4
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
2013-04-05 12:59:45 +04:00
Andrey Kamaev
977562b614
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
2013-04-05 12:59:22 +04:00
Andrey Kamaev
3b6a82b57c
Merge pull request #769 from apavlenko:fix_2901
2013-04-05 12:59:02 +04:00
Andrey Kamaev
3400d83778
Workaround hanging of ocl module when ocl API in not really used
2013-04-05 11:01:28 +04:00
Andrey Pavlenko
4c31c26acf
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
2013-04-05 08:50:37 +04:00
Andrey Pavlenko
09fe5cddf1
test for the issue #2901
2013-04-05 08:50:24 +04:00
Andrey Pavlenko
18b2d6bdbb
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
2013-04-05 08:50:08 +04:00
Dustin Spicuzza
64b5784c0b
Catch exceptions when large allocations fail
2013-04-05 00:43:10 -04:00
yao
8cc5b98051
Fix the problem of device selection on hybrid video systems.
2013-04-05 09:19:59 +08:00
yao
5022bc8c25
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
2013-04-05 09:17:14 +08:00
yao
bcc086baa9
fix all redefine build errors on some Intel OCL
2013-04-05 08:15:05 +08:00
Gurpinder Singh Sandhu
69127e4105
some typo
2013-04-04 22:54:27 +05:30
Gurpinder Singh Sandhu
2b1e13f8f4
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
...
http://code.opencv.org/issues/2926
2013-04-04 22:52:07 +05:30
Andrey Kamaev
652606f780
Merge pull request #770 from asmorkalov:winrt
2013-04-04 20:01:55 +04:00
Andrey Kamaev
80fed87d53
Merge pull request #760 from alekcac:2.4
2013-04-04 18:44:35 +04:00
Alexander Smorkalov
a914088f29
Build warning fixes.
2013-04-04 07:29:53 -07:00
Andrey Kamaev
3785439917
Merge pull request #763 from gpsinghsandhu:video-doc-minor-typo
2013-04-04 18:16:15 +04:00
Andrey Kamaev
6570215205
Merge pull request #767 from asmorkalov:version_increment
2013-04-04 18:00:44 +04:00
Andrey Kamaev
1d7ff721ed
Merge pull request #764 from taka-no-me:svd
2013-04-04 17:59:57 +04:00
Andrey Kamaev
579f723fc6
Merge pull request #762 from vpisarev:cvt_fix
2013-04-04 17:59:28 +04:00
Andrey Kamaev
7c402d1e15
Merge pull request #759 from asmorkalov:android_common_fixes
2013-04-04 17:58:44 +04:00
Andrey Kamaev
6f288615a2
Merge pull request #756 from taka-no-me:libavcodec53.25.0
2013-04-04 17:57:17 +04:00
Andrey Kamaev
e22983ddb6
Merge pull request #753 from taka-no-me:fix_osx_fat_java
2013-04-04 17:55:28 +04:00
Alexander Smorkalov
1e332d690f
OpenCV verison incremented
...
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
2013-04-04 15:50:36 +04:00
gpsinghsandhu
6b71f56025
minor typo in the research paper title
2013-04-04 15:58:11 +05:30
Vadim Pisarevsky
6aa4f533fa
attempt to fix stereobm failures on Mac and Linux
2013-04-04 14:27:11 +04:00
Andrey Kamaev
235a678458
SVD: always update W vector for better algorithm convergency
2013-04-04 13:55:36 +04:00
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
2013-04-04 12:18:13 +04:00
jackculpepper
297e6d0b73
mark multiple return arguments for python bindings
2013-04-04 00:51:52 -07:00
Andrey Kamaev
eb3c9ed1ab
Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0
...
Based on pull request #685
2013-04-04 11:27:43 +04:00
Andrey Kamaev
1e9ed14205
Merge pull request #752 from khzimmer:2.4
2013-04-04 00:57:33 +04:00
Andrey Kamaev
78c70ab948
Merge pull request #747 from taka-no-me:split_c_cpp
2013-04-04 00:55:22 +04:00
Andrey Kamaev
0e53c56cf6
Merge pull request #744 from pengx17:Branch_2.4_stereobp_ocl
2013-04-04 00:55:03 +04:00
Andrey Kamaev
eeaa1e8751
Fix link of fat java wrapper on OS X
2013-04-03 20:02:13 +04:00
Karl-Heinz Zimmer
2122627877
Set ptr to NULL, so this method can be called repeatedly. This fixes a crash after unplugging web cam and trying to re-scan the cameras.
2013-04-03 17:54:29 +02:00
Andrey Kamaev
d4bb421ce2
Fix findEssentialMat function
...
Also remove all usages of std::complex from OpenCV modules
2013-04-03 17:25:00 +04:00
Andrey Kamaev
422803e866
Merge pull request #746 from jet47:fix-gpu-compilation
2013-04-03 15:58:48 +04:00
Andrey Kamaev
de848a08d3
Merge pull request #722 from gpsinghsandhu:blob-detector-cpp
2013-04-03 15:58:17 +04:00
Andrey Kamaev
91f6eb7cab
Merge pull request #745 from jet47:fix-gpu-warnings
2013-04-03 15:44:46 +04:00
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Andrey Kamaev
6c58a22e32
Merge pull request #743 from jet47:fix-sparsemat-iterator
2013-04-03 15:18:11 +04:00
Andrey Kamaev
d7a7d05dd6
Merge pull request #738 from jet47:gpu-disable-videoenc-test
2013-04-03 15:17:53 +04:00
Alexander Smorkalov
a2561ee0cd
Code review notes fixed.
2013-04-03 04:14:40 -07:00
Andrey Kamaev
6ce050d264
Update docs
2013-04-03 14:10:03 +04:00
Andrey Kamaev
940eedfb27
Finalize core headers reorganization
2013-04-03 14:10:03 +04:00
Vladislav Vinogradov
870563ba25
fixed compilation warning for CUDA files
...
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
2013-04-03 13:47:59 +04:00
peng xiao
917138f565
Fix compilation errors.
2013-04-03 17:36:05 +08:00
Vladislav Vinogradov
366f859ada
fixed compilation after CV_IMPLEMENT_QSORT_EX removing
2013-04-03 12:59:40 +04:00
peng xiao
7758322fd3
Fix some build errors.
2013-04-03 16:42:44 +08:00
Vladislav Vinogradov
9d7e51eb46
fixed SparseMat Iterator compilation error (bug #2921 )
2013-04-03 12:39:03 +04:00
peng xiao
ecea583afd
Add ocl::stereobp function.
...
OpenCL StereoBeliefPropagation, ported from GPU implementation.
2013-04-03 15:57:26 +08:00
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
2013-04-03 11:55:19 +04:00
yao
d5aaea2749
fix some mismatch on cpu device running OCL
2013-04-03 14:24:55 +08:00
yao
cb63bbf001
fix hog on some CPU device running ocl
2013-04-03 13:58:44 +08:00
yao
fd4a6f0af0
make the sparse method give correct results on CPU ocl
...
Add CL_CPU to supportsFeature check
simplify the logic of pyrlk
2013-04-03 13:23:04 +08:00
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
dave
8db1a73102
Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC
2013-04-02 10:31:02 -07:00
Vladislav Vinogradov
8d521d4704
disabled perf tests for gpu VideoWriter and VideoReader
2013-04-02 16:49:09 +04:00
Andrey Kamaev
656594ad4f
Merge pull request #736 from bitwangyaoyao:2.4_clflush
2013-04-02 15:25:19 +04:00
Andrey Kamaev
baa4882a2a
Merge pull request #735 from jet47:fix-windows-issues
2013-04-02 15:25:06 +04:00
Andrey Kamaev
f9f1261469
Merge pull request #734 from apavlenko:fix_2806
2013-04-02 15:24:53 +04:00
Andrey Kamaev
74097a426b
Merge pull request #732 from apavlenko:disable_unstable_test
2013-04-02 15:24:40 +04:00
Andrey Kamaev
04f0d31472
Merge pull request #731 from bitwangyaoyao:2.4_fixDft
2013-04-02 15:24:26 +04:00
Andrey Kamaev
727a339455
Merge pull request #730 from vpisarev:ba_fix
2013-04-02 15:24:12 +04:00
Vladislav Vinogradov
642d7d6826
fixed nonfree test (run it only on one gpu device)
2013-04-02 13:24:39 +04:00
Vladislav Vinogradov
9086efa8e9
fixed warnings
2013-04-02 13:24:00 +04:00
Vladislav Vinogradov
b47a2012d2
fixed assert condition (trueRightDisp can be empty)
2013-04-02 13:23:03 +04:00
Andrey Pavlenko
75ea10e6ff
fix for #2806 (missing 'nu03' field of moments)
2013-04-02 12:14:43 +04:00
Andrey Pavlenko
9aa29373b4
this test is unstable (fails from time to time), let's disable it until fixed
2013-04-02 11:39:26 +04:00
yao
f3254b28f2
use clflush replaces clfinish
2013-04-02 14:41:02 +08:00
yao
10f6ebfdf7
fix the crash when calling dft
2013-04-02 11:35:40 +08:00
Andrey Kamaev
7193a73ca0
Move FileStorage to separate header
2013-04-01 19:18:05 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
d62bc8cfbf
Remove more old definitions from internal.hpp
2013-04-01 16:32:08 +04:00
Andrey Kamaev
e972d6b8c0
Drop template Vector class
2013-04-01 15:24:35 +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
605382562d
Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create
2013-04-01 15:24:35 +04:00
Andrey Kamaev
b28f594917
Drop fast_abs
2013-04-01 15:24:35 +04:00
Andrey Kamaev
6fea48c54f
Drop operator* from MatCommaInitializer
2013-04-01 15:24:34 +04:00
Andrey Kamaev
4ab650d15b
Remove gcd function from core headers
2013-04-01 15:24:34 +04:00
Andrey Kamaev
c886afb502
Finalize cv::Mat transition
2013-04-01 15:24:34 +04:00
Andrey Kamaev
71e43852ce
Fix MSVC build issues
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
135c0b6cb5
Move cv::TermCriteria out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
fbd435898b
Rename mat.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
3d1d219561
Move cv::fastMalloc, cv::fastFree and cv::Ptr out of core.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
489bd59b72
Move implementation of C++ container classes to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
6c071cbdd8
Norms are moved out form operations.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
969a7133a9
Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
d2192c0759
Move cv::Matx and cv::Vec to separate header
2013-04-01 15:24:33 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
6ceca90c44
Move most of the traits classes out of core.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
2249f19120
Move cv::Range, cv::KeyPoint and cv::DMatch
2013-04-01 15:24:33 +04:00
Andrey Kamaev
93d76ac23f
Move cv::RotatedRect
2013-04-01 15:24:33 +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
Andrey Kamaev
6bf49d49e7
Drop CvModule and cvSetMemoryManager
2013-04-01 15:24:32 +04:00
Vadim Pisarevsky
10702c6d75
fixes in bundle adjustment code by Nils Hasler
2013-04-01 15:20:35 +04:00
Andrey Kamaev
2a1cf23fab
Merge pull request #713 from bitwangyaoyao:2.4_perf
2013-04-01 15:16:48 +04:00
Andrey Kamaev
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
2013-04-01 15:14:45 +04:00
Andrey Kamaev
a3954fb223
Merge pull request #729 from jet47:fix-gpu-windows-build
2013-04-01 15:11:40 +04:00
Andrey Kamaev
aebffb712a
Merge pull request #726 from jet47:fix-pvs-studio-warnings
2013-04-01 15:11:02 +04:00
Andrey Kamaev
52fc9f7794
Merge pull request #725 from taka-no-me:fix_array_create
2013-04-01 15:10:49 +04:00
Vladislav Vinogradov
8e10cd8946
fixed gpu module compilation under windows
2013-04-01 14:15:06 +04:00
Vladislav Vinogradov
b62cf65b91
fixed inconsistent new/delete operators
2013-04-01 11:55:02 +04:00
Vladislav Vinogradov
3d095ccc82
fixed condition in KeyPointsFilter::retainBest
2013-04-01 11:53:43 +04:00
Vladislav Vinogradov
d27d091e59
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
2013-04-01 11:53:05 +04:00
Vladislav Vinogradov
43f38df1d2
fixed incorrect sizeof() expression in CvCalibFilter::SetCameraCount
2013-04-01 11:37:48 +04:00
Vladislav Vinogradov
3c86788b1f
fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open
2013-04-01 11:35:33 +04:00
Vladislav Vinogradov
d2b093d809
fixed potential dereference of null pointer
2013-04-01 11:31:56 +04:00
Vladislav Vinogradov
ce2284e2e6
removed duplication
2013-04-01 11:29:13 +04:00
Vladislav Vinogradov
5a4fa4607b
fixed misprint in imgwarp.cpp
2013-04-01 11:26:49 +04:00
Vladislav Vinogradov
ae47b8f06c
fixed misprint in icvCreateIsometricImage
2013-04-01 11:23:27 +04:00
Vladislav Vinogradov
10774ff068
removed unnecessary tmp variable (convertTo can work in-place)
2013-04-01 11:18:30 +04:00
Vladislav Vinogradov
b28677bd90
fixed misprint in MatOp::augAssignXor
2013-04-01 11:16:47 +04:00
gpsinghsandhu
77e51ff9c4
contours with zero area rejected
...
reject contours with zero area by using the "continue" statement to be in sync with the condition checking style used in the whole file
2013-03-31 16:13:40 +05:30
Andrey Kamaev
87bb7ff558
Merge pull request #721 from jet47:tvl1-bug-fix
2013-03-31 13:46:25 +04:00
Andrey Kamaev
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
2013-03-31 13:40:09 +04:00
gpsinghsandhu
0d16a9befb
In response to Bug #2927
...
change to reject contours with moms.m00 = 0.0
2013-03-30 00:33:22 +05:30
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Ryan Rawson
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
2013-03-29 18:29:29 +04:00
Andrey Kamaev
f4b98e9628
Merge pull request #719 from jet47:gpu-fix-build
2013-03-29 18:23:05 +04:00
Andrey Kamaev
0bb785c979
Merge pull request #717 from ryanobjc:patch-1
2013-03-29 18:21:59 +04:00
Andrey Kamaev
7ff68d5e0d
Merge pull request #711 from taka-no-me:move_keypoint_dmatch
2013-03-29 18:21:38 +04:00
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
2013-03-29 18:20:45 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Andrey Kamaev
855acc9748
Add specialization for << operator for writing std::string to FileStorage
2013-03-29 16:27:12 +04:00
Vladislav Vinogradov
924b0ef786
fixed bug in TVL1 optical flow:
...
initial optical flow was not cleaned during the second call
2013-03-29 10:40:28 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Vladislav Vinogradov
2661c2e213
fixed warnings
2013-03-28 11:49:47 +04:00
Vladislav Vinogradov
76e748ccc1
removed internal_header.hpp - it produces many warnings
2013-03-28 11:49:26 +04:00
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
2013-03-28 11:48:43 +04:00
Alexander Smorkalov
c6cab50c5c
Perf tests for Video IO on WInRT fixed.
2013-03-28 00:15:30 -07:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Alexander Bohn / FI$H2k
c66cf08ced
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e042
2013-03-27 17:43:00 +04:00
Ryan Rawson
0d49de51b7
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -
2013-03-27 02:52:53 -07:00
Andrey Kamaev
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
2013-03-27 13:19:40 +04:00
Andrey Kamaev
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
2013-03-27 13:19:27 +04:00
Alexander Smorkalov
de95a2b278
Video IO tests turned off for ARM WinRT.
2013-03-27 00:45:41 -07:00
peng xiao
04a6ab4144
Fix OCL Canny
2013-03-27 15:08:51 +08:00
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
2013-03-27 13:25:08 +08:00
yao
5539e85a11
use perf test replace performance sample
2013-03-27 12:04:48 +08:00
peng xiao
ad58c084a9
Fix compiler errors
2013-03-27 08:56:31 +08:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
6c99b5c9e5
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
2013-03-26 18:38:36 +04:00
Andrey Kamaev
20534c9beb
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
2013-03-26 18:38:16 +04:00
Andrey Kamaev
2edfae5070
Move documentation for cv::KeyPoint and cv::DMatch to core
2013-03-26 17:20:51 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
8eff34ee0b
Merge pull request #709 from taka-no-me:cv_format
2013-03-26 14:36:47 +04:00
Andrey Kamaev
6e2708e042
Merge pull request #708 from taka-no-me:gstreamer_10_28
2013-03-26 14:36:25 +04:00
peng xiao
8ffc15371d
Fix compiler errors
2013-03-26 17:23:38 +08:00
Andrey Kamaev
6377922716
Fix build with gstreamer 0.10.28
2013-03-26 13:10:09 +04:00
Vadim Pisarevsky
322d781192
avoid explicit std::string use
2013-03-26 12:55:21 +04:00
peng xiao
7476bf5cd7
Fix compiler errors
2013-03-26 16:40:30 +08:00
Vladislav Vinogradov
4dbd0f0e8f
fixed compilation issues with gpu modules:
...
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
2013-03-26 12:33:13 +04:00
Andrey Kamaev
2107ea9773
More accurate implementation of cv::format
2013-03-26 11:54:04 +04:00
peng xiao
9698079ca5
Pass warp size into SURF
2013-03-26 15:48:15 +08:00
peng xiao
0c19a07bf4
Add a function to query ocl device info
...
Currently the function only supports wavefront size query
2013-03-26 15:36:49 +08:00
Andrey Kamaev
5fd58a0103
Fix std::string to cv::String migration problems in gpumat.cpp
2013-03-26 11:24:54 +04:00
Andrey Kamaev
69c9fe357d
Merge pull request #702 from taka-no-me:refactor_core_headers
2013-03-26 11:00:03 +04:00
yao
d6f1ad8c14
more fix
2013-03-26 14:23:26 +08:00
yao
f36db3a037
more fix of mismatch
2013-03-26 14:10:29 +08:00
yao
ad6aae4583
more fix of mismatch functions on CPU OCL
2013-03-26 13:41:13 +08:00
yao
2c06e59a69
fix some mismatch
2013-03-26 13:05:01 +08:00
peng xiao
f7b40cdc63
Add a macro to call additional barrier function on the fly
2013-03-26 11:51:02 +08:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Andrey Kamaev
aaf69c422e
Fix clang build for Android (CV_XADD)
2013-03-25 18:06:02 +04:00
Jacob Baines
866d676582
Memory Leak Fix
...
Memory leak in BoostedSoftCascadeOctave::traverse
2013-03-25 11:02:50 -03:00
Vladislav Vinogradov
4d23e2c8c9
GPU implementation of CLAHE
2013-03-25 17:45:13 +04:00
Vladislav Vinogradov
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
Andrey Kamaev
deb7f4d474
Fix globbing failure when stat call fails
2013-03-25 17:38:50 +04:00
Andrey Kamaev
a3e31a69df
Merge pull request #684 from vhdirk:gstreamer-1.x
2013-03-25 17:01:43 +04:00
Andrey Kamaev
78a843e8ac
Move implementation of cv::String methods out of class definition
2013-03-25 16:01:23 +04:00
Andrey Kamaev
3d3385654a
Use C++ style includes when compiled as C++
2013-03-25 16:01:06 +04:00
Andrey Kamaev
8c41c614eb
Merge pull request #700 from cuda-geek/fix_build_with_cuda
...
fix master build with CUDA after latest 2.4 merge
2013-03-25 03:27:31 -07:00
Andrey Kamaev
04eabf8d9f
Merge pull request #699 from jacob-baines/patch-1
...
Mismatching new[] / delete
2013-03-25 03:26:18 -07:00
Andrey Kamaev
bafd359083
Merge pull request #695 from taka-no-me/cv_str
...
cv::String to replace the std::string
2013-03-25 03:24:42 -07:00
Vadim Pisarevsky
f8b61e4eca
fixed hopefully last warnings in the doc builder
2013-03-25 12:04:11 +04:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
marina.kolpakova
dd9e786a8e
fix build gpu tests after video module refactoring
2013-03-25 09:34:51 +04:00
marina.kolpakova
84f45e1e03
fixed build with CUDA after latest merge
2013-03-25 08:08:36 +04:00
Jacob Baines
1e1645e214
Mismatching new[] / delete
2013-03-24 22:45:31 -03:00
Vadim Pisarevsky
44157c421f
fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs
2013-03-25 00:42:46 +04:00
marina.kolpakova
4096b54560
use static assertation where suitable
2013-03-25 00:29:12 +04:00
marina.kolpakova
5c1c13e745
static assert
2013-03-25 00:29:12 +04:00
Vadim Pisarevsky
7b5923e98b
fixed docs and compile error on Linux
2013-03-24 23:09:17 +04:00
Alexander Mordvintsev
4d510be2c9
added compute function to Feature2D (dirty workaround for #2699 )
2013-03-23 14:06:33 +04:00
Andrey Kamaev
877dfae044
Fix build of ocl module
2013-03-22 22:14:57 +04: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
29b544d83c
Use cv::String in Android camera wrapper
2013-03-22 22:14:43 +04:00
Andrey Kamaev
3088808926
Fix build of various backends
2013-03-22 22:14:40 +04:00
Andrey Kamaev
688d170de7
Java wrapper is adapted for cv::String
2013-03-22 22:14:33 +04:00
Andrey Kamaev
707d3e0a62
Python wrapper is adapted for cv::String
2013-03-22 22:14:30 +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
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
Andrey Kamaev
14bb4cbe1e
Add cv::String class
2013-03-22 22:14:18 +04:00
Andrey Kamaev
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Andrey Kamaev
ec8aec09ec
Merge pull request #691 from vpisarev:fix_2899
2013-03-22 17:18:55 +04:00
Andrey Kamaev
2c9f651230
Merge pull request #688 from jet47:fix-nonfree-compilation
2013-03-22 17:18:40 +04:00
Andrey Kamaev
c6eb7c3b12
Merge pull request #683 from jet47:gpu-license
2013-03-22 17:18:15 +04:00
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
2013-03-22 15:12:55 +04:00
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
2013-03-22 15:10:54 +04:00
Vadim Pisarevsky
5febc07b6b
Merge pull request #687 from vpisarev:fast_lin_svm2
2013-03-22 14:34:45 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
Vladislav Vinogradov
3ef2e1136f
fixed nonfree compilation with gpu (perf tests)
2013-03-22 10:20:57 +04:00
Vadim Pisarevsky
e01335bf47
fixed buffer size and restored the use of compressed files in ml's load_save tests.
2013-03-22 01:53:41 +04:00
Vadim Pisarevsky
40dd25d6c2
restored CV_EXPORTS_W in the background subtraction classes
2013-03-22 01:29:33 +04:00
Vadim Pisarevsky
7661625c39
converter stereo correspondence algorithms to the new style
2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Vadim Pisarevsky
d310ccad0a
fixed documentation and warnings on Windows
2013-03-21 20:23:52 +04:00
Andrey Kamaev
b6365699ee
Merge pull request #664 from taka-no-me/ocl
...
Move OpenCL SURF to nonfree module
2013-03-21 09:01:59 -07:00
Andrey Kamaev
07cd18adaf
Merge pull request #686 from taka-no-me/stereobm_sobel
...
Fixed wrong index in prefilterXSobel function
2013-03-21 08:59:59 -07:00
Andrey Kamaev
8a962d348e
Merge pull request #676 from vpisarev/svd_stuff
...
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-21 08:59:48 -07:00
Andrey Kamaev
172b4554f3
Merge pull request #675 from jet47/gpu-test-fixes
...
GPU test fixes
2013-03-21 08:59:34 -07:00
Andrey Kamaev
bbae05413d
Merge pull request #682 from vpisarev/python_str_fix
...
repaired std::string handling
2013-03-21 08:57:39 -07:00
Vadim Pisarevsky
4331f76d18
add hack to disable optimization of linear svms; improved precision of optimize_linear_svm; add the relevant test, which however requires some big database (so it's disabled by default)
2013-03-21 19:17:59 +04:00
Dirk Van Haerenborgh
921675c4e2
eliminated warnings
2013-03-21 16:11:53 +01:00
Andrey Kamaev
4bd721ad3b
Fix build errors
2013-03-21 18:37:34 +04:00
Dong Nguyen
73f5697749
Fixed wrong in row index of SSE implementation in prefilterXSobel function.
2013-03-21 18:28:23 +04:00
Andrey Kamaev
1b4afcca30
Move OpenCl SURF perf tests to nonfree and fix build of samples
2013-03-21 18:19:52 +04:00
Andrey Kamaev
77ad07adf3
Disable crashing ocl tests
2013-03-21 18:18:17 +04:00
Andrey Kamaev
7b8ad4cb04
Refactor OpenCL initialization and allow to use ocl module witout explicit setup
2013-03-21 18:18:15 +04:00
Andrey Kamaev
dd678121b3
Trying to make ocl surf work
...
1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.
2013-03-21 18:16:59 +04:00
Andrey Kamaev
1be58f9a00
SURF accuracy test is moved to nonfree
2013-03-21 18:15:46 +04:00
Andrey Kamaev
6846f881a2
Move OpenCL SURF to nonfree module
2013-03-21 17:59:35 +04:00
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
Vadim Pisarevsky
63a5587d0d
exploring possible bug in optimize_linear_svm
2013-03-21 17:00:08 +04:00
Alexander Smorkalov
7ec2b6bad0
Highgui tests for GUI disabled for WinRT;
...
Warnings fix;
2013-03-21 16:18:19 +04:00
Vadim Pisarevsky
09127aa358
fixed warnings; added read/write methods; fixed docs
2013-03-21 15:46:21 +04:00
Andrey Kamaev
d756de176f
Merge pull request #679 from jet47:gpu-simd-functions
2013-03-21 14:59:55 +04:00
Andrey Kamaev
2d764fe1c6
Merge pull request #665 from taka-no-me:core_utility
2013-03-21 14:47:49 +04:00
Vladislav Vinogradov
33ff3d6016
added simd_functions.hpp to device layer
2013-03-21 14:09:19 +04:00
Vladislav Vinogradov
d87b709c26
fixed minMax perf test
2013-03-21 13:46:32 +04:00
Vladislav Vinogradov
0149969463
disable tests that requires video support if it is not available
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
b07bce11ef
increased epsilon in sanity test
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
83def21ba9
increased time limits in perf tests
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
99c49648fa
fixed gpu::LUT on multi device system
2013-03-21 13:39:25 +04:00
Dirk Van Haerenborgh
4f3453dbbf
bomb commit of gstreamer videocapture and videowriter
2013-03-21 10:22:56 +01:00
Vadim Pisarevsky
0990b42ebc
Merge pull request #657 from prclibo:master
2013-03-21 12:23:49 +04:00
Vadim Pisarevsky
321070ccf0
Merge pull request #669 from vpisarev:fast_lin_svm
2013-03-21 12:22:36 +04:00
Vadim Pisarevsky
4e1619d8ee
repaired std::string handling
2013-03-21 11:30:38 +04:00
cuda-geek
ecdc7da6b1
Merge pull request #656 from jet47:gpu-nonfree
2013-03-21 08:57:09 +04:00
Jonathan Bohren
a7a0f92e58
Fixing segfault for near-zero-sized ellipses
2013-03-20 16:51:48 -04:00
Alexander Smorkalov
429cd85b46
More accurate guards for WinRT features in CMake.
2013-03-20 12:21:29 -07:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Vadim Pisarevsky
14a0abbfa9
refactored video module; use the new-style algorithms now
2013-03-20 19:51:33 +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
Bo Li
94b12eae92
update five-point license
2013-03-20 09:53:44 +01:00
Vadim Pisarevsky
9a86245242
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-20 11:58:19 +04:00
Alexander Smorkalov
3d594c70ff
Multiple Windows RT fixes
...
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
2013-03-19 17:46:01 -07:00
Andrey Kamaev
87563c6638
Merge pull request #670 from Nerei:osx_compilation
2013-03-19 19:39:08 +04:00
Andrey Kamaev
bb6a58aee2
Merge pull request #668 from AoD314:webp2
2013-03-19 19:38:52 +04:00
Anatoly Baksheev
08e55b7801
compilation for osx
2013-03-19 18:59:56 +04:00
Vadim Pisarevsky
a06af5ca25
dramatic speedup of SVM::predict in the case of linear SVM
2013-03-19 18:28:17 +04:00
AoD314
7d0c600504
improved test of webp
2013-03-19 18:04:15 +04:00
marina.kolpakova
238ea7f0f0
fix warnings under win.
2013-03-19 03:34:55 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
Andrey Kamaev
1ad7af3c3b
Merge pull request #654 from fish2000:patch-1
2013-03-18 15:56:55 +04:00
Andrey Kamaev
da00252963
Merge pull request #652 from Daniil-Osokin:fixCvtColorHeader
2013-03-18 15:56:33 +04:00
Andrey Kamaev
0b0c9be771
Merge pull request #636 from ilya-lavrenov:SSE2_HOG
2013-03-18 15:56:16 +04:00
cuda-geek
3f8d87d82c
Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections
2013-03-18 15:34:02 +04:00
Vladislav Vinogradov
3b065e38be
fixed warnings
2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
abc9ef6809
moved utility functions from gpu_perf_test and gpu_test to ts module
2013-03-18 14:06:19 +04:00
marina.kolpakova
43db0d543d
fix win warnings
2013-03-18 13:50:45 +04:00
cuda-geek
f768d8c93f
Merge pull request #658 from Nerei:affine3_classes
2013-03-18 13:36:01 +04:00
cuda-geek
f510b49cc2
Merge pull request #650 from taka-no-me:cvdef
2013-03-18 13:10:54 +04:00
Anatoly Baksheev
ceadaed108
Added Affine3<T> class
2013-03-18 11:51:43 +04:00
Daniil Osokin
e153f0631c
Added missing enums for cvtColor RGB to YUV420p
2013-03-18 10:33:44 +04:00
marina.kolpakova
318257f3a3
refactor cpp files naming
2013-03-18 08:17:13 +04:00
marina.kolpakova
0211843062
merge Detection structure for CPU and GPU soft cascade detectors
2013-03-18 06:58:53 +04:00
cuda-geek
7772811585
Merge pull request #659 from Nerei:master
2013-03-18 00:46:40 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
Anatoly Baksheev
fe10c74faa
fixed compilation for vs2008
2013-03-17 18:02:52 +04:00
marina.kolpakova
92ba74a3ee
fix cuda
2013-03-17 05:50:45 +04:00
Bo Li
28256209b0
updated doc
2013-03-15 21:30:22 +01:00
Bo Li
2435e59890
rewrite five-point coeff matrix.
2013-03-15 20:44:41 +01:00
Andrey Kamaev
ea79357fd3
Merge pull request #647 from taka-no-me:fix_ffmpeg_wrapper
2013-03-15 17:50:32 +04:00
Andrey Kamaev
e75df56317
Unified handling of InputOutputArrays in Python wrapper generator
...
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
2013-03-15 17:44:49 +04:00
cuda-geek
1d626194af
Merge pull request #644 from jet47:gpu-debayer-mht
2013-03-15 13:55:03 +04:00
Alexander Bohn / FI$H2k
f3ee55e042
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
2013-03-15 06:47:52 -03:00
Andrey Kamaev
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +04:00
Andrey Kamaev
00d8ad9e7e
Merge pull request #632 from pengx17:2.4
2013-03-15 10:34:43 +04:00
Andrey Kamaev
18ca645fd2
Merge pull request #631 from bitwangyaoyao:2.4_stereo
2013-03-15 10:34:27 +04:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +04:00
marina.kolpakova
a476664144
fixed compilation with latest master changes
2013-03-14 20:12:52 +04:00
Vladislav Vinogradov
4a237af814
implemented Malvar, He, and Cutler Bayer Demosaicing on gpu
2013-03-14 18:11:12 +04:00
Andrey Kamaev
14d27112e9
Fix build of ffmpeg wrapper with some versions of avutil
2013-03-14 14:52:13 +04:00
marina.kolpakova
6f11dc03b9
implement integral
2013-03-14 12:28:02 +04:00
marina.kolpakova
83e7d3dd67
remove generic version of GPU channel computer.
2013-03-14 12:28:02 +04:00
marina.kolpakova
3c8e66d580
softcascade: remove device dependency on gpu
2013-03-14 12:28:01 +04:00
marina.kolpakova
6daf17f974
remove softcascade host dependencies on gpu module
2013-03-14 12:28:01 +04:00
marina.kolpakova
5120322cea
move gpu version of soft cascade to dedicated module
2013-03-14 12:27:13 +04:00
marina.kolpakova
9b00c14fff
moved documentation for CUDA version of softcascade
2013-03-14 12:25:18 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
b076b69e68
Merge pull request #642 from taka-no-me:fix1
2013-03-14 11:42:05 +04:00
Andrey Kamaev
f622a2e79c
Merge pull request #641 from taka-no-me:stlfree_xadd
2013-03-14 11:41:36 +04:00
Andrey Kamaev
ecf770d49d
Merge pull request #638 from bitwangyaoyao:2.4_fixErode
2013-03-14 11:41:02 +04:00
Andrey Kamaev
5f3eb0fc49
Merge pull request #628 from bitwangyaoyao:2.4_fixMoments
2013-03-14 11:40:47 +04:00
peng xiao
34c7162104
Merge remote-tracking branch 'upstream/2.4' into 2.4
2013-03-14 09:24:45 +08:00
Alexander Smorkalov
06aff4e7b0
Initial Windows RT support commit.
...
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
2013-03-13 09:02:15 -07: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
marina.kolpakova
18aa5c921f
use OpenCV's twister.
2013-03-13 14:20:04 +04:00
marina.kolpakova
cf66942505
enable training test. refactor globbing
2013-03-13 13:43:22 +04:00
Andrey Kamaev
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
Andrey Kamaev
55698548dd
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
2013-03-12 22:49:40 +04:00
Andrey Kamaev
013fd9bf59
Make CV_XADD independent on STL and system headers
2013-03-12 20:32:41 +04:00
Andrey Kamaev
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
cuda-geek
e4f55a7ec0
Merge pull request #629 from cuda-geek:globbing
2013-03-12 15:57:56 +04:00
cuda-geek
009158e1f8
Merge pull request #621 from cuda-geek:twister
2013-03-12 13:11:50 +04:00
yao
084385cf38
Fix a bug in ocl::Erode/Dilate, simplify the host logic
2013-03-12 16:45:43 +08:00
peng xiao
3a565e001e
Remove unnecessary HAVE_OPENCL macro block.
2013-03-12 09:10:15 +08:00
yao
f8985bb7fc
fix warnings on Linux
2013-03-12 08:55:50 +08:00
Andrey Kamaev
1d3219747a
Merge pull request #633 from jet47:gpu-debayer-gray
2013-03-11 21:15:00 +04:00
Andrey Kamaev
632211eb27
Merge pull request #630 from asmorkalov:android_view_stretch
2013-03-11 21:14:43 +04:00
Andrey Kamaev
fb76095378
Merge pull request #610 from AoD314:webp2
2013-03-11 21:13:36 +04:00
Ilya Lavrenov
8b510ad8dc
sse2 hog
2013-03-11 20:21:48 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Andrey Kamaev
980fc93b4d
Fix clang + ccache build warnings
2013-03-11 18:41:22 +04:00
Andrey Kamaev
2a06fd98c0
Fix build errors with c++11
2013-03-11 16:03:48 +04:00
AoD314
9680176fa9
added docs
2013-03-11 15:47:21 +04:00
Vladislav Vinogradov
4ddf634c30
gpu : implement Bayer* -> Gray color conversion
2013-03-11 15:41:50 +04:00
Andrey Kamaev
ec8637a990
Fix build errors
2013-03-11 14:52:22 +04:00
peng xiao
34998b6034
Add ocl::SURF accurate test.
...
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9
remove the OpenCL define
2013-03-11 17:21:31 +08:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
AoD314
eb012a5993
added tests for WebP
2013-03-11 11:51:46 +04:00
AoD314
63d9ee9523
This code is based on https://github.com/prasannatsm/opencv code.
...
- added webp (lossy and lossless without alpha channel)
- added tests
2013-03-11 11:51:38 +04:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
cuda_geek
61094d350b
add dlobbing for Windows
2013-03-09 23:21:17 +04:00
marina.kolpakova
a486aafe7c
add dlobbing under *nix
2013-03-09 21:10:45 +04:00
marina.kolpakova
12fe6ff734
add Mersenne Twister random number generator
2013-03-09 19:18:37 +04:00
yao
7f0d6d42f0
fix mismatch on NV OCL and some AMD GPUs
2013-03-08 10:30:01 +08:00
Andrey Kamaev
13f402a554
Merge pull request #620 from apavlenko:java_tutorial_fix
2013-03-06 15:47:09 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
6569a58518
Merge pull request #592 from vpisarev:c2cpp_calib3d_ptsetreg
2013-03-05 17:39:53 +04:00
Andrey Kamaev
816adcfdac
Merge pull request #605 from vpisarev:c2cpp_calib3d_stereo
2013-03-05 15:26:51 +04:00
Andrey Kamaev
bbac4bc4cf
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
2013-03-05 15:26:16 +04:00
cuda-geek
b9ab5939a4
Merge pull request #607 from cuda-geek:auto-compile-cuda
2013-03-05 13:50:29 +04:00
cuda-geek
fcde059ca4
Merge pull request #618 from caotto:master
2013-03-05 13:12:39 +04:00
cuda-geek
c0ba0c9099
Merge pull request #596 from ArtanisCV:master
2013-03-05 08:57:58 +04:00
Charles Otto
c02f94392b
Add version checks to previous modifications to ffmpeg_cap_impl.hpp
...
Add version checks around uses of AVCodecID and av_opt_set, since these aren't
defined for older versions of ffmpeg.
2013-03-04 22:14:52 -05:00
Charles Otto
52137ceed0
Allow encoding with libx264 via ffmpeg to work
...
Add a call to avcodec_get_context_defaults3, this sets per-codec default values
and in the case of libx264 will stop VideoWriter::open (with fourcc=x264) from
failing due to libx264 complaining about broken ffmpeg default settings.
Set some additional libx264 encoder parameters.
2013-03-04 19:29:05 -05:00
Vadim Pisarevsky
f303de12d8
mask.create() re-converted to new style
2013-03-05 00:03:37 +04:00
Vadim Pisarevsky
0c61a8887e
reverting changes in Homography kernel function. For some reason GCC on Linux does not like it.
2013-03-05 00:00:21 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Vadim Pisarevsky
7fd1d75738
some more minor fixes
2013-03-04 16:02:15 +04:00
cuda-geek
52a45ed191
Merge pull request #606 from cuda-geek:fix-depth-less-2-bug-in-soft-cascade
2013-03-03 08:59:56 +04:00
Vadim Pisarevsky
8a6d2bbd3d
several minor fixes proposed by Andrey
2013-03-03 00:54:46 +04:00
marina.kolpakova
ac471fadd6
remove unused parameter from softcascade::Octave constructor
2013-03-02 13:06:29 +04:00
marina.kolpakova
d539dae6d0
fix typo in integral buffer initialization
2013-03-02 09:33:17 +04:00
marina.kolpakova
1bf696f392
fixes for soft cascade training app
2013-03-02 09:24:13 +04:00
Vadim Pisarevsky
df89f30b4a
removed preset parameter in createStereoBM, updated stereo_match sample
2013-03-02 02:17:49 +04:00
marina.kolpakova
19f863ec13
add possibility to create CUDA powered modules with ocv_define_module macro
2013-03-02 00:17:46 +04:00
marina.kolpakova
445f39a4a3
fix uninitialized magnitude channel bug
2013-03-01 23:40:32 +04:00
marina.kolpakova
12d23aae02
refactor channel builder
...
fix condition for sample index in assert
2013-03-01 23:39:32 +04:00
marina.kolpakova
1c3c11a4cc
fix import in scale_caltech python script
2013-03-01 23:33:28 +04:00
marina.kolpakova
516a6cc59d
fix bug: depth of resulting tree is less then 2.
2013-03-01 23:21:25 +04:00
yao
65bb4250a4
Fix a bug in addWeighted x64 mode
...
And a potential problem in remap
2013-03-01 18:08:53 +08:00
Vadim Pisarevsky
a910360689
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
2013-03-01 10:55:11 +04:00
Artanis
993522598b
Add implementations for Mat::zeros() and Mat::ones()
...
In class Mat, "static MatExpr Mat::zeros(int ndims, const int* sz, int
type)" and "static MatExpr Mat::ones(int ndims, const int* sz, int
type)" are declared but never implemented. That means we can see their
manuals from
"http://docs.opencv.org/modules/core/doc/basic_structures.html " but we
can't use them. Here I tried to finish their implementation.
I have also changed MatOp_Initializer::assign to make it support
multi-dimension Mat.
Test cases are added in test_math.cpp as well.
2013-03-01 13:18:44 +08:00
yao
82b9854837
fix compile warnings
2013-03-01 08:47:20 +08:00
Vadim Pisarevsky
b6efe30527
new API for StereoMatchers
2013-03-01 02:24:46 +04:00
Vadim Pisarevsky
d925879366
reverted dangerous change in _InputArray::size()
2013-02-28 23:02:04 +04:00
Vadim Pisarevsky
374e3a0890
rewritten several functions from calib3d: findhomography, findfundamentalmat, findessentialmat, estimateaffine3d, computecorrespondepilines, convert points{to/from}homogeneous to C++.
2013-02-28 18:25:05 +04:00
Andrey Kamaev
c865b28243
Merge pull request #591 from jet47:gpu-sanity-tests
2013-02-28 18:08:11 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Kamaev
fba0e6fc5c
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
2013-02-28 18:06:28 +04:00
Andrey Kamaev
4811988caf
Merge pull request #585 from bitwangyaoyao:2.4_SURF
2013-02-28 18:06:14 +04:00
Andrey Pavlenko
d18b2c2502
patch -> revision
2013-02-28 17:19:52 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Vladislav Vinogradov
f533f0dca9
fixed gpu sanity tests
2013-02-28 16:54:37 +04:00
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +04:00
Andrey Kamaev
d0e340bc80
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
2013-02-28 15:43:51 +04:00
yao
f12369a53c
Fix ocl::HOG crash on Intel OCL
2013-02-28 16:56:39 +08:00
Andrey Kamaev
831580ef31
Merge pull request #578 from jet47:nmake-ffmpeg-copy
2013-02-28 12:56:26 +04:00
cuda-geek
0771fd82c0
Merge pull request #557 from jet47:gpu-sanity
2013-02-28 11:17:12 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
yao
f791344810
linux warning fix
2013-02-28 14:37:37 +08:00
yao
504008dbe0
Fix ocl::bruteforcematcher crash on Intel OCL
2013-02-28 14:31:08 +08:00
Vladislav Vinogradov
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04:00
yao
7c1f1d8837
fix bug #2787
2013-02-28 14:05:36 +08:00
yao
69eebdd608
fix the blend crash in some cases
2013-02-28 09:03:10 +08:00
Andrey Kamaev
c5e979ceb7
Merge pull request #581 from vpisarev:ios_fix
2013-02-28 01:58:13 +04:00
Georgios Evangelidis
f40725bb50
Add ECC algorithm
...
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
Vadim Pisarevsky
11ba220e02
fixed iOS framework compile errors after recent changes
2013-02-28 00:54:01 +04:00
Andrey Kamaev
a5d2253be8
Merge pull request #544 from AnnaKogan8:added-regressions-only-option
2013-02-28 00:38:47 +04:00
Andrey Kamaev
68bb317ce1
Merge pull request #462 from kobigurk:master
2013-02-28 00:38:20 +04:00
Andrey Kamaev
d620ef0d55
Merge pull request #577 from ilya-lavrenov:BilateralFilter
2013-02-27 19:44:56 +04:00
Andrey Kamaev
0a8711d76b
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
2013-02-27 19:33:54 +04:00
Andrey Kamaev
af13c8604d
Merge pull request #568 from bitwangyaoyao:2.4_moments
2013-02-27 19:33:26 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
Ilya Lavrenov
3eed5d8c72
additional improvements for 32f
2013-02-27 17:54:22 +04:00
Ilya Lavrenov
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
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
cuda-geek
5d43ce853e
Merge pull request #559 from jet47:gpu-hough-circles
2013-02-27 12:29:45 +04:00
Andrey Kamaev
242a6de719
Merge pull request #566 from FabricioS:master
2013-02-27 11:37:31 +04:00
Andrey Kamaev
1a82ceac9c
Merge pull request #563 from taka-no-me:perf_classify_speedups
2013-02-27 11:37:18 +04:00
Andrey Kamaev
b836e3c65b
Merge pull request #556 from bitwangyaoyao:2.4_SURF
2013-02-27 11:37:04 +04:00
Andrey Kamaev
f03c04c151
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
2013-02-27 11:36:40 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
dba2ec0539
remove the compile warnings
2013-02-27 14:53:27 +08:00
yao
6df23428af
Add moments function
2013-02-27 13:45:16 +08:00
yao
9ec5333a9b
pyrlk also take advantages of cl_image support detection
2013-02-27 10:45:07 +08:00
yao
da47ccec9c
Put the cl_image support detection in utils
2013-02-27 10:24:03 +08:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
Andrey Kamaev
351ecbbcce
Repair build
2013-02-26 23:12:20 +04:00
Fabrice Silva
eca114ae95
Fix definition of the covariance matrix of derivatives.
2013-02-26 18:50:20 +01:00
cuda-geek
15e125c751
Merge pull request #543 from taka-no-me:explicit_stl
2013-02-26 20:54:13 +04:00
cuda-geek
0e5255d4fb
Merge pull request #561 from asmorkalov:android_tutorial_2_4_4_update
2013-02-26 19:58:34 +04:00
Andrey Pavlenko
1c1c3c29c3
fixing eclipse import errors
2013-02-26 19:52:59 +04:00
Andrey Kamaev
4d2c864bea
Add option --with-score to summary.py to automatically classify speedups
...
Legend for new column is:
* FASTER - strong speedup
* faster - spedup is detected but it is unreliable
* <empty> - no change in speed
* slower - slowdown is detected but it is unreliable
* SLOWER - strong slowdown
2013-02-26 19:42:51 +04:00
Andrey Kamaev
9f888fdb97
Merge pull request #490 from mschoeler:master
2013-02-26 18:33:05 +04:00
Andrey Kamaev
f6dd3651ea
Merge pull request #552 from taka-no-me:fix_invert
2013-02-26 18:31:30 +04:00
Andrey Kamaev
dcf7a69430
Merge pull request #555 from bitwangyaoyao:2.4_fixFft
2013-02-26 18:31:17 +04:00
yao
04faaa9e35
Fix ocl::dft the compile warning on Linux
2013-02-26 21:18:51 +08:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
yao
3ff5689fe5
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
2013-02-26 20:30:42 +08:00
Vladislav Vinogradov
10402c8a85
fixed gpu HoughCircles test
2013-02-26 16:10:35 +04:00
alegarda
0448f240a0
Added constants to gen_java.py
2013-02-26 11:21:43 +01:00
Vladislav Vinogradov
c9868fc01f
fixed warp tests
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
4f7cfbc26e
fixed gpu bitwise operations with scalars
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
a138e12a26
refactored gpu perf tests and fixed sanity tests
2013-02-26 13:53:38 +04:00
yao
ea433cc496
remove the device specific logic
2013-02-26 17:53:08 +08:00
yao
62f8b0fc48
Fix ocl::dft error when program end on Linux
2013-02-26 17:44:19 +08:00
yao
0ac7f0d374
Simplify the bind texture logic of interpolate frame function
2013-02-26 17:12:03 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Andrey Kamaev
ab221e94c0
Fix invert under MSVC
2013-02-26 11:16:57 +04:00
Anna Kogan
a9b1c5db78
Added --regressions-only=X-FACTOR option
2013-02-26 11:09:17 +04:00
Andrey Kamaev
0d12f451be
Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm
2013-02-26 01:00:55 +04:00
Vadim Pisarevsky
416432a8e5
replaced tabs with spaces
2013-02-25 23:10:38 +04:00
Vadim Pisarevsky
087537463d
attempt to make the ultimate fix for the failure in Core_Invert.small
2013-02-25 22:46:30 +04:00
Vadim Pisarevsky
25bbcba0ea
fixed Core_MulSpectrums failure
2013-02-25 22:02:24 +04:00
marina.kolpakova
9e5698b967
fix lying assertation and hard-coded shrinkage
2013-02-25 19:49:12 +04:00
Daniil Osokin
cf5e272878
Added multithreaded implementation for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Daniil Osokin
d8f538d67b
Added tests for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
LeonidBeynenson
41dc829341
Made changes to avoid warnings (Windows compilation).
2013-02-25 15:38:59 +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
Andrey Kamaev
6082f351ab
Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
2013-02-25 14:04:02 +04:00
Andrey Kamaev
b6cdc849db
Merge pull request #540 from hgaspar:244
2013-02-25 14:03:36 +04:00
yao
59ebf4ed9f
Fix the ocl::cvtColor mismatch on some devices
2013-02-25 15:19:39 +08:00
hgaspar
60981565fa
updated the ocl module introduction
2013-02-24 22:34:44 -05:00
Andrey Kamaev
f783f34e0b
Merge pull request #534 from emchristiansen:c++11
2013-02-24 23:31:12 +04:00
Daniil Osokin
7255ede3af
Added implementation for RGB to YUV420p color conversion
2013-02-24 23:07:05 +04:00
marina.kolpakova
ef6c236655
restore missed gpu functionality after merge #dddd285d
2013-02-24 22:14:57 +04:00
Andrey Kamaev
dddd285d3b
Merge branch 2.4
2013-02-24 20:16:53 +04:00
Andrey Kamaev
cfd019e2a2
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
2013-02-24 15:26:42 +04:00
Andrey Kamaev
7047c23489
Merge pull request #535 from bitwangyaoyao:2.4_clean
2013-02-24 15:26:24 +04:00
yao
f1a5c1328c
remove the empty implementation when HAVE_OPENCL not defined
2013-02-23 20:50:03 +08:00
yao
b7ebedc23e
fix mismatch of WarpAffine
2013-02-23 17:43:10 +08:00
yao
9bbf170054
some cleanup
2013-02-23 15:34:43 +08:00
yao
720eaf1e1a
fix the haar kernel problems on Nvidia and Intel OCL
2013-02-23 15:19:46 +08:00
yao
d050159f07
Remove the perf running from ocl::matchTemplate accuracy tests
2013-02-23 14:30:04 +08:00
Eric Christiansen
a66f7cb9bc
allows building with -std=c++11 under G++
2013-02-22 13:28:20 -08:00
Markus Schoeler
5484a41960
Corrected a mistake in CHI2 kernel in line 354 and line 362 svm.cpp
...
Added new kernels to documentation
2013-02-22 15:43:41 +01:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Andrey Kamaev
051aa4cb98
Merge pull request #530 from bitwangyaoyao:2.4_fixEqHist
2013-02-22 16:40:06 +04:00
Andrey Kamaev
58f546dd93
Merge pull request #529 from bitwangyaoyao:2.4_fixGemm
2013-02-22 16:39:50 +04:00
Andrey Kamaev
3406832aa2
Merge pull request #528 from bitwangyaoyao:2.4_fixPyrLK
2013-02-22 16:35:30 +04:00
Andrey Kamaev
b1975fb13d
Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
2013-02-22 16:35:18 +04:00
Andrey Kamaev
e68901bbce
Merge pull request #523 from taka-no-me:fix_2815
2013-02-22 16:34:28 +04:00
Andrey Kamaev
7cd4edd695
Merge pull request #518 from asmorkalov:ts_refactor
2013-02-22 16:34:14 +04:00
yao
1a488c0542
fix the warning on Linux when OpenCL 1.2 not supported
2013-02-22 18:33:16 +08:00
yao
7810254198
Fix ocl::equalizeHist mismatch
2013-02-22 15:48:31 +08:00
yao
3316d0bfb2
Fix the compiling errors of gemm on Linux
2013-02-22 15:05:49 +08:00
yao
2e3f4fdada
fix pyrLK's mismatch on Linux
2013-02-22 11:23:43 +08:00
yao
f4ef0c1598
fix meanShift mismatch on none-double GPUs
2013-02-22 10:13:20 +08:00
Andrey Kamaev
c17e9ef7ba
Repair binary compatibility of ocl module
2013-02-22 01:58:01 +04:00
Andrey Kamaev
995154d10d
Fix binary compatibility of gpu module
2013-02-22 00:14:58 +04:00
LeonidBeynenson
bfb644ac04
Changed error message in Algorithm::get.
2013-02-21 20:10:42 +04:00
LeonidBeynenson
e7b214b6d2
Removed urequired functions
2013-02-21 19:49:37 +04:00
alegarda
6bf7fd997a
Indentation Ok
2013-02-21 15:48:23 +01:00
alegarda
62655b05f4
Indentation ok
2013-02-21 15:25:22 +01:00
Andrey Kamaev
eda2a76ee9
Merge pull request #520 from jet47:gpu-updates
2013-02-21 18:03:06 +04:00
gferry
e3803f9985
fix for OpenCV issue #2815
...
- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values
2013-02-21 17:37:24 +04:00
Andrey Kamaev
f0dce1fa35
Merge pull request #521 from asmorkalov:2.4.4_preparation
2013-02-21 17:25:21 +04:00
Vladislav Vinogradov
73ffd71a22
Fixed documentation build
2013-02-21 17:06:53 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Alexander Smorkalov
9f39c8eaa1
OpenCV 2.4.4 preparation
...
Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.
2013-02-21 14:42:28 +04:00
Andrey Kamaev
16461247ce
Merge pull request #498 from asmorkalov:doc_ptr
2013-02-21 13:30:34 +04:00
alegarda
cb61e91023
distCoeffs0 cols to 12
2013-02-21 10:18:55 +01:00
alegarda
8a2b50dca6
Fixed undistort.cpp
2013-02-21 10:00:28 +01:00
Vladislav Vinogradov
21f95a3b11
restored source compatibility
2013-02-21 12:38:12 +04:00
Andrey Kamaev
d4e7bec29a
Merge pull request #440 from AnnaKogan8:fixed-perfomance-tests
2013-02-21 12:29:57 +04:00
Andrey Kamaev
decf04dfec
Merge pull request #512 from jet47:core-gpu-updates
2013-02-21 12:22:04 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Alexander
4091eab45e
cv::Ptr description extended.
2013-02-21 12:14:42 +04:00
Alexander Smorkalov
e21a1d3124
Test system refactoring
...
cmpEps replaced on cmpEps2 to reduce code dublication;
Constants for cmpEps return values added.
2013-02-21 12:07:04 +04:00
Vladislav Vinogradov
ce2559b332
optimized DeviceInfo class and ensureSizeIsEnough
2013-02-20 19:30:57 +04:00
alegarda
d3d8a782b5
Thin prism distortion model added doc
...
Thin prism distortion model added to the
camera_calibration_and_3d_reconstruction.rst
2013-02-20 15:25:49 +01:00
alegarda
76d03fccb9
Added Thin Prism Distortion Model
...
Only the code.
2013-02-20 15:11:47 +01:00
Anna Kogan
f6e0d327b0
Increased time limits
2013-02-20 17:34:00 +04:00
Anna Kogan
a567c03fdf
Switched to TEST_CYCLE_MULTIRUN for fast tests
2013-02-20 17:05:54 +04:00
Andrey Kamaev
11bd936f0b
Fix warnings from documentation build
2013-02-20 15:07:13 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
yao
429ae44ae3
add openCLExecuteKernelInterop method
2013-02-20 17:46:43 +08:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
5691fd3abe
Merge pull request #503 from taka-no-me:fix_docs
2013-02-19 18:01:51 +04:00
Andrey Kamaev
5cc2a6bdbf
Merge pull request #500 from nielsgm:predict_python_wrapper_to_docs
2013-02-19 18:01:30 +04:00
Andrey Kamaev
afa8e4e645
Merge pull request #492 from taka-no-me:fix_warnings_gcov
2013-02-19 18:01:06 +04:00
Andrey Kamaev
2fe7482b73
Add support for enums into rst ocv domain
2013-02-19 16:22:20 +04:00
Andrey Kamaev
ff7b604a25
Fix several inconsistent declarations identified by check_doc2 script
2013-02-19 16:22:20 +04:00
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
2bbb777d95
Fix warnings about missing parent for class members
2013-02-19 11:49:05 +04:00
Niels Gerlif Myrtue
7697d79d93
Added the predict_all function wrapper for python that was missing from the documentation
...
Copied the docstring description
2013-02-19 13:11:30 +11:00
Andrey Kamaev
39baa2237e
Merge pull request #499 from vpisarev:zeroelem_fix
2013-02-18 18:05:02 +04:00
Andrey Kamaev
c6f6f9ab35
Merge pull request #451 from bitwangyaoyao:2.4_operator
2013-02-18 18:04:44 +04:00
Vadim Pisarevsky
a1c7e0368c
fixed problem reported by Thouis (Ray) Jones
2013-02-18 17:01:21 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
yao
9613135e8d
fix compiling errors on Linux
...
more operators use oclMatExpr
2013-02-16 18:41:43 +08:00
yao
69fd2d8273
add oclMatExpr class to prevent extra allocations
2013-02-16 11:05:23 +08:00
Haoxiang Li
3f86fd82f8
update: detected rectangles may be partially outside the image
2013-02-15 11:05:56 -05:00
Andrey Kamaev
3ead4449ad
Fix several warnings about uninitialized variables from gcov build
2013-02-15 17:28:23 +04:00
Andrey Kamaev
4cc3dfe27c
Merge pull request #482 from vpisarev:c2cpp_imgproc_part2
2013-02-14 20:13:45 +04:00
Andrey Kamaev
f58dffe31f
Merge pull request #401 from Daniil-Osokin:bugfix_doc_setNumThreads
2013-02-14 19:07:41 +04:00
Markus Schoeler
ddb0afbc44
Changed line 1266 in svm.cpp to allow the new kernels to be used
2013-02-14 15:28:10 +01:00
Vadim Pisarevsky
3c25ddd9ff
restored 8u->32f cvGetQuadrangleSubPix() mode (need better test for it)
2013-02-14 18:14:55 +04:00
Daniil Osokin
5f32e0e24d
Rewrote doc for set-get number of threads functionality with support new frameworks (bug #2064 )
2013-02-14 17:11:16 +04:00
Daniil Osokin
6deda2531c
Fixed getNumThreads() for C=
2013-02-14 17:07:36 +04:00
Vladislav Vinogradov
78c924baad
removed obsolete CARMA toolchain and CMake variable
2013-02-14 16:27:17 +04:00
Andrey Kamaev
37c6357b97
Merge pull request #485 from jet47:gpu-new-functionality
2013-02-14 16:00:55 +04:00
Vadim Pisarevsky
78402bf596
made several minor fixes as pointed out by Andrey
2013-02-14 15:36:20 +04:00
Markus Schoeler
7cab6798c0
Added two kernels to existing SVM framework
...
Histogram intersection kernel (accessible by using SVM::INTER in CV namespace as kernel_type)
Exponetial chi2 kernel (accessible by using SVM::CHI2 in CV namespace as kernel_type)
Formulars:
Exp-CHI2
k(x,y) = exp(-gamma * CHI2(x,y))
CHI2(x,y) = 1- 2* SUM_i[(xi-yi)²/(xi+yi)]
Intersec
k(x,y) = SUM_i[min(xi,yi)]
2013-02-14 11:30:30 +01:00
Vladislav Vinogradov
a3a09cf4d1
refactored OpticalFlowDual_TVL1:
...
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
Andrey Kamaev
8547984d29
Merge pull request #486 from amroamroamro:2.4
2013-02-14 11:21:16 +04:00
Andrey Kamaev
37e2664cf0
Merge pull request #479 from ilya-lavrenov:TestHighGUI
2013-02-14 11:21:01 +04:00
kobigurk
18a5b8dfc6
fixed tab indent
2013-02-13 14:21:34 +02:00
Amro
42a2cb0a38
add description of ddepth param of cv::boxFilter
...
bug #2709
2013-02-13 15:16:17 +03:00
kobigurk
88e0127f44
API of TiffDecoder back to what it was - normalizeChannelsNumber moved to protected
...
test code unified - channels number is tested for other formats as well
2013-02-13 14:13:36 +02:00
Vladislav Vinogradov
2181a41a07
added perf4au app
2013-02-13 15:58:24 +04:00
Vladislav Vinogradov
50f28c9e25
added Warp::reduce function
2013-02-13 15:57:55 +04:00
Vladislav Vinogradov
36e42084f0
added gpu BM optical flow implementation
2013-02-13 15:57:40 +04:00
Vladislav Vinogradov
fe2e89df1b
added gpu::HoughLinesP function
2013-02-13 15:56:58 +04:00
Vladislav Vinogradov
86bd325131
added gpu::normalize function
2013-02-13 15:55:58 +04:00
Vladislav Vinogradov
61b54149b1
added mask support to gpu norm and sum
2013-02-13 15:54:50 +04:00
Vladislav Vinogradov
08914aa708
added gpu compare with scalar
2013-02-13 15:53:03 +04:00
Vladislav Vinogradov
a828b60765
added enqueueHostCallback method to gpu::Stream
2013-02-13 15:51:27 +04:00
Vladislav Vinogradov
ce2fd7fec9
added dual tvl1 optical flow gpu implementation
2013-02-13 15:50:05 +04:00
Vladislav Vinogradov
1498d2f427
added dual tvl1 optical flow implementation
2013-02-13 15:42:58 +04:00
kobigurk
109e047a28
* img_test is now tested for channel numbers instead of img
...
* fixed indentation to use spaces and trailing spaces
2013-02-13 13:33:07 +02:00
Vadim Pisarevsky
77d647b675
2 more warnings on Windows fixed
2013-02-13 02:32:10 +04:00
Vadim Pisarevsky
bd063e47d7
fixed the remaining warning in houghlines
2013-02-13 01:47:17 +04:00
Vadim Pisarevsky
8f33e80515
fixed bug in the new version of cornerSubPix
2013-02-13 01:46:02 +04:00
Vadim Pisarevsky
16d825adbc
fixed compile warnings and opencv_perf_imgproc failures
2013-02-13 01:23:57 +04:00
Vadim Pisarevsky
944588e732
converted houghlines to C++
2013-02-12 23:16:06 +04:00
Vadim Pisarevsky
7f8c925319
finished distance transform; fixed warnings
2013-02-12 21:35:37 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
ac389507a0
Fix warnings from ffmpeg wrapper
2013-02-12 19:58:59 +04:00
Vadim Pisarevsky
05ea571b08
almost finished distance transform conversion (discrete voronoi diagram mode is not ready yet)
2013-02-12 18:56:22 +04:00
Vadim Pisarevsky
9124a76ae7
converted moments function to C++
2013-02-12 18:07:22 +04:00
Vadim Pisarevsky
59a5ba8938
converted watershed + pyrmeanshiftfilter to C++
2013-02-12 17:08:42 +04:00
Andrey Kamaev
8b7a28a7e4
Merge pull request #477 from asmorkalov:android_version_info
2013-02-12 17:06:27 +04:00
Andrey Kamaev
0cf9c16adc
Merge pull request #478 from jet47:gpu-reduction-fix
2013-02-12 17:06:07 +04:00
Andrey Kamaev
7c77b402db
Merge pull request #468 from kirill-kornyakov:test-for-saturate-cast
2013-02-12 17:04:54 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Ilya Lavrenov
5512f91d08
removed libstdc++ dependency
2013-02-12 14:20:23 +04:00
kobigurk
9f80c6c989
added test for 4 channel tiff
2013-02-12 11:21:51 +02:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Vladislav Vinogradov
fdb07a0ac1
fix performance issue of gpu reduction
2013-02-12 09:50:41 +04:00
Vadim Pisarevsky
06f4a56469
converted flood fill, getrectsubpix & cornersubpix to C++
2013-02-11 23:49:10 +04:00
Andrey Kamaev
b6e7aeabe0
Merge pull request #476 from apavlenko:eclipse_import_fix
2013-02-11 21:38:07 +04:00
Andrey Kamaev
3990564a83
Merge pull request #470 from kirill-kornyakov:bug_2788_testing_add_method_for_column
2013-02-11 21:16:39 +04:00
Andrey Kamaev
2495b23a7d
Merge pull request #473 from prclibo:2.4
2013-02-11 20:48:03 +04:00
Andrey Kamaev
059ea5bebe
Merge pull request #471 from apavlenko:jar_install
2013-02-11 20:46:48 +04:00
Andrey Pavlenko
54bcaa4934
fixing eclipse import errors that can also be fixed via 'Fix Project Properties' menu
2013-02-11 19:49:18 +04:00
Bo Li
92e7e7d8e8
fix issue 2788
2013-02-11 15:09:42 +01:00
Kirill Kornyakov
74e5650350
Reenabled second test
2013-02-11 16:53:41 +04:00
Andrey Kamaev
5cae645ba1
Temporary disabled parallel_writers_and_readers test
2013-02-11 16:52:20 +04:00
Andrey Pavlenko
b337d84adf
configure desktop Java install, making JNI library name correct, and making it fat when possible
2013-02-11 16:28:19 +04:00
Kirill Kornyakov
7071bd63ab
Added two tests to highlight bug #2788
2013-02-11 15:25:15 +04:00
Kirill Kornyakov
81b9f9b16b
Added a test that documents that negative numbers are not clipped by cv::saturate_cast
2013-02-11 14:58:38 +04:00
Andrey Kamaev
1869f77c0f
Merge pull request #457 from taka-no-me:fix_vars_expansion
2013-02-11 14:37:14 +04:00
Andrey Kamaev
ffb3b5ddbe
Adjust OpenCV version to 2.4.4
2013-02-11 14:17:29 +04:00
Andrey Kamaev
2ed6bc8aaf
Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
...
This reverts commit 4abf0b3193
2013-02-11 14:15:29 +04:00
Andrey Kamaev
9d7300f003
Merge pull request #465 from asmorkalov:android_camera_connect
2013-02-11 14:05:37 +04:00
Andrey Kamaev
5335c2f920
Merge pull request #464 from asmaloney:missing_fclose
2013-02-11 14:03:51 +04:00
Andrey Kamaev
2a98c1f89c
Merge pull request #446 from AnnaKogan8:updated-perf-timing-script
2013-02-11 14:02:39 +04:00
Alexander Smorkalov
283b26e2db
Issue in NativeCameraView and JavaCameraView fixed.
...
In previous version getWidth() and getHeight() values were used instead method parameters.
2013-02-11 09:43:44 +04:00
Andy Maloney
2075236757
If generating a bin file (second half of conditional), make sure the file is closed
...
(Also fix spelling in comment)
2013-02-10 21:55:20 -05:00
kobigurk
7927ebf20e
alpha channels support for 8-bit tiffs
2013-02-10 01:22:49 +02:00
Andrey Kamaev
716e0192b3
Merge pull request #456 from vpisarev:python_ptseq_fix
2013-02-08 18:52:04 +04:00
Andrey Kamaev
3ed6c09485
Merge pull request #428 from bitwangyaoyao:2.4_erode_dilate
2013-02-08 18:48:37 +04:00
Andrey Kamaev
504264ab7b
Merge pull request #402 from asmorkalov:samples_data_rase_fix
2013-02-08 18:48:13 +04:00
Andrey Kamaev
46ca5c32cd
Merge pull request #455 from AlexeySpizhevoy:2.4
2013-02-08 18:45:24 +04:00
Andrey Kamaev
4f4fe553bc
Merge pull request #450 from bitwangyaoyao:2.4_dft
2013-02-08 18:43:34 +04:00
Andrey Kamaev
571665b559
Fix CMake variables substitution in Android project files
2013-02-08 18:21:49 +04:00
Vadim Pisarevsky
43d61d961e
fixed problem with Nx2 numpy arrays in geometrical functions ( #2783 )
2013-02-08 18:11:56 +04:00
Alexey Spizhevoy
e0ead7b606
fixed assertion failure (vector out of range) for the 'vc10,debug' build ( #2775 )
2013-02-08 17:44:57 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
yao
0b365f6aa5
add +-*/ operators to oclMat
2013-02-08 11:41:46 +08:00
yao
4d6827212d
some bugs fix in using AmdFft library
2013-02-08 10:46:43 +08:00
Anatoly Baksheev
79d5724794
BP doc change according to Adrian's request (OpenCV book co-author)
2013-02-07 22:31:39 +04:00
Anna Kogan
51e58aeb25
Added --failed-only option and multiple input files support
2013-02-07 19:08:31 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Andrey Kamaev
afe85e7e51
Fix some warnings from -O0 build
2013-02-06 20:57:36 +04:00
LeonidBeynenson
203849d5e4
The next attempt to fix a build error on Mac.
2013-02-06 18:07:02 +04:00
Andrey Kamaev
93d4abecf8
Merge pull request #443 from taka-no-me:fix_cascade_test
2013-02-06 16:40:38 +04:00
LeonidBeynenson
50cd5d9ce7
Try to fix Mac compilation issue.
2013-02-06 15:31:51 +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
Vladislav Vinogradov
bb3b1441c5
added 8u type support to filterSpeckles function
2013-02-06 14:14:45 +04:00
Andrey Kamaev
bf575ba7fb
Merge pull request #434 from taka-no-me:fix_parallel_writer_test
2013-02-06 14:04:59 +04:00
Andrey Kamaev
7cdede0c55
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
2013-02-06 14:04:28 +04:00
yao
e31e924cf7
remove the warnings in accuracy test
2013-02-06 09:12:40 +08:00
Andrey Kamaev
fe0516c877
Merge pull request #432 from bitwangyaoyao:2.4_blend
2013-02-05 14:53:49 +04:00
Andrey Kamaev
53e77ed468
Merge pull request #431 from snosov1:matchTemplate-tegra
2013-02-05 14:50:15 +04:00
yao
568b935246
remove a warning on Linux
...
fix a error in doc
2013-02-05 17:16:40 +08:00
LeonidBeynenson
b85a098d9c
Added float, uint64, and uchar params to Algorithm
...
Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get.
2013-02-04 20:25:18 +04:00
Alexander Smorkalov
3ef588b877
onCameraFrame callback signature changed. CvCameraFame interface added.
...
New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.
2013-02-04 17:43:45 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
f608df9640
Merge pull request #427 from vrabaud:brisk_fixes_2.4
2013-02-04 17:10:02 +04:00
Sergei Nosov
c0e3d48ebc
stricter eps for normed methods
2013-02-04 16:02:01 +04:00
Andrey Kamaev
4d785fff99
Merge pull request #409 from asmorkalov:giganetix_cams_patch_master
2013-02-04 14:57:14 +04:00
Andrey Kamaev
727b6a7259
Merge pull request #408 from asmorkalov:giganetix_cams_patch
2013-02-04 14:56:54 +04:00
Andrey Kamaev
3c39e146a3
Make parallel video writer test pass if compiled without threading support
2013-02-04 14:34:44 +04:00
Vincent Rabaud
d235c3a678
define the default remapping in the right scope
2013-02-04 11:08:00 +01:00
Vincent Rabaud
0b1599d88a
write documentation for BRISK
2013-02-04 11:07:53 +01:00
yao
9711ef6dee
blend use vector to optimize
2013-02-04 17:29:20 +08:00
Sergei Nosov
15d0484485
matchTemplate perf tests added
2013-02-04 12:57:22 +04:00
Sergei Nosov
c768731e89
enable Tegra optimizations
2013-02-04 12:57:03 +04:00
Andrey Kamaev
9c939a8dcf
Merge pull request #420 from asmaloney:check-mem-alloc
2013-02-04 12:56:36 +04:00
Andrey Kamaev
5a767863bd
Merge pull request #413 from berak:master
2013-02-04 12:56:12 +04:00
Andrey Kamaev
650609aaeb
Merge pull request #429 from bitwangyaoyao:2.4_setdevEx
2013-02-04 12:03:24 +04:00
Andrey Kamaev
6dc3b662f6
Merge pull request #425 from asmaloney:vector_empty
2013-02-04 12:03:03 +04:00
Andrey Kamaev
58c4d5f4b4
Merge pull request #424 from asmaloney:additional-checks
2013-02-04 12:02:43 +04:00
Andrey Kamaev
fc4a2244fa
Merge pull request #421 from asmaloney:check-mem-alloc2
2013-02-04 12:02:28 +04:00
Andrey Kamaev
37460acb21
Merge pull request #410 from taka-no-me:fix_cap_dshow_setfps
2013-02-04 11:57:33 +04:00
Andrey Kamaev
e2536f1c35
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
2013-02-04 11:54:43 +04:00
yao
a639a1ae5c
add setDeviceEx interface
...
simplify the logic of save binary
2013-02-04 15:06:36 +08:00
yao
3c5cb4931e
simplify the kernel logic when using rect kernel or without ROI
2013-02-04 13:33:27 +08:00
marina.kolpakova
7c98735c0d
add compute capability check
2013-02-03 22:44:13 +04:00
Andy Maloney
ac8744af6a
No need to check vector size before clear()
2013-02-02 19:00:41 -05:00
Andy Maloney
c8cad0857e
Remove unused constructor
...
Add checks for valid values
Fix wording on some errors
2013-02-02 16:09:10 -05:00
Andy Maloney
b79e8053c1
Check memory allocation
...
Declare vars as locally as possible
2013-02-02 08:44:25 -05:00
Andy Maloney
b497380a68
Check memory allocation
...
Initialize local variables
2013-02-02 08:33:40 -05:00
Andrey Kamaev
2a669555de
Merge pull request #414 from asmaloney:remove-unused-vars2
2013-02-02 14:34:47 +04:00
Andy Maloney
3154cdf8ac
Fix subtle bug when src & dst agree on sparsity but have different dimensions
...
Remove unused var "total"
Declare vars as locally as possible
2013-02-01 22:57:22 -05:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
berak
baf2b87a0d
Update modules/contrib/include/opencv2/contrib/contrib.hpp
...
class LevMarqSparse is not tagged CV_EXPORTS,
so the contrib module, built the on win using vs won't contain that symbol,
trying to create an instance of LevMarqSparse will lead to a 'undefined symbol' err, because it did not make it into the library.
2013-02-01 21:13:55 +01:00
cuda-geek
f52ce6529b
Merge pull request #322 from cuda-geek:training
2013-02-01 18:45:12 +04:00
Andrey Kamaev
0cd8684ade
Fix setting of FPS after frame width and height with DShow cameras
...
Issue #2114
2013-02-01 18:01:13 +04:00
cuda-geek
db9de43fa5
Merge pull request #407 from taka-no-me:fix_java_after_surf_change
2013-02-01 17:48:21 +04:00
marina.kolpakova
cc538ddfa6
changes related with code review
2013-02-01 17:47:05 +04:00
Andrey Kamaev
6f1961031c
Update regression checks in Java test
...
This follows SURF changes in 1f261c2
2013-02-01 17:16:28 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
LeonidBeynenson
87b0126e0d
Fixed dummy warning.
2013-02-01 16:16:43 +04:00
Alexander Smorkalov
25086ed257
Smartek Giganetix Cameras support (Patch #2192 ) integrated.
2013-02-01 16:07:32 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
LeonidBeynenson
013d54c230
Changed types of some variables from int64 back to int.
...
Also corrected some indexes to be size_t.
2013-02-01 14:41:14 +04:00
marina.kolpakova
f7ac73998a
code review fixes
2013-02-01 14:36:06 +04:00
marina.kolpakova
14ac8a528e
final refactoring and test for training
2013-02-01 14:36:06 +04:00
marina.kolpakova
d314c602d5
add documentation for new classes
2013-02-01 14:36:06 +04:00
marina.kolpakova
1613aa45bc
fix python bindings
2013-02-01 14:36:06 +04:00
marina.kolpakova
fa15fcc53e
move feature pool to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
0b039f3c6b
refactor feature pool
2013-02-01 14:36:06 +04:00
marina.kolpakova
b4aa33b6d3
move ICF -> ChannelFeature
2013-02-01 14:36:06 +04:00
marina.kolpakova
a01f596474
update documentation for softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
7f80054dfd
move miscellaneous python scripts to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
4ba8b53152
split public interface and realization for SoftCascadeOctave
2013-02-01 14:36:06 +04:00
marina.kolpakova
f3227c3f1a
merged ICFPreprocessor and Channels -> ChannelFeatureBuilder
2013-02-01 14:36:06 +04:00
marina.kolpakova
49ec664238
add IntegralChannelComputer
2013-02-01 14:36:05 +04:00
marina.kolpakova
716a9ccb71
move training to softcascade module
...
rename Octave -> SoftCascadeOctave
2013-02-01 14:36:05 +04:00
marina.kolpakova
61441a1014
rename SCascade -> SoftCascadeDetector
2013-02-01 14:36:05 +04:00
marina.kolpakova
1b43b0e2df
move soft cascade functionality into dedicated module
2013-02-01 14:36:05 +04:00
marina.kolpakova
decb137185
use long seeds only for 64 bit systems
2013-02-01 14:35:29 +04:00
marina.kolpakova
b0905c67ba
minor
2013-02-01 14:35:28 +04:00
marina.kolpakova
16aacf1780
use long seeds
2013-02-01 14:35:27 +04:00
marina.kolpakova
e903ce10ce
fix wartings for 32bit build
2013-02-01 14:35:27 +04:00
marina.kolpakova
a28f5a89b3
move preprocessor to objdetect
2013-02-01 14:35:27 +04:00
marina.kolpakova
8672ae58e2
fix globbing under win
2013-02-01 14:34:40 +04:00
marina.kolpakova
e2de3b0b81
fix build inder mac
2013-02-01 14:34:40 +04:00
marina.kolpakova
dc12b4476a
suppress debug out for soft cascade Octave
2013-02-01 14:34:40 +04:00
marina.kolpakova
e35eebd4d4
fix android build
2013-02-01 14:34:40 +04:00
marina.kolpakova
e47f58f4ce
replace Mats to Input/OutputArrays for Octave's public interface
2013-02-01 14:34:40 +04:00
marina.kolpakova
e7bab669fa
replace cv::Mat to Input/Output arrays
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0f2203f22
raplase error output on CV_Error
2013-02-01 14:34:40 +04:00
marina.kolpakova
dd8de0c41f
move soft cascade octave to ml module
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0e93d0482
move image extraction logic from Octave to Dataset class
2013-02-01 14:34:40 +04:00
marina.kolpakova
a3600b94db
created abstract FeaturePool class
2013-02-01 14:34:40 +04:00
marina.kolpakova
d4d47b1e58
restore backword compatibility
2013-02-01 14:34:39 +04:00
marina.kolpakova
a8d0e04912
amplement weidhting according to L. Bourdev and J. Brandt paper "Robust Object Detection Via Soft Cascade"
2013-02-01 14:34:39 +04:00
Vadim Pisarevsky
51eba617a8
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev
2013-02-01 14:01:44 +04:00
Andrey Kamaev
b179e2dd2d
Merge pull request #396 from vpisarev:facedetect_fixes
2013-02-01 12:49:48 +04:00
Andrey Kamaev
992d47e9dc
Merge pull request #400 from ilysenkov:bugfix_2560
2013-02-01 12:05:48 +04:00
Andrey Kamaev
5ef58a474a
Merge pull request #397 from ilysenkov:bugfix_2677
2013-02-01 12:04:38 +04:00
Andrey Kamaev
0b6677f6d3
Merge pull request #398 from ilysenkov:bugfix_2330
2013-02-01 11:19:33 +04:00
Vadim Pisarevsky
638c0d1bf4
fixed compile warnings
2013-02-01 10:47:27 +04:00
Andrey Kamaev
57aa089ad6
Merge pull request #392 from vpisarev:python_fixes2
2013-02-01 10:20:52 +04:00
Ilya Lysenkov
b24e4bddb1
Documented the TermCriteria class ( #2560 )
2013-02-01 10:16:30 +04:00
Ilya Lysenkov
7745c8806c
Added info() method in descriptor matchers ( #2330 )
2013-02-01 02:23:40 +04:00
Ilya Lysenkov
098ea6fcb7
Checked key_size in LSH table for validness ( #2677 )
2013-01-31 23:19:19 +04:00
Ilya Lysenkov
1becbd9fcc
Added a test for invalid key sizes in LSH tables
2013-01-31 23:17:07 +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
Andrey Kamaev
39b4bf1828
Merge pull request #390 from taka-no-me:fix_relative_error_check
2013-01-31 21:32:45 +04:00
Andrey Kamaev
a8c014de33
Merge pull request #318 from AnnaKogan8:fixed-perf-tests
2013-01-31 21:01:44 +04:00
Andrey Kamaev
13d2412d24
Merge pull request #394 from taka-no-me:fix_tiff_test
2013-01-31 20:52:35 +04:00
Andrey Kamaev
34ef209940
Merge pull request #393 from Daniil-Osokin:bugfix_doc_multi_issues
2013-01-31 20:30:33 +04:00
Vadim Pisarevsky
54e0765d80
yet another minor fix in cv::transpose()
2013-01-31 20:26:16 +04:00
cuda-geek
d874d93e24
Merge pull request #372 from cuda-geek:gpu-cascade-fixes
2013-01-31 20:13:31 +04:00
Vadim Pisarevsky
7ca38d63d9
fixed failure of the C++ test for estimateAffine3D
2013-01-31 19:44:16 +04:00
LeonidBeynenson
6de422701a
Made changes to allow ml module to work with big data.
2013-01-31 19:37:20 +04:00
Andrey Kamaev
55b90d7bae
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test
2013-01-31 18:51:24 +04:00
Daniil Osokin
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
Vadim Pisarevsky
79e278c008
applied patch #2587
2013-01-31 16:19:20 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Vadim Pisarevsky
82b6419d12
added tests for fast (ticket #2613 ) and estimateAffine3D ( #2375 )
2013-01-31 16:15:40 +04:00
Andrey Kamaev
e3b45910aa
Temporary disable unstable Features2d_RotationInvariance_Detector_SIFT test
2013-01-31 16:06:22 +04:00
Andrey Kamaev
e63b4591ff
Suppress clang build warning
2013-01-31 16:01:04 +04:00
Andrey Kamaev
4f1913ed26
Correct tolerance value for sanity checks with ERROR_RELATIVE
...
Use min/max bounds instead of local value to calculate acceptance threshold.
Threshold based on local values somethimes does not work because cancellation
of big values may produce error bigger than local value.
2013-01-31 15:47:14 +04:00
Vadim Pisarevsky
abd9675a99
fixed bugs #1718 , #2375 ; attached the new tests to test.py.
2013-01-31 15:34:09 +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
cuda-geek
bf53ebd590
Merge pull request #381 from vpisarev:surf_fixes
2013-01-31 13:36:10 +04:00
cuda-geek
fe30da6e2c
Merge pull request #387 from taka-no-me:fix_dshow_fourcc_conversion
2013-01-31 13:26:26 +04:00
Andrey Kamaev
fda32d3d8d
Merge pull request #382 from cuda-geek:fix-broken-links-bug-2689
2013-01-31 13:08:01 +04:00
Evgeny Talanin
50c2f87add
Fix and test for #2607
2013-01-31 12:23:08 +04:00
cuda-geek
f3ae185fd0
Merge pull request #383 from cuda-geek:apply-opencv-macosx-patch
2013-01-31 12:04:13 +04:00
Andrey Kamaev
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
Andrey Kamaev
e0426148ba
Merge pull request #374 from ivan-korolev:fix_estimateRigidTransform
2013-01-30 20:26:54 +04:00
marina.kolpakova
8b3c717e8f
apply patch #2686
2013-01-30 20:20:06 +04:00
cuda-geek
e72c7736e7
Merge pull request #375 from taka-no-me:fix_opticalflow_2075
2013-01-30 20:18:53 +04:00
Andrey Kamaev
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Andrey Kamaev
33c26a93c6
Merge pull request #376 from taka-no-me:solve_tiff_conflict
2013-01-30 19:36:09 +04:00
marina.kolpakova
5b03d47fb8
fix broken links in cascade classification documentation
2013-01-30 19:28:16 +04:00
cuda-geek
bc53a054f2
Merge pull request #380 from asmorkalov:java_test_fix2
2013-01-30 19:03:35 +04:00
cuda-geek
31d3c508db
Merge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build
2013-01-30 18:59:56 +04:00
Vadim Pisarevsky
1f261c2f9d
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.
2013-01-30 18:07:37 +04:00
Alexander Smorkalov
5bc6365ba5
TestCheckVector java test fixed. Warning fixed.
2013-01-30 17:28:22 +04:00
Andrey Kamaev
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Ivan Korolev
eaa5012163
fix v4l yes-yes build
2013-01-30 17:04:33 +04:00
Andrey Kamaev
11871528ce
Solve conflict between tiff.h and opencv2/core/types_c.h
...
Сonflict exists between some versions of libtiff and opencv headers
2013-01-30 16:36:50 +04:00
Andrey Kamaev
c9d8e9900f
Allow input of calcOpticalFlowPyrLK be submats of different size images
...
This fixes bug #2075
2013-01-30 16:07:55 +04:00
Andrey Kamaev
6a29b13c45
Add test for issue #2075
2013-01-30 16:07:38 +04:00
marina.kolpakova
cb329400df
fix tests
2013-01-30 15:55:04 +04:00
marina.kolpakova
8d9c9c2690
integrate new cascade format to GPU soft cascade implementation
2013-01-30 15:55:04 +04:00
Ivan Korolev
b362affd13
Fixed bug in the cv::estimateRigidTransform ( #1949 )
2013-01-30 15:27:23 +04:00
Ilya Lysenkov
3c8787980c
Fixed cvDestroyAllWindows() without windows in QT ( #2440 )
2013-01-30 15:26:49 +04:00
Ilya Lysenkov
56fbcc541f
Tested cvDestroyAllWindows() without windows
2013-01-30 15:25:10 +04:00
Andrey Kamaev
3a55fb9d1b
Merge pull request #365 from ivan-korolev:fix_HoughLines_segfault
2013-01-30 15:16:30 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
52b32ba8f0
Merge pull request #371 from taka-no-me:fix_build
2013-01-30 15:06:19 +04:00
Andrey Kamaev
b6de1fccc3
Merge pull request #370 from ilysenkov:bugfix_1747
2013-01-30 14:42:10 +04:00
Andrey Kamaev
62b9180c50
Merge pull request #368 from ilysenkov:checkSubset-fix
2013-01-30 14:41:37 +04:00
Andrey Kamaev
81f5e72630
Merge pull request #366 from asmorkalov:gstreamer_codec_list
2013-01-30 14:41:22 +04:00
Andrey Kamaev
8d9af7de61
Merge pull request #362 from Daniil-Osokin:bugfix_doc_StereoSGBM
2013-01-30 14:41:06 +04:00
Andrey Kamaev
ae7460440e
Merge pull request #361 from taka-no-me:tiff_big_tile
2013-01-30 14:40:51 +04:00
Andrey Kamaev
86b4b30a6d
Merge pull request #358 from taka-no-me:objc_exceptions
2013-01-30 14:40:32 +04:00
Andrey Kamaev
e79e81c6cd
Fix Windows build warnings
2013-01-30 13:24:49 +04:00
Ilya Lysenkov
6feade3110
Added support of different resolution in rectify3Collinear
2013-01-30 13:19:12 +04:00
Andrey Kamaev
eeb865ee8a
Fix Android build warnings
2013-01-30 13:11:33 +04:00
Ilya Lysenkov
9ce2197e9d
Added processing of trivial subsets
2013-01-30 13:03:03 +04:00
Alexander Smorkalov
82e325cbfa
Patch #2721 More FourCC for gstreamer applied.
2013-01-30 11:44:14 +04:00
Ivan Korolev
9908ff33de
Added regression test for HoughLines algorithm
2013-01-30 11:27:19 +04:00
Daniil Osokin
f9de98ec64
Fixed proposed values for speckleRange in StereoSGBM docs (bug #1937 )
2013-01-30 09:02:17 +04:00
Andrey Kamaev
62ce815197
Fix rollover when computing buffer size in tiff decoder (bug #2161 )
2013-01-30 00:07:33 +04:00
Andrey Kamaev
b4d0dff4c5
Added minimal support for tiff encoder parameters and test for issue #2161
2013-01-30 00:07:30 +04:00
Andrey Kamaev
daa02aaa98
Merge pull request #360 from vpisarev:sift_fixes
2013-01-29 20:39:13 +04:00
Vadim Pisarevsky
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
0b1fe53a46
Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657 )
2013-01-29 17:09:23 +04:00
Andrey Kamaev
ab8d92e1b8
Rebase and merge pull request #342 from ilysenkov/bugfix_2470
2013-01-29 15:53:42 +04:00
Ilya Lysenkov
5021a792b1
Fixed #2470
2013-01-29 15:53:28 +04:00
Ilya Lysenkov
fe86f31f44
Added a test of CvModelEstimator2::checkSubset(...)
2013-01-29 15:53:28 +04:00
Andrey Kamaev
98fdd70466
Merge pull request #339 from vpisarev:core_fixes
2013-01-29 15:51:22 +04:00
Andrey Kamaev
287fb2c611
Fix build warning
2013-01-29 14:52:03 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Andrey Kamaev
63873a8393
Merge pull request #355 from asmaloney:copy_paste_cond
2013-01-29 14:13:01 +04:00
Andrey Kamaev
519e23bf0b
Merge pull request #354 from asmaloney:fix_mem_dealloc
2013-01-29 14:12:12 +04:00
Andrey Kamaev
da884b4e1d
Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic
2013-01-29 14:00:10 +04:00
Vadim Pisarevsky
e7cbf65280
Merge pull request #351 from vpisarev:python_fixes
2013-01-29 13:34:50 +04:00
Alexander Smorkalov
8c45b9d03d
Video IO perf tests guarded.
2013-01-29 11:09:49 +04:00
cuda-geek
04f01ed21d
Merge pull request #353 from asmaloney:arg_checks
2013-01-29 11:04:33 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andy Maloney
bdf189faac
{calib3d} Fix copy-paste error in conditional
2013-01-28 18:09:10 -05:00
Andy Maloney
5bd56e7464
Fix mem leak and mismatched new/delete
2013-01-28 17:57:19 -05:00
Andy Maloney
7a6475c3f9
Check pointers before using them in var init
2013-01-28 16:51:28 -05:00
Andrey Kamaev
2b4ffd1161
Merge pull request #350 from asmorkalov:android_java_warnings
2013-01-28 23:57:14 +04:00
Andrey Kamaev
3a9c978b5e
Merge pull request #348 from Daniil-Osokin:bugfix_YCrCb_formula
2013-01-28 23:56:42 +04:00
Andrey Kamaev
17130477c9
Merge pull request #344 from taka-no-me:improve_jpeg_encoder_errors
2013-01-28 23:56:01 +04:00
Vadim Pisarevsky
4044fbcb33
hopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193 ). added the corresponding test
2013-01-28 21:03:59 +04:00
Vadim Pisarevsky
2320ec76b4
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658 . Added tests for #2611 , #2505 , #2658
2013-01-28 20:45:00 +04:00
Vadim Pisarevsky
a519bbc617
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658 . Added tests for #2611 , #2505 , #2658
2013-01-28 20:44:47 +04:00
Alexander Smorkalov
ca98710640
Resolve warning in OpenCV Library project in Eclipse (Bug #2714 )
...
Warning in auto generated code was suppressed by project settings.
2013-01-28 19:44:58 +04:00
Vadim Pisarevsky
cd46a674d1
applied patch #2611 that also likely fixes #2505
2013-01-28 18:30:20 +04:00
Daniil Osokin
4c9c27b244
Fixed formula of YCrCb to RGB conversion (bug #2725 )
2013-01-28 18:29:01 +04:00
Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Vadim Pisarevsky
146ca61a27
added tests for #1373 , #2629 , #2719 ; fixed another bug in determinant(Matx<T,n,n>)
2013-01-28 17:27:08 +04:00
Patrick Welche
1a84bcc565
NetBSD video(4) support, patch 3 of 3
...
xioctl() assumes that ioctl takes int request. Cope with
int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".
2013-01-28 17:11:44 +04:00
Patrick Welche
681ffd9a21
NetBSD video(4) support, patch 2 of 3
...
* Decouple Video4Linux2 support from Video4Linux as existence of
v4l2 on a system does not imply support for v4l.
* Don't use V4L's struct video_window in V4L2 code.
* Removed __USE_GNU as comment says:
/* support for MJPEG is only available with libjpeg and gcc,
because it's use libjepg and fmemopen()
so replace with test for fmemopen() if found necessary.
2013-01-28 17:11:41 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
255cd61a8c
Improve error reporting of JPEG image encoder
...
OpenCV issue #2604
After this patch applied an attempt to encode empty images produces exception
saying "Raw image encoder error: Empty JPEG image (DNL not supported)"
2013-01-28 16:55:00 +04:00
Andrey Kamaev
7374445398
Fix integer overflow in NL-Means denoising on white input
...
Issues #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
7e92826efc
Add test for issue #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
d83914d478
Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module
2013-01-28 14:01:22 +04:00
Andrey Kamaev
8521ac5d21
Merge branch 'fix_jpg2000' into 2.4
2013-01-28 12:41:35 +04:00
Andy Maloney
e87355463f
{highgui} Fix copy-paste error in conditional
2013-01-26 16:38:01 -05:00
Vadim Pisarevsky
1df10553bb
fixed bugs #1373 , #2629 , #2719
2013-01-25 23:45:41 +04:00
Andrey Kamaev
d3aef0d378
Fix OpenCL build warnings
2013-01-25 18:41:06 +04:00
Andrey Kamaev
2e02654004
Fix build of Java tests
2013-01-25 17:08:36 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
d8f749da52
Merge pull request #337 from taka-no-me:ocl_appsdk
2013-01-25 16:23:36 +04:00
Andrey Kamaev
9509dfd1de
Fix OpenCL build warnings
2013-01-25 16:19:59 +04:00
Andrey Kamaev
dc11acf041
Merge pull request #336 from ivan-korolev:fix_relative_error_formula
2013-01-25 14:10:06 +04:00
Ivan Korolev
6385b0f7ed
Fixed a formula to calculate the relative error
2013-01-25 11:19:38 +04:00
Andrey Kamaev
ed949bc211
Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor
2013-01-25 00:53:42 +04:00
Andrey Kamaev
20de2f35f9
Merge pull request #325 from bitwangyaoyao:2.4_fixcanny
2013-01-25 00:46:35 +04:00
Andrey Kamaev
f9ed0037b3
Merge pull request #327 from bitwangyaoyao:2.4_vs2012
2013-01-25 00:46:20 +04:00
Andrey Kamaev
94e2b5c140
Merge pull request #305 from stephenfalken:2.4
2013-01-24 18:24:36 +04:00
Andrey Kamaev
d5b15d6523
Fix ocl build warnings
2013-01-24 17:08:30 +04:00
Siegfried Hochdorfer
195d501b43
fixed broken indentation
2013-01-24 11:40:35 +01:00
Andrey Kamaev
a441980d68
Fix debug build of Java warppers
2013-01-24 13:25:12 +04:00
Andrey Kamaev
3c4cfccc88
Merge pull request #321 from apavlenko:warp_sanity_check
2013-01-24 13:05:54 +04:00
Andrey Kamaev
0487067964
Merge pull request #317 from vpisarev:c2cpp_refactor_imgproc
2013-01-24 13:03:34 +04:00
yao
2aae501234
make ocl module compile on VS2012
2013-01-24 15:45:29 +08:00
yao
d574e6dc09
fix canny crash in bug #2279
2013-01-24 14:58:41 +08:00
yao
4f778436b5
ocl::cvtColor support YUV and YCbCr formats
2013-01-24 14:33:28 +08:00
Vadim Pisarevsky
efd00238e2
fixed warnings; restored fixed_size parameter in AutoBuffer
2013-01-23 21:47:58 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
9cb4292d5c
implemented Luv/Lab <-> RGB conversion
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
e446903aac
added more types support for gpu separable filters
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
281d036fcf
optimizations:
...
- new reduce implementation (with kepler optimizations)
- saturate_cast via asm command
- video SIMD instructions in element operations
- float arithmetics instead of double
- new deviceSupports function
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Vladislav Vinogradov
b7e6b5af1b
fixed tests (call resetDevice, if there was a gpu failure)
2013-01-23 21:05:04 +04:00
Andrey Kamaev
0773ab4d07
Merge pull request #315 from taka-no-me:java_on
2013-01-23 19:02:27 +04:00
Andrey Pavlenko
e287dea91b
fixing build warnings
2013-01-23 18:45:06 +04:00
Andrey Kamaev
2c32536bf4
Enable Java bindings on all platforms by default
2013-01-23 18:08:09 +04:00
Andrey Kamaev
caa2c06e50
Quiet output of cv::error in Java tests
...
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
2013-01-23 18:08:09 +04:00
Andrey Kamaev
5eabcf8e4f
Java tests: print summary for tests run
2013-01-23 18:08:09 +04:00
Andrey Kamaev
4668a133f0
Java API: fix build warning on OS X
...
Common part of all source files is extracted to special header
2013-01-23 18:08:09 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Pavlenko
81721d0dce
enabling sanity checks for warp and resize functions on Android
...
- add syntetic images generation function to ts
- use generated syntetic images
2013-01-23 17:25:30 +04:00
Andrey Kamaev
311d799344
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
2013-01-23 14:50:29 +04:00
yao
e05112a364
some host side optimizations to ocl::GaussianBlur
2013-01-23 14:48:04 +04:00
yao
9060365f5e
use format on filtering.cpp
2013-01-23 14:48:04 +04:00
yao
56c1a7fab6
make oclHaarDetectObjects running on more ocl platforms
2013-01-23 14:48:04 +04:00
yao
b5bd2cde9e
A few optimizations to ocl::pyrLK::sparse, make it running on more OCL platforms
2013-01-23 14:48:04 +04:00
yao
f6d82773f9
fix bug #2674
2013-01-23 14:48:04 +04:00
Andrey Kamaev
78dc44a7fd
Merge pull request #295 from apavlenko:test_surf_keypoints_invariance
2013-01-23 14:40:05 +04:00
Anna Kogan
608fab60fd
Added cleanup of keypoints vector
2013-01-22 18:05:18 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
c92743d124
Eliminate intermediate build target "opencv_java_api"
2013-01-22 17:59:00 +04:00
Vadim Pisarevsky
dc4d0398f3
converted few more comp. geometry functions to C++
2013-01-22 16:54:31 +04:00
mdim
93f8e7ba74
check of keypoint index range in drawMatches
2013-01-22 00:37:27 +04:00
cuda-geek
a8a842332b
Merge pull request #311 from cuda-geek:soft-cascade-refactoring-and-fixes
2013-01-22 00:27:02 +04:00
Andrey Kamaev
a45eb275e3
Merge pull request #306 from AnnaKogan8:perf_tests_timing.py-improvement
2013-01-21 18:10:08 +04:00
Vadim Pisarevsky
f14b7af5ac
changed diagnostic from "warning" to "note" in the python wrapper generator, to suppress some noise in opencv utilities
2013-01-21 15:00:32 +04:00
Andrey Kamaev
dda337bdf2
Merge pull request #303 from taka-no-me:fix_split_merge_test
2013-01-21 14:14:17 +04:00
Vadim Pisarevsky
c2241dccc5
converted fitline to C++, fixed Mat::checkVector().
2013-01-21 01:07:47 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Andrey Kamaev
d169f62d28
Merge pull request #307 from taka-no-me:lena.png
2013-01-19 12:02:33 +04:00
Andrey Kamaev
f3f55b30b0
Merge pull request #267 from pclove1:ocl_hough
2013-01-19 12:02:14 +04:00
Vadim Pisarevsky
457fa52111
convex hull converted to C++; other 2 functions in convhull.cpp are yet to be finished.
2013-01-19 00:26:01 +04:00
marina.kolpakova
e15bdea663
fix test for new cascade
2013-01-18 17:14:11 +04:00
marina.kolpakova
53433884ee
fix python wrapping
2013-01-18 15:58:48 +04:00
marina.kolpakova
f9649a029b
fix typo
2013-01-18 15:58:47 +04:00
marina.kolpakova
0a40bbd0d0
add two types of feature boxes support:
...
- (left, top, width, height)
- (left, top, right, bottom)
2013-01-18 15:58:47 +04:00
marina.kolpakova
913faf2ef4
fix test for a new test data
2013-01-18 15:58:47 +04:00
marina.kolpakova
9efd668a57
a bit refactored soft cascade
2013-01-18 15:58:47 +04:00
marina.kolpakova
f1b4b13e64
perf test
2013-01-18 15:58:47 +04:00
marina.kolpakova
0c6c78d149
integrate 128x256 scale; remove log
2013-01-18 15:58:47 +04:00
marina.kolpakova
e09694bde8
integrated 128x256 scale
2013-01-18 15:58:47 +04:00
marina.kolpakova
3e7965a5a5
first debug integration of newly trained cascade
2013-01-18 15:58:46 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
90ff4e6fc8
Convert test image to losless format
...
This fixes java tests failing with new jpeg versions
2013-01-17 20:43:57 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Siegfried Hochdorfer
82a9f9a5a9
MeanshiftGrouping Bugfix (Bug #2685 )
2013-01-17 11:46:24 +01:00
Vadim Pisarevsky
e3941d0965
refactored approxpoly
2013-01-17 00:11:08 +04:00
Andrey Pavlenko
a8c0f1d962
fixing test failure on some systems
2013-01-16 18:33:35 +04:00
Andrey Kamaev
ae5661d5dc
Fix random failures of Split and Merge tests
2013-01-16 17:55:27 +04:00
Andrey Kamaev
867ddebe07
Merge pull request #289 from jmbuena:master
2013-01-16 17:01:00 +04:00
Andrey Kamaev
7341eaa654
Merge pull request #296 from asmorkalov:html_docs_warning_fix
2013-01-16 16:44:13 +04:00
Suenghoon Park
06da75ffe0
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2013-01-15 12:21:25 -05:00
Andrey Kamaev
bf3c2b0bbb
Fix incorrect Mat address reconstruction on 64-bit platforms
...
This fixes random failures in Java wrappers.
2013-01-15 19:23:49 +04:00
Anna Kogan
0587bef667
Switched time from seconds to minutes
2013-01-15 15:32:22 +04:00
Anna Kogan
3cdfa654ae
Added 'Num of tests' col, changed headers, added 'overall time' row
2013-01-15 15:26:43 +04:00
Andrey Pavlenko
9f0d5f60b5
fixinf warning on non-Windows systems
2013-01-14 18:15:51 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Pavlenko
8e42ca1764
SURF keypoints rotation invariance test.
...
It calcs kpts for a cross and checks that 4 kpts at the edges have equal responce.
2013-01-14 14:06:00 +04:00
Andrey Kamaev
c49b23d4dd
Merge pull request #240 from emchristiansen:javatest2.4
2013-01-14 11:06:44 +04:00
jmbuena
28a7be69ea
Fixed compile warnings on CvHomographyEstimator
2013-01-12 12:32:51 +01:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Pavlenko
b0e1cb473a
more tests fixes
2013-01-11 09:13:25 +04:00
jmbuena
6d738f6a3f
Changed RANSAC Homography estimation for speed. Each minimal set is checked for consistency before actually fit a candidate homography.
2013-01-11 01:55:56 +01:00
Vadim Pisarevsky
19229f2fa0
Merge pull request #253 from Nerei:smart_operators_for_smart_ptr
2013-01-10 20:35:22 +04:00
Andrey Kamaev
a99799caa3
Merge pull request #286 from taka-no-me:tweak_phase_test_threshold
2013-01-10 19:57:23 +04:00
Andrey Kamaev
b1384a6da8
Fix cvCalcOpticalFlow when the status parameter is NULL
...
issue 2526
2013-01-10 18:14:08 +04:00
Andrey Kamaev
20c5a8788d
Weaken acceptance criteria in phase test
2013-01-10 17:12:14 +04:00
Andrey Kamaev
dff59ec960
Merge pull request #284 from taka-no-me:fix_equalize_hist_2678
2013-01-10 16:58:36 +04:00
Andrey Kamaev
59c6e2cc44
Merge pull request #283 from AnnaKogan8:perf_tests_timing.py-improved-console-output
2013-01-10 16:58:22 +04:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
Andrey Kamaev
6131a847a2
Fix histogram calculation in equalizeHist
...
issue #2678
2013-01-10 14:48:31 +04:00
Andrey Kamaev
b81d1b25c7
Merge pull request #280 from vpisarev:bug_fixes_jan9
2013-01-10 13:31:04 +04:00
Anna Kogan
3271e395c8
Improved console output
2013-01-10 13:19:59 +04:00
Anna Kogan
0d7ce141aa
Cleaned code
2013-01-10 13:18:26 +04:00
Anna Kogan
0334cf11cc
Fixed last testsuit disregarding
2013-01-10 13:16:46 +04:00
Vadim Pisarevsky
e383d39598
fixed bug #2679
2013-01-09 17:53:19 +04:00
Andrey Kamaev
399c20a928
Merge pull request #272 from 5kg:fix_haar
2013-01-09 16:53:11 +04:00
Andrey Kamaev
e34aba60d9
Merge pull request #278 from taka-no-me:fix_build_jpeg9
2013-01-09 16:52:56 +04:00
Andrey Kamaev
873aefae19
Merge pull request #279 from taka-no-me:mingw_java
2013-01-09 16:52:41 +04:00
Vadim Pisarevsky
46cf2e96b5
Merge pull request #265 from taka-no-me:doc_signatures
2013-01-09 15:40:39 +04:00
Andrey Kamaev
4e1ba6f02f
Fix build with libjpeg release 9
2013-01-08 19:55:29 +04:00
Anatoly Baksheev
a09b973c2e
Smart operators for smart Ptr (feature #2637 )
2013-01-07 22:33:12 +04:00
Suenghoon Park
269ccaa431
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2013-01-02 14:59:59 -05:00
Ilya Lavrenov
1bc76813f3
fixed bug connected with SSE2 version of resize with AREA interpolation
2012-12-31 15:35:40 +04:00
Andrey Kamaev
da9089612a
Fix build of java bindings on mingw
2012-12-30 23:24:39 +04:00
marina.kolpakova
e53d57664d
fix precompiled headers usage in gpu module
2012-12-30 16:58:41 +04:00
cuda-geek
47df8f4c2a
Merge pull request #275 from mdim:bug_fix_cvboost
2012-12-30 00:31:03 +04:00
Vladislav Vinogradov
bb07e2710e
decreased source size in NCV.VectorOperations test
2012-12-29 20:07:29 +04:00
marina.kolpakova
45191dd6a5
merge CUDA dev branch
2012-12-29 19:44:38 +04:00
Suenghoon Park
4f965296fc
modified performance test for ocl::HoughCircles
2012-12-28 16:32:10 -05:00
Maria Dimashova
0e2958e888
fixed CvBoost::predict
...
(Sometimes sample_data became bad because the buffer with its values was deallocated early).
2012-12-29 00:30:52 +04:00
Suenghoon Park
0afa9cede5
removed personal info from the license header
2012-12-28 10:08:28 -05:00
Zifei Tong
260bdc057c
Changed parallel_for to parallel_for_ in haar.cpp
2012-12-28 22:56:47 +08:00
Andrey Pavlenko
c49b1bc6d5
partial fix for failing tests; fix for Windows launcher script; more quiet output
2012-12-28 17:03:35 +04:00
Zifei Tong
e331787645
Fix race condition for Cascade Classifier when TBB enabled.
2012-12-28 20:51:02 +08:00
Andrey Kamaev
3759476b38
Merge pull request #266 from prclibo:master
2012-12-28 12:51:34 +04:00
Suenghoon Park
2124de80a5
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2012-12-26 17:40:38 -05:00
Suenghoon Park
8a1d6a1bb2
added documentation for ocl::HoughCircles
2012-12-26 17:40:26 -05:00
Suenghoon Park
b1faa46d3a
added performance test
2012-12-26 16:49:58 -05:00
Bo Li
956a029ede
added code, test and doc for five-point algorithm
2012-12-26 18:58:50 +01:00
Andrey Kamaev
b401c6a0c3
Fix discrepancies between function signatures in headers and documentation
2012-12-26 18:24:50 +04:00
Andrey Kamaev
aabbe11e64
Improve function arguments parsing and checking
...
* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors
2012-12-26 17:55:03 +04:00
Kirill Kornyakov
5023afffc7
Removed hack from perf test on HoughLines, since I hope it is fixed by pr263
2012-12-26 10:33:02 +04:00
Anatoly Baksheev
389ecbe96d
warnings, renamed Marina's GPU_PERF_TEST_P
2012-12-25 22:00:20 +04:00
Anatoly Baksheev
be22891f71
added GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app)
2012-12-25 21:23:15 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Kamaev
16687a2655
Explicitly use double precision sin & cos in hough implementation
...
On some platforms sin and cos are calculated in single precision resulting in
diversity of results.
2012-12-25 18:05:05 +04:00
Suenghoon Park
78202100df
added unit test for HoughCircles
2012-12-24 22:53:27 -05:00
Suenghoon Park
ecb6c20915
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
2012-12-24 18:42:22 -05:00
Suenghoon Park
e1c6564d5e
fixed a typo in ocl.hpp
2012-12-24 18:41:51 -05:00
Andrey Kamaev
02d1e68c64
Merge pull request #257 from AnnaKogan8:perf-tests-timing-script
2012-12-24 19:38:49 +04:00
Alexander Smorkalov
9ca65ceef8
OpenCV example-tutorial1 does not work on Android emulator (Bug #2656 )
...
Problems with Android 2.3.3 (API level 10) fixed;
Android 2.2 does not work due to unsupported camera frame format (known android-2.2 emulator issue).
2012-12-24 17:49:49 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Anna Kogan
f57d692cd7
Improved code
2012-12-24 17:09:04 +04:00
Anna Kogan
e1331b44f5
Wrote script generating timing table
2012-12-24 17:09:04 +04:00
Andrey Kamaev
014a500f79
Merge pull request #256 from znah:2.4
2012-12-24 16:11:19 +04:00
marina.kolpakova
2128bd25e4
fix warnings under win
2012-12-24 15:28:05 +04:00
marina.kolpakova
3882bbbf35
improve carma build
...
- exclude system paths from library search paths
- remove hardcoded paths to compiler
- enable compiling with 3d-parties
- enable build as shared libraries
2012-12-24 14:54:57 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
524bde2aeb
Merge pull request #255 from taka-no-me:fix_batchdist_test
2012-12-24 13:29:32 +04:00
Alexander Mordvintsev
20838b6f6e
fix #2643 : use SVD to solve least squares in cvStereoRectifyUncalibrated
2012-12-24 12:59:39 +04:00
Andrey Kamaev
02c7e221a3
Merge pull request #252 from taka-no-me:fix_stlport_build
2012-12-24 12:44:13 +04:00
Vladislav Vinogradov
4db68b50f2
fixed Sobel and Scharr tests
...
compare inner part
2012-12-23 14:21:16 +04:00
Andrey Kamaev
c02179a765
Revert "_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3"
...
This reverts commit 4be7619ce4
2012-12-22 21:14:14 +04:00
Andrey Kamaev
b870b246e1
Fix memory corruption in batchDistance perf tests
2012-12-22 21:01:57 +04:00
Andrey Kamaev
f87987ed72
Honor multidimensional matrices in InputArray::total
2012-12-22 17:56:02 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Andrey Kamaev
62af76c646
Merge pull request #249 from taka-no-me:tvl1_max_rmse
2012-12-21 23:05:44 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Andrey Kamaev
b6efec5f8b
Add support for Android NDK r8d
2012-12-21 15:39:23 +04:00
Andrey Kamaev
c513d4ecd6
Increase max RMSE error for tvl1 optical flow test
2012-12-21 14:18:07 +04:00
Vladislav Vinogradov
2f1ca1b6b3
fixed build for CARMA:
...
* added CMake toolchain file
* added WITH_NVCUVID flag
2012-12-21 13:45:50 +04:00
vlad
11293d071f
Revert "disabled video decoding under linux"
...
This reverts commit 889674ef43
2012-12-21 12:54:38 +04:00
Andrey Kamaev
9526907cba
Use .yml.gz format to reduce space requirement from ~260Mb to ~17Mb for ml tests
...
The size of temporary files is an issue on mobile platforms.
2012-12-20 18:46:54 +04:00
Andrey Kamaev
aaf779a3a2
Adjust OpenCV version to 2.4.3.2
2012-12-20 17:19:34 +04:00
Vladislav Vinogradov
660d23aa04
added cv::gpu::resetDevice to RunPerfTestBody
2012-12-20 15:33:04 +04:00
Vladislav Vinogradov
1a76242d99
added GPU_TEST_P macros
2012-12-20 15:33:04 +04:00
takacsd
64f821908e
Add missing _WIN32 check in core/operations.hpp.
...
Fix a compilation error with MinGW gcc 4.7 with enabled C++11 support (-std=c++11).
Issue number: #2555
2012-12-20 11:28:16 +01:00
Andrey Kamaev
ca7abe1239
Reduce number of performance tests for LBP cascade
2012-12-20 12:25:59 +04:00
Jason Newton
4cb25e9584
update documentation to latest connected components interface
2012-12-19 14:55:46 -08:00
Eric Christiansen
ad326cb0be
adds desktop java junit tests
2012-12-19 14:28:59 -08:00
Andrey Kamaev
35ac95930f
Merge pull request #236 from asmorkalov:javadoc_fix
2012-12-19 16:32:45 +04:00
Andrey Kamaev
b35fa6c4ff
Merge pull request #202 from Daniil-Osokin:calcHist
2012-12-19 15:07:40 +04:00
Alexander Smorkalov
d7c89fc649
A lot of javadoc warnings duting javadoc build (Bug #2647 ) issue fixed
...
Black list of entities, that are not implemented in Java API added to javadoc generator
2012-12-19 12:53:44 +04:00
Vladislav Vinogradov
4ba33fa1ed
Revert "call resetDevice if gpu test fails"
...
This reverts commit ab25fe9e37
2012-12-19 11:13:31 +04:00
Vadim Pisarevsky
a75e5ac277
Merge pull request #232 from asmorkalov:compiler_bug_workaround
2012-12-19 10:20:10 +04:00
Andrey Kamaev
2c56a09bee
Merge pull request #226 from taka-no-me/equalizeHist
...
Fix equalization formula in equalizeHist function & rewrite in C++
2012-12-18 15:53:13 -08:00
Vadim Pisarevsky
31857082f4
probably fixed build problems on Android
2012-12-18 14:12:07 -08:00
Daniil Osokin
98d7d99244
Add threaded version of equalizeHist
2012-12-18 23:59:50 +04:00
Vladislav Vinogradov
41c9377db0
fixed warnings under windows
2012-12-18 18:03:54 +04:00
Vladislav Vinogradov
ab25fe9e37
call resetDevice if gpu test fails
2012-12-18 16:59:00 +04:00
Alexander Smorkalov
dfa4b2fefa
Workaround for gcc overoptimization compiler bug.
2012-12-18 15:58:17 +04:00
Vladislav Vinogradov
0973e86d8a
fixed printShortCudaDeviceInfo for new CC
2012-12-18 13:56:21 +04:00
Vladislav Vinogradov
bac94f85c1
fixed printCudaDeviceInfo for 3.5 CC (Patch #2641 )
2012-12-18 13:50:19 +04:00
Vladislav Vinogradov
dd8e442bda
replaced DeviceInfo().supports with deviceSupports
2012-12-17 17:03:39 +04:00
Ilya Lavrenov
a319bae6e2
added #undef _mm_packus_epi32
2012-12-17 16:56:37 +04:00
Ilya Lavrenov
d246b41573
changed loop condition
2012-12-17 15:50:01 +04:00
Ilya Lavrenov
c2f2e33a5e
removed debug messages
2012-12-17 15:45:20 +04:00
Ilya Lavrenov
743dce6a4b
Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2
2012-12-17 15:27:32 +04:00
Ilya Lavrenov
aa0dafcc1f
replaced _mm_packs_epi32 to _mm_packus_epi32
2012-12-17 14:09:25 +04:00
Daniil-Osokin
cd501d947c
perf tests for calcHist 2-3D case
2012-12-17 12:35:32 +04:00
Daniil-Osokin
7d94236c14
TBB version of calcHist
2012-12-17 11:01:31 +04:00
Jason Newton
e1b60aa4e3
drop usage of macros... the type is already there!
2012-12-16 22:44:36 -08:00
Vladislav Vinogradov
da017fbeb9
fast optical flow bm implementation
2012-12-17 10:39:19 +04:00
Jason Newton
5f86eb8d63
proper dimensions from cv::Size in output stats/centroid
2012-12-16 18:33:50 -08:00
Vadim Pisarevsky
09be997ed8
Merge pull request #225 from pieleric:2.4
2012-12-16 22:18:24 +04:00
Vadim Pisarevsky
2508d8e2b4
Merge pull request #218 from taka-no-me:drop_utf16
2012-12-16 22:16:54 +04:00
Vadim Pisarevsky
1eae455acb
fixed build warnings from VS; hopefully, fixes Android build too
2012-12-15 23:14:50 +04:00
Anatoly Baksheev
94c310fc14
added Ptr::operator==
2012-12-15 22:48:50 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Andrey Kamaev
80a1d569ca
Add support for multidimentional matrices into the sanity checks
2012-12-15 20:15:34 +04:00
Jason Newton
ad0bfdfb25
disable windows build warning for connectedcomponents template argument comparisons
2012-12-15 05:56:18 -08:00
Jason Newton
68e77ac051
use opencv's integer type convension
2012-12-15 04:25:55 -08:00
Andrey Kamaev
3de6846d12
Merge pull request #224 from wswld:2.4
2012-12-15 16:06:32 +04:00
Andrey Kamaev
0bbba847a4
Fix equalization formula in equalizeHist function & rewrite in C++
...
Old implementation did
lut[i] = 255 * (count(Y <= i)) / (width * height)
which actually shifts uniform histograms.
From now histogram is equalized as
C = count(Y == min(Y))
lut[i] = 255 * (count(Y <= i) - C) / (width * height - C)
2012-12-15 15:29:15 +04:00
Éric Piel
7701fa7a63
highgui: fix segfault on CvCapture_GStreamer::open
...
when compiled with GStreamer, open (of a file) segfaults.
Fix was suggested by Bostjan Vesnicer.
2012-12-15 12:11:13 +01:00
cuda-geek
aabb40e34d
Merge pull request #217 from jet47:fix-tvl1-test
2012-12-15 00:45:12 +04:00
Andrey Kamaev
fe0b88d291
Set sanity threshold for TVL1 optical flow to 0.5
2012-12-14 18:35:23 +04:00
Ilya Lavrenov
6059a6875a
fixed bug with s1 calculating
2012-12-14 17:54:07 +04:00
Ilya Lavrenov
4ccb5a30d9
fixed bug with s1 calculating
2012-12-14 17:41:42 +04:00
Andrey Kamaev
1284121d89
Set sanity threshold for TVL1 optical flow to 0.02
2012-12-14 17:40:51 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Ilya Lavrenov
16f9b6f5e4
reproducing C++ version of resize area fast
2012-12-14 14:32:00 +04:00
Suenghoon Park
13c44dd318
finished ocl::HoughCircles
2012-12-14 03:25:46 -05:00
Vsevolod Glumov
3f417f1ec3
Fixes for issues #2570 , #2492 , #2559 , #2489 , #2592 .
2012-12-14 10:49:51 +04:00
Vladislav Vinogradov
caf91ac159
new gpu::HoughLinesP implementation
2012-12-13 17:18:25 +04:00
Vladislav Vinogradov
8c057af862
fixed windows build
2012-12-13 15:40:05 +04:00
Vladislav Vinogradov
da93a1dab9
fixed build for CARMA platform
2012-12-13 13:49:32 +04:00
Vladislav Vinogradov
889674ef43
disabled video decoding under linux
2012-12-13 13:48:24 +04:00
Suenghoon Park
0656f13107
removed useless comments in buildPointList_gpu()
2012-12-13 02:43:13 -05:00
Suenghoon Park
3a04cfedab
added HoughCircles in ocl.hpp
2012-12-13 02:35:31 -05:00
Suenghoon Park
ad86b80375
finished buildPointList
2012-12-13 02:33:21 -05:00
Andrey Kamaev
5a407153bd
Fix sanity checks in stitching test
2012-12-12 20:29:23 +04:00
Andrey Kamaev
817a4c0c30
Merge branch 2.4 into perf_verify_sanity
2012-12-12 20:14:25 +04:00
Andrey Kamaev
932204d197
Added thresholds to some sanity checks
2012-12-12 20:14:20 +04:00
Andrey Kamaev
e1afb1409f
Add --perf_verify_sanity option to performance tests
...
This option provides an easy way to identify tests having no regression data
for sanity checks
2012-12-12 19:42:24 +04:00
cuda-geek
464826c232
Merge pull request #181 from cuda-geek:nms
2012-12-12 15:39:20 +04:00
Vadim Pisarevsky
eaeae4a1ba
Merge pull request #184 from ilya-lavrenov:Demosaicing
2012-12-12 13:54:58 +04:00
marina.kolpakova
5ddf4e4ed7
change expected values for soft cascade test according to changes in implementation
2012-12-12 09:37:21 +04:00
marina.kolpakova
2d45af790e
fix according to pull requests comments
2012-12-12 05:07:39 +04:00
marina.kolpakova
88c71d1b7d
add NMS according to Dollar's paper.
2012-12-12 04:31:44 +04:00
marina.kolpakova
9785a8ae34
fix docs for SCascade
2012-12-12 04:22:01 +04:00
marina.kolpakova
c470e15d45
integrate speprocessing strategy
2012-12-12 03:43:20 +04:00
Andrey Kamaev
6e244c83cd
Corrected sanity checks in several perf tests
...
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
2012-12-12 01:00:47 +04:00
marina.kolpakova
d23a4f50bd
add resize
2012-12-12 00:39:40 +04:00
marina.kolpakova
8ef19e7664
hack luv
2012-12-12 00:39:40 +04:00
marina.kolpakova
0e1005ca92
optimize hog bin computing
2012-12-12 00:39:40 +04:00
marina.kolpakova
ee291a15da
add preprocessing only function
2012-12-12 00:39:40 +04:00
Ilya Lavrenov
d1ca934115
sse2 version of resize area fast for types CV_(8, 16)UC(1, 3, 4)
2012-12-11 15:14:50 +04:00
Vladislav Vinogradov
87e0eee92b
fixed remap and warp gpu tests
2012-12-11 14:38:08 +04:00
Vladislav Vinogradov
746bc168e6
fixed gpu warpAffine and warpPerspective with NPP
2012-12-11 11:05:06 +04:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Andrey Kamaev
67ce03d7dd
Merge branch 2.4
2012-12-10 23:51:34 +04:00
Andrey Kamaev
60ad505a63
Merge pull request #212 from taka-no-me/fix_2602
...
Prevent imread from illegal memory access (Bug #2602 )
2012-12-10 11:48:28 -08:00
Andrey Kamaev
f7dc98f67b
Merge pull request #205 from taka-no-me/gtest_r629
...
Update googletest to the latest upstream
2012-12-10 08:07:30 -08:00
Kirill Kornyakov
cdbbfc98e1
Ugly hack to make HoughLines sanity check pass on Wun32
2012-12-10 18:16:15 +04:00
Anatoly Baksheev
50946b59c1
minor device namespace refactor
2012-12-10 17:36:02 +04:00
Jason Newton
63debf5032
connectedcomponents test case
2012-12-10 02:21:45 -08:00
Ilya Lavrenov
615e7b2747
added SIMD optimization of Edge-Aware Demosaicing in case of CV_8U
2012-12-10 13:29:08 +04:00
Vladislav Vinogradov
53f1e73535
fixed Video_calcOpticalFlowDual_TVL1 test (Bug #2597 )
...
uses RMSE instead of bitwise equivalence
2012-12-10 13:03:47 +04:00
Vladislav Vinogradov
5fe9bb717d
fixed build under linux with OpenGL
2012-12-10 11:05:51 +04:00
Jason Newton
d094e4bdbe
drop support for 8bit output for size cost relative to utility
2012-12-08 23:09:17 -08:00
Jason Newton
e70b3ef598
use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays
2012-12-08 23:09:14 -08:00
Andrey Kamaev
18e77d606c
Drop functions working with multibyte characters
2012-12-08 18:18:11 +04:00
Andrey Kamaev
7c6191ec11
Refactored run.py script and temporary file generation logic
...
* use OPENCV_TEMP_PATH environment variable on all platforms
* fix cleanup after OpenCV tests on Windows
* add --list flag to output names of all tests found
* do not override user-passed --perf_min_samples and --perf_force_samples
options by --check flag
* fix complier checks inside run.py
2012-12-08 15:43:23 +04:00
marina.kolpakova
79c3a8e03b
fix build under win.
2012-12-07 16:56:54 +04:00
Vladislav Vinogradov
4102aaaf15
fixed compilation of color.cu under windows x86
...
it was some bug in nvcc (it fails on this file)
2012-12-07 14:16:18 +04:00
Vladislav Vinogradov
c6263eb253
fixed build with CUDA and witout OpenGL
2012-12-07 14:03:23 +04:00
Eugene Gritskevich
8ca86e2f52
Update modules/ml/doc/gradient_boosted_trees.rst
2012-12-06 21:44:55 +03:00
Andrey Kamaev
1821d21f5b
Prevent imread from illegal memory access (Bug #2602 )
...
The change is based on pull request #211 .
2012-12-06 19:42:17 +04:00
Vladislav Vinogradov
0d880479f0
updated nv perf test script (added opticalFlowBM and HoughLinesP)
2012-12-06 16:00:47 +04:00
Vladislav Vinogradov
aad76090ce
gpu::HoughLinesP
2012-12-06 15:14:20 +04:00
Vladislav Vinogradov
a6dc6f72b3
gpu::calcOpticalFlowBM
2012-12-06 15:11:13 +04:00
Vladislav Vinogradov
afa5809473
added additional performance tests
2012-12-05 17:21:08 +04:00
Vladislav Vinogradov
e17710c478
removed type check in gpu::FarnebackOpticalFlow
...
now it supports all depths
2012-12-05 14:20:48 +04:00
Vladislav Vinogradov
0930ac497f
removed type check in gpu::PyrLKOpticalFlow
...
not it support all depths
2012-12-05 14:20:18 +04:00
Vladislav Vinogradov
d94f08f0e7
added more types support for gpu separable filters
2012-12-05 14:19:36 +04:00
Vladislav Vinogradov
b689eca8a0
fixed OpenGL tests
...
now create window only once per test case
2012-12-05 14:18:57 +04:00
Vladislav Vinogradov
aabc33c772
temporarily disabled reduceKeyVal implementation for kepler
...
used fermi implementation
2012-12-05 10:36:54 +04:00
Andrey Kamaev
b0d3830399
Update gtest to upstream r629
2012-12-05 03:02:37 +04:00
Vadim Pisarevsky
7852b68c20
Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix
2012-12-04 21:02:10 +04:00
Vladislav Vinogradov
e311613fc8
fixed warnings "double not supported"
2012-12-04 10:37:13 +04:00
Vladislav Vinogradov
7ab9c4ccee
fixed compilation on 1.1 CC
2012-12-04 10:36:46 +04:00
Alexander Smorkalov
6e0db3f527
Feature #1322 "If dll cannot be loaded a warning should be generated" implemented.
2012-12-03 13:52:49 +04:00
Vladislav Vinogradov
06776b612c
fixed warnings
2012-12-03 13:27:20 +04:00
Vladislav Vinogradov
05d842bcd8
a bit more opengl refactoring:
...
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Ilya Lavrenov
07744ccf3d
removed imshow call
2012-12-03 12:30:19 +04:00
Andrey Kamaev
ae5649d3f7
Drop unsupported imageio from grfmt
2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
2012-12-03 09:55:53 +04:00
Andrey Kamaev
476efd7d37
Drop unsupported yzx and mil camera backends
2012-12-03 09:28:01 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Vladislav Vinogradov
08fbf667f9
refactored opengl functionality
...
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Andrey Kamaev
49c35fafc0
Adjust OpenCV version to 2.4.3.1
2012-11-30 14:33:28 +04:00
Ilya Lavrenov
c09a325d3e
fixed error connected with incorrect range
2012-11-30 13:26:40 +04:00
Ilya Lavrenov
98031a4147
removed const modificators
2012-11-30 12:31:33 +04:00
Vladislav Vinogradov
2eebd8d939
fixed build under windows
2012-11-29 18:40:27 +04:00
Alexander Smorkalov
f6ff2b87fa
Some perf tests on warping and resize disabled on Android
...
MatInfo_Size_Size.resizeDownLinear
MatInfo_Size_Size.resizeUpLinear
TestWarpPerspectiveNear_t.WarpPerspectiveNear
TestWarpPerspective.WarpPerspective
2012-11-29 18:21:22 +04:00
Andrey Kamaev
64bed2060a
Merge pull request #194 from asmorkalov/v4l_fix
...
Patch #2323 applied
2012-11-29 01:27:34 -08:00
Andrey Kamaev
7e8fab0747
Merge pull request #195 from vpisarev/inv3x3_fix
...
now invert 3x3 on "bad" matrices works well on Windows
2012-11-29 01:27:27 -08:00
Vladislav Vinogradov
362655b02a
fixed Bug #2581
...
GoodFeaturesToTrackDetector_GPU fails when no corners found
2012-11-29 11:19:30 +04:00
Vadim Pisarevsky
b57e801c04
now invert 3x3 on "bad" matrices works well on Windows
2012-11-28 23:05:51 +04:00
Alexander Smorkalov
bb3d14e1a0
Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied.
2012-11-28 21:53:39 +04:00
Anna Kogan
4e21f42714
increased time-limits
2012-11-28 18:17:33 +04:00
Anna Kogan
8877066846
increased time-limits
2012-11-28 18:17:33 +04:00
Andrey Kamaev
157cdeb443
Merge pull request #175 from taka-no-me:run_py
2012-11-28 12:44:05 +04:00
Andrey Kamaev
50bebd6f0b
Merge pull request #166 from askforeric:pvapi_updates
2012-11-28 11:31:01 +04:00
askforeric
3923484341
Refactored the PvAPI capture class to better facilitate dynamic property changes
...
- Added Gain control
- Changed default acquisition mode to grayscale
- Fixed a signed/unsigned compare issue
- Implemented frame resizing
- Implemented automatic buffer resizing on frame resize
- Corrected camera initialization so that it attempts to put the camera in Mono8
but does not fail if this doesn't succeed.
2012-11-28 11:28:16 +04:00
marina.kolpakova
2e0161c6c5
create objects mat if empty
2012-11-28 10:50:33 +04:00
marina.kolpakova
d985861462
remove unused std imports
2012-11-28 03:51:37 +04:00
marina.kolpakova
1d97a4549d
fixed compilation for GCC 4.6
2012-11-28 03:51:37 +04:00
Vladislav Vinogradov
0b2c1dc871
fixed build without CUDA
2012-11-27 18:43:17 +04:00
Vladislav Vinogradov
d2591704e8
Merge branch 'kepler-optimization' into cuda-dev
2012-11-27 16:34:45 +04:00
Ilya Lavrenov
b8b13ccd5c
parallel version of Bayer2Gray
2012-11-27 15:27:58 +04:00
Alexander Smorkalov
2e5a7284d2
Code review comments applied.
2012-11-27 14:55:49 +04:00
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Ilya Lavrenov
ce5e9a71b5
fixed some warnings on Windows and added debug messages
2012-11-27 13:54:11 +04:00
Alexander Smorkalov
0efc32fc21
Attribure loading from layout improved.
...
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
2012-11-27 12:47:41 +04:00
Alexander Smorkalov
8266eab8b4
OpenCV app framework improved
...
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
2012-11-27 12:47:41 +04:00
Ilya Lavrenov
4116cbe2c0
Merge remote-tracking branch 'upstream/master' into Demosaicing
2012-11-27 12:46:49 +04:00
Vladislav Vinogradov
2eca75ccdd
added common TransformFunctorTraits for element operations
2012-11-27 11:08:53 +04:00
marina.kolpakova
22b0ea1cf0
sort for Hough sanity checks
2012-11-26 23:54:10 +04:00
marina.kolpakova
554a7cb33a
add epsilon in sanity checks
2012-11-26 23:52:56 +04:00
Andrey Kamaev
214629b220
Merge pull request #187 from vpisarev:doc_fixes_2.4
2012-11-26 22:33:01 +04:00
Andrey Kamaev
dc3aa27be4
Merge pull request #183 from apavlenko:perf/android_filters_accuracy
2012-11-26 22:32:38 +04:00
Andrey Pavlenko
c36dcbcada
Increase accuracy interval for image filters on Android and other platforms when sensible
2012-11-26 22:29:05 +04:00
Ilya Lavrenov
3fa630639f
fixed bayer2bgra in case when size.width <= 2
2012-11-26 19:45:56 +04:00
marina.kolpakova
209f16455d
Merge cuda-geek/soft-cascade-gpu into cuda-dev
2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c
Merge origin/master into cuda-dev
2012-11-26 18:56:33 +04:00
marina.kolpakova
05cd88ae42
clean code; fix problems in documentation
2012-11-26 18:50:08 +04:00
Vadim Pisarevsky
db965353f4
fixed a few compile errors/warnings in 2.4 branch of the docs
2012-11-26 18:48:23 +04:00
marina.kolpakova
39da17a02a
Merge pull requst #177 from cuda-geek/another-one-integral-fix
2012-11-26 18:10:21 +04:00
marina.kolpakova
a22edb037f
fixed typo
2012-11-26 17:57:56 +04:00
marina.kolpakova
bd3179bda8
fix CUDA support for streams for NMS; refactor tests
2012-11-26 17:53:25 +04:00
marina.kolpakova
60c0e41ba5
integrate NMS (Dollar's criteria)
2012-11-26 17:22:47 +04:00
Ilya Lavrenov
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
Vladislav Vinogradov
f022b12c57
saturate_cast via asm cvt command
2012-11-26 15:36:15 +04:00
marina.kolpakova
d2e88e1d4d
nms: part 1
2012-11-26 15:26:11 +04:00
Vladislav Vinogradov
63a022dcd7
added explicit unroll to reduce implementation
2012-11-26 13:12:50 +04:00
Vladislav Vinogradov
11c6eb6305
element operations
2012-11-26 11:45:25 +04:00
Vladislav Vinogradov
f00efcfc59
added optimized deviceSupports function
2012-11-26 11:41:52 +04:00
Vladislav Vinogradov
a71ef7d67b
convertTo
2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
572d2d6a84
warpScanInclusive
2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
76e8794e81
fixed warnings on old compute capabilities
2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e6b1ccdcdf
removed old reduce implementation
2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e8f9762ef3
matrix reduction
2012-11-26 11:37:50 +04:00
Vladislav Vinogradov
fbf3de43a2
SURF
2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
19c87d1c9d
ORB
2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
7f97fb481c
FastNonLocalMeans
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1f1e24be3c
PyrLKOpticalFlow
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1b571bde10
StereoConstantSpaceBP
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0e339dd137
hog
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0ddd16cf78
calcHist & equalizeHist
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7e57648ea2
FGDStatModel
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
28716d7f30
Canny
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
e299595667
computeHypothesisScoresKernel
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
05db02fbc8
BruteForceMatcher
2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7a1874b2cc
new reduce and reduceKeyVal implementation
2012-11-26 11:37:36 +04:00
Vladislav Vinogradov
d47c112434
fix abs_func and minimum/maximum functors
2012-11-26 11:37:36 +04:00
marina.kolpakova
7df45c0dcc
remove unnecessary copying in SURF
2012-11-25 03:26:50 +04:00
marina.kolpakova
91913364d6
reintegrate warp shuffle based integral
2012-11-25 03:21:51 +04:00
marina.kolpakova
5460cee9e9
fix cascade classifier GFF NMS for empty candidates vector
2012-11-25 03:19:24 +04:00
Andrey Kamaev
23011ffd81
Merge pull request #179 from cuda-geek:usr-bin-env-python
2012-11-24 19:24:01 +04:00
Maria Dimashova
97e36b9375
fix a compile error in case of building without highgui
2012-11-24 18:10:29 +04:00
marina.kolpakova
68d04d28b6
replace offsets in surf to simple copy for better speed
2012-11-24 16:50:29 +04:00
Andrey Kamaev
8daebeac8a
run.py: add --check option for easy run of sanity checks
2012-11-24 14:12:32 +04:00
Andrey Kamaev
9db1d9ba13
run.py: improve handling of multiple Android devices
...
* do not lose auto-selected device while running several tests
* reduce output noise
* list available devices if unable to auto-select device
* fix error message when no devices connected
2012-11-24 14:11:07 +04:00
marina.kolpakova
be0c20b758
align grid by 4
2012-11-24 01:55:03 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
Jason Newton
d5aa679d3f
adjust output type to return int32... it should at least be unsigned but this breaks python bindings;
...
remove non-8bit input type support, not worth the binary size
2012-11-22 21:26:52 -08:00
marina.kolpakova
6ccd7aca4c
fix tests for arm
2012-11-22 13:26:13 +04:00
Alexander Smorkalov
3282e08f55
Default native library path for native camera updated.
...
New versions tries to search library in arm-v7a and Manager packages only.
2012-11-22 12:40:25 +04:00
Andrey Kamaev
24af691843
Merge pull request #168 from asmorkalov:android_42_camera_fix
2012-11-21 14:50:53 +04:00
Vadim Pisarevsky
c31f106012
Merge branch 'ParallelVideoStreams' of https://github.com/ilya-lavrenov/opencv into 2.4
2012-11-21 11:43:18 +04:00
Alexander Smorkalov
aa4e6a8a83
Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
...
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
2012-11-21 11:37:29 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
...
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Alexander Smorkalov
66a1ea7604
Test execution inside Eclipse fixed;
...
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
Ilya Lavrenov
4abf0b3193
thread-safe VideoWriter and VideoCapture
2012-11-19 16:44:23 +04:00
marina.kolpakova
a9f10e5cad
fixed compile without cuda
2012-11-14 20:34:17 +04:00
marina.kolpakova
0865227049
check if scaling values changed
2012-11-14 20:28:08 +04:00
marina.kolpakova
c3e4a52fbe
soft cascade sample
2012-11-14 20:11:18 +04:00
Andrey Kamaev
2e2d927273
Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF
2012-11-14 17:30:06 +04:00
marina.kolpakova
ee4f003e72
fixed typo
2012-11-14 14:49:38 +04:00
marina.kolpakova
781c04324e
refactor: PrefixSum
2012-11-14 14:47:00 +04:00
marina.kolpakova
a30bbda3bd
remove hardcoded values
2012-11-14 14:36:59 +04:00
LeonidBeynenson
52a136227d
Modified documentation for calcOpticalFlowSF.
2012-11-14 14:27:41 +04:00
marina.kolpakova
8acfbde68e
remove debug detect at scale method
2012-11-14 14:22:12 +04:00
marina.kolpakova
72e2b8b370
remove size constraints of input frame
2012-11-14 14:00:02 +04:00
marina.kolpakova
08910e81af
integrate pre-Kepler architectures
2012-11-14 12:40:44 +04:00
marina.kolpakova
e3c93ad9cf
Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4
...
This reverts commit 7e301c5c0eb5e009eb87
2012-11-13 23:52:18 +04:00
marina.kolpakova
be40bd5c74
Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
2012-11-13 23:37:44 +04:00
Alexander Mordvintsev
9cfa51a483
added CV_OUT to StereoVar output paramiter
2012-11-13 23:17:54 +04:00
marina.kolpakova
1edab12068
fix for negative confidence
2012-11-13 23:08:19 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
2012-11-13 19:48:59 +04:00
Andrey Kamaev
0938358002
Merge pull requests #136 , #142 , #150 , #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
2012-11-13 19:47:16 +04:00
Andrey Kamaev
72a63922d2
Merge pull request #156 from jet47/gpu-hough-lines-fix
2012-11-13 18:24:36 +04:00
Andrey Kamaev
e4fb680566
Merge pull request #155 from jet47/gpu-test-fix
2012-11-13 18:23:52 +04:00
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +04:00
Andrey Kamaev
8ba9289a2c
Merge pull request #146 from taka-no-me/win_opengl
2012-11-13 18:19:42 +04:00
Andrey Kamaev
4d6bdc1533
Merge pull request #145 from taka-no-me/vec_print
2012-11-13 18:18:48 +04:00
Andrey Kamaev
c803cbb93b
Merge pull request #143 from vpisarev/bug_fixes4
2012-11-13 18:17:33 +04:00
Vladislav Vinogradov
a9919e01d0
fixed bug in gpu::HoughLines
2012-11-13 17:54:17 +04:00
Vladislav Vinogradov
606c23b9aa
fixed gpu module tests
...
uses old CommandLineParser class
2012-11-13 17:50:29 +04:00
Alexander Smorkalov
96e4eed018
Logcat message for disabled test cases added.
2012-11-13 11:41:08 +04:00
Alexander Smorkalov
9f5fcff3ea
More common way of test case disabling implemented.
2012-11-13 10:29:49 +04:00
marina.kolpakova
bd9ca48fab
export to python/java
2012-11-13 02:49:35 +04:00
Alexander Smorkalov
e06c5b6fd5
Code review comments applied.
2012-11-12 17:47:20 +04:00
marina.kolpakova
aa92be34d6
GK107 Policy
2012-11-12 16:37:18 +04:00
marina.kolpakova
580d8173e5
refactor computing of scaling factor
2012-11-12 11:54:40 +04:00
Vladislav Vinogradov
afff9cf716
Optimized buffers reuse in gpu module:
...
ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes
2012-11-12 10:30:35 +04:00
Vladislav Vinogradov
810829f32e
speedup compilation of row_filter.cu and column_filter.cu
...
split them into several small files
2012-11-12 10:16:04 +04:00
Vladislav Vinogradov
29f89e8930
moved block.hpp to include folder
2012-11-12 09:51:31 +04:00
marina.kolpakova
d3ac282487
GPU soft cascade documentation
2012-11-10 05:48:06 +04:00
marina.kolpakova
916967cac5
add comments to class declaration
2012-11-10 05:13:37 +04:00
marina.kolpakova
0cbf9eb22a
add support for CUDA streams
2012-11-10 05:13:26 +04:00
marina.kolpakova
40600fa504
GPU version becomes algorithm
2012-11-10 05:13:19 +04:00
marina.kolpakova
e6eb1b99e1
fix negative confidence bug
2012-11-10 05:13:01 +04:00
marina.kolpakova
27eb2e27db
enable fast integral for Kepler
2012-11-10 05:12:48 +04:00
marina.kolpakova
9b251f8130
remove Sobel normalization
2012-11-10 05:12:38 +04:00
marina.kolpakova
df392cc830
use fast integral for soft cascade
2012-11-10 05:12:27 +04:00
marina.kolpakova
ac5cd48279
add DeviceInfo parameter to the soft cascade tests
2012-11-10 05:12:13 +04:00
marina.kolpakova
fba62c9251
fix compilation problem after rebase
2012-11-10 05:12:01 +04:00
marina.kolpakova
2bd35c4358
add support for precomputed integrals
2012-11-10 05:11:48 +04:00
marina.kolpakova
fa55d51b6a
add sanity check to performance tests for soft cascade
2012-11-10 05:11:35 +04:00
marina.kolpakova
ca81628a9a
fix retrieval of detections count
2012-11-10 05:11:21 +04:00
marina.kolpakova
022a8b9698
fix rounding bug in Level creation
2012-11-10 05:11:11 +04:00
marina.kolpakova
2bcb8dbd83
refactor performance tests
2012-11-10 05:11:00 +04:00
marina.kolpakova
f196e9fda4
add factory method for Fields structure
2012-11-10 05:10:42 +04:00
marina.kolpakova
0898c3c651
kernel policy
2012-11-10 05:10:35 +04:00
marina.kolpakova
916ba4c0ea
refactor preprocessing
2012-11-10 05:10:28 +04:00
marina.kolpakova
fa62e2b72f
move preprocessing into separate function
2012-11-10 05:10:13 +04:00
marina.kolpakova
312a58fcec
fix performance test
2012-11-10 05:10:03 +04:00
marina.kolpakova
ef431f70b6
fix buggy threshold zeroing if feature has zero area
2012-11-10 05:09:45 +04:00
marina.kolpakova
0424e2c8d2
remove debug code
2012-11-10 05:09:34 +04:00
marina.kolpakova
1b9bccb856
move Level into shared memory
2012-11-10 05:09:15 +04:00
marina.kolpakova
30bce16ad6
optimize roi loads
...
only one thread load roi for all block
2012-11-10 05:08:56 +04:00
marina.kolpakova
fdef0adf95
Corrects objects matrix in case of the absence of objects
2012-11-10 05:08:43 +04:00
marina.kolpakova
838842cc96
Add performance detection test in ROI; refactored soft cascade performance tests
2012-11-10 05:08:32 +04:00
marina.kolpakova
dd595376ba
Add performance test for detection in ROI; refactor soft cascade performance tests
2012-11-10 05:08:09 +04:00
marina.kolpakova
eb91593c08
add roi support
2012-11-10 05:08:03 +04:00
marina.kolpakova
64d6e6a48d
add getROISize
2012-11-10 05:07:55 +04:00
marina.kolpakova
672cf1f445
implement different behaviour for up- and down-scaling
2012-11-10 05:07:40 +04:00
marina.kolpakova
56c7ef06e7
integrate Kepler version
2012-11-10 05:07:26 +04:00
marina.kolpakova
7db1323f81
add test that stores detections on the specific scale
2012-11-10 05:07:09 +04:00
marina.kolpakova
b52fea7fae
update soft cascade interface: - add class Detection in interface, - split sync- and async- versions, - add support for detecting at the specific scale.
2012-11-10 05:06:54 +04:00
marina.kolpakova
612a258506
kepler specific version
2012-11-10 05:06:44 +04:00
marina.kolpakova
0314e0e5d7
add kind in detection representation
2012-11-10 05:06:30 +04:00
marina.kolpakova
c0359ed5c5
fix test: enough size for detection matrix
2012-11-10 05:06:17 +04:00
marina.kolpakova
72b499df00
add detection storing
2012-11-10 05:06:05 +04:00
marina.kolpakova
8108bd30fe
optimize memory usage
2012-11-10 05:05:43 +04:00
marina.kolpakova
b83d4add2e
memory optimization
2012-11-10 05:05:25 +04:00
marina.kolpakova
4d9c7c1012
preprocessing ~1.981 ms
2012-11-10 05:05:17 +04:00
marina.kolpakova
1917366528
empty cascade
2012-11-10 05:05:09 +04:00
marina.kolpakova
4881205bae
refactor logs
2012-11-10 05:04:52 +04:00
marina.kolpakova
dca27b4622
fix cast bug; add logging
2012-11-10 05:04:36 +04:00
marina.kolpakova
e606a0d651
remove dead code
2012-11-10 05:04:20 +04:00
marina.kolpakova
ba50d19341
first version of soft cascade on GPU
2012-11-10 05:03:59 +04:00
marina.kolpakova
1bf85996b3
add detections vector initialization in tests
2012-11-10 05:03:43 +04:00
marina.kolpakova
08b4e780de
add shrinking kernel
2012-11-10 05:03:29 +04:00
marina.kolpakova
1cf7a46f3a
fix data paths in performance test
2012-11-10 05:03:05 +04:00
marina.kolpakova
0691dc554f
fix compilation
2012-11-10 05:02:52 +04:00
marina.kolpakova
5d15e4ea58
CUDA kernels interface
2012-11-10 05:02:37 +04:00
marina.kolpakova
1a52a322b5
add performance test for GPU soft cascade
2012-11-10 05:02:16 +04:00
marina.kolpakova
14a0dd8c98
fix typo in cascade loading
2012-11-10 05:02:01 +04:00
marina.kolpakova
a3af5ede80
CUDA callers
2012-11-10 05:01:44 +04:00
marina.kolpakova
4aac1444ad
integral channel storage are cached as a cascade's field
2012-11-10 05:01:25 +04:00
marina.kolpakova
1ab7af6995
GPU soft cascade: buffers preallocation
2012-11-10 05:01:09 +04:00
marina.kolpakova
2b7ce8b160
precompute feature response for scaling factor
2012-11-10 05:00:53 +04:00
marina.kolpakova
267d140bfe
soft cascade: gpu representation
2012-11-10 05:00:33 +04:00
marina.kolpakova
dd9c53497b
GPU interface for soft cascade
2012-11-10 05:00:16 +04:00
marina.kolpakova
d65b3e0617
fix warning in CUDA samples
2012-11-10 04:59:55 +04:00
Alexander Smorkalov
baef62b4d2
Java test fix. Eclipse test execution fix.
2012-11-09 11:46:14 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01
Fix Windows build warnings
2012-11-09 10:10:04 +04:00
Andrey Kamaev
8c9c2b3a03
Fix build on Windows with OpenGl enabled
...
There was missing windows.h include in OpenGL interop code.
2012-11-09 10:00:24 +04:00
Andrey Kamaev
e5ffbf9498
Fix stream output operator for Vec<uchar,n>
...
This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers.
2012-11-09 09:54:43 +04:00
marina.kolpakova
665bf430d5
fix warnings under win
2012-11-09 00:07:32 +04:00
Vadim Pisarevsky
2e54e2a586
fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility.
2012-11-08 16:15:04 +04:00
Vladislav Vinogradov
bff818afbd
fixed static build of gpu module with ffmpeg:
...
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
2012-11-08 15:49:56 +04:00
Vadim Pisarevsky
9163471987
improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525 )
2012-11-08 14:09:43 +04:00
marina.kolpakova
8a3e897999
min and max params become double
2012-11-08 02:34:49 +04:00
marina.kolpakova
e379771c03
git warning
2012-11-08 02:34:49 +04:00
marina.kolpakova
f93cffaa0d
fix compilation under win
2012-11-08 02:34:49 +04:00
marina.kolpakova
1022094dc0
fix levels computing
2012-11-08 02:34:49 +04:00
marina.kolpakova
f1e36043e6
clean code
2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161
fixed typo
2012-11-08 02:34:49 +04:00
marina.kolpakova
5fb9f48360
fix angle scaling
2012-11-08 02:34:49 +04:00
marina.kolpakova
31a073ca66
documentation
2012-11-08 02:34:49 +04:00
marina.kolpakova
4207552e19
add object init
2012-11-08 02:34:49 +04:00
marina.kolpakova
157ab66ab9
add ROI support
2012-11-08 02:34:49 +04:00
marina.kolpakova
6a3a723938
refactor integral channels
2012-11-08 02:34:48 +04:00
marina.kolpakova
65543c53f6
update test according to resize usage
2012-11-08 02:34:48 +04:00
marina.kolpakova
4a1c4a9862
soft cascade become Algorithm
2012-11-08 02:34:48 +04:00
Vladislav Vinogradov
a0be7b57f5
fixed bug in gpu::PyrLKOpticalFlow::dense
...
vector index out of range
2012-11-07 17:13:19 +04:00
NikoKJ
95869a6081
fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch.
2012-11-07 13:49:09 +08:00
marina.kolpakova
ff8417db00
remove input frame size constraints
2012-11-07 03:19:07 +04:00
marina.kolpakova
3cb9afb4e7
test update because changed Sobel Normalization
2012-11-07 03:19:07 +04:00
marina.kolpakova
a84334cfc2
brief soft cascade interface description
2012-11-07 03:19:07 +04:00
marina.kolpakova
2e8ed77383
get rid of hard-coded values
2012-11-07 03:19:07 +04:00
marina.kolpakova
16dd09ccfc
move scale related parameters to SoftCascade constructor
2012-11-07 03:19:07 +04:00
marina.kolpakova
017d970b9a
load SoftCascade from FileStorage
2012-11-07 03:19:06 +04:00
marina.kolpakova
a22ee13620
rename markDetection to addDetection
2012-11-07 03:19:06 +04:00
marina.kolpakova
40c0c60e2b
remove unused struct
2012-11-07 03:19:06 +04:00
marina.kolpakova
7b6da394f0
rename Stage to Weak because there is no such term for Soft Cascades
2012-11-07 03:19:06 +04:00
marina.kolpakova
2d0fc80c95
use IntegralChannels class
2012-11-07 03:19:06 +04:00
marina.kolpakova
3d41846c39
move frame processing into separate class
2012-11-07 03:19:06 +04:00
marina.kolpakova
5651743784
remove debug imshow from code
2012-11-07 03:19:06 +04:00
marina.kolpakova
8e092f8b5d
add Detection struct to interface
2012-11-07 03:19:06 +04:00
marina.kolpakova
754fd7311b
improve pointer usage
2012-11-07 03:19:06 +04:00
marina.kolpakova
2914f24521
improve cpu version of SoftCascade:
...
- remove division
- remove cvRound
- cache feature area
2012-11-07 03:19:06 +04:00
marina.kolpakova
2d2c46e717
add const qualifier to detectMultiScale method
2012-11-07 03:19:06 +04:00
marina.kolpakova
9771c3c7ec
remove Mat copying
2012-11-07 03:19:05 +04:00
marina.kolpakova
0ff8a4633d
remove pow calculations
2012-11-07 03:19:05 +04:00
marina.kolpakova
cc300a69b1
add perfomance test for CPU soft cascade
2012-11-07 03:19:05 +04:00
marina.kolpakova
26af7d7389
refactor logs
2012-11-07 03:19:05 +04:00
marina.kolpakova
b6081438fa
clean code
2012-11-07 03:19:05 +04:00
marina.kolpakova
296aa8854c
fix hog channels
2012-11-07 03:19:05 +04:00
marina.kolpakova
efd2615844
fix floating point bug
2012-11-07 03:19:05 +04:00
marina.kolpakova
765dea9ddf
fix bugs in the soft cascade detect method; add options for debug logging
...
- WITH_DEBUG_OUT for logging cascade scales
- DEBUG_STORE_IMAGES for xml matrix serialization
- DEBUG_SHOW_RESULT to see detection result
2012-11-07 03:19:05 +04:00
marina.kolpakova
ba27d89173
add feature rescaling according to Dollal's paper FPDW
2012-11-07 03:19:05 +04:00
marina.kolpakova
8d90b973b0
add detectAt to soft cascade
2012-11-07 03:19:05 +04:00
marina.kolpakova
801368ee82
refactoring
2012-11-07 03:19:05 +04:00
marina.kolpakova
6f53be4102
shrinking before integral calculation
2012-11-07 03:19:04 +04:00
marina.kolpakova
dc74ce20ab
OpenCV friendly xml format for soft cascade
2012-11-07 03:19:04 +04:00
marina.kolpakova
c04725b681
add apply cascade method
2012-11-07 03:19:04 +04:00
marina.kolpakova
695827050f
Integral images for ICF
2012-11-07 03:19:04 +04:00
marina.kolpakova
b0b85f36f6
add test for soft cascade detect method
2012-11-07 03:19:04 +04:00
marina.kolpakova
f01c5d9033
compute scales pyramid
2012-11-07 03:19:04 +04:00
marina.kolpakova
a54d456ad0
parse soft cascade from xml
2012-11-07 03:19:04 +04:00
marina.kolpakova
fe2c38be80
add method to fill soft cascade
2012-11-07 03:19:04 +04:00
marina.kolpakova
7290d8576d
add ICF feature
2012-11-07 03:19:04 +04:00
marina.kolpakova
fb113e5ce4
scale pyramid calculations
2012-11-07 03:19:04 +04:00
marina.kolpakova
9966d7feba
add structures for cascade representation
2012-11-07 03:19:04 +04:00
marina.kolpakova
108fd169f7
dummy soft cascade
2012-11-07 03:19:03 +04:00
Jason Newton
85880397c4
connectedcomponents: use opencv integral types, add to docs, fix up things for a python export
2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08:00
Vladislav Vinogradov
beb377b38c
gpu implementation of Dual TV-L1 Optical Flow
2012-11-02 19:51:43 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Vadim Pisarevsky
9a08b7be45
fixed compile problem with the old Xcode (<4.5)
2012-11-02 15:29:16 +04:00
Andrey Kamaev
f2af0e7a57
Merge pull request #132 from taka-no-me/version-2.4.3
2012-11-02 14:31:30 +04:00
Andrey Kamaev
4ac5223afa
Merge pull request #131 from taka-no-me/tegra-fast
2012-11-02 14:31:02 +04:00
Andrey Kamaev
828faf4e68
Merge pull request #129 from cuda-geek/CCL-test-fix
2012-11-02 14:30:20 +04:00
Andrey Kamaev
63ee26adda
Merge pull request #127 from cuda-geek/apple2clang
2012-11-02 14:29:39 +04:00
Andrey Kamaev
4a2f626d85
Remove "-rc" suffix from version
2012-11-02 14:27:34 +04:00
Andrey Kamaev
dbb5a32453
Use Tegra version of cv::FAST
2012-11-02 13:16:16 +04:00
Vadim Pisarevsky
42471c082f
possibly fixed compile errors in GPU module on Windows
2012-11-02 12:03:25 +04:00
marina.kolpakova
97cab339d2
fix Connected Components Labeling test crash
2012-11-01 23:59:01 +04:00
Kirill Kornyakov
1c77f0abfe
Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator()
2012-11-01 22:28:46 +04:00
Kirill Kornyakov
2efd9b6ad7
Fixed a couple of minor issues in Javadocs
2012-11-01 22:28:46 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
LeonidBeynenson
02646427fb
Fixed arguments of the function calcOpticalFlowSF.
2012-11-01 19:31:45 +04:00
marina.kolpakova
5ce9965459
Merge pull request #125 from taka-no-me:perf_tests
2012-11-01 19:31:33 +04:00
marina.kolpakova
358fcbd5b6
Merge pull request #115 from asmorkalov:java_test_data_update
2012-11-01 19:29:18 +04:00
marina.kolpakova
09dec4e873
Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb
2012-11-01 19:26:30 +04:00
marina.kolpakova
334f6344dd
Merge pull request #120 from NikoKJ:ocl2.4.3
2012-11-01 19:16:22 +04:00
marina.kolpakova
9b92de9a88
Merge pull request #121 from branch asmorkalov:android_samples_fix
2012-11-01 19:11:53 +04:00
Vadim Pisarevsky
d9d4e8df6f
fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)
2012-11-01 16:37:39 +04:00
Andrey Kamaev
e3be5f138a
Fixed sanity checks in several performance tests
2012-11-01 16:29:30 +04:00
Alexander Smorkalov
34896529d5
Review comments applied.
2012-11-01 16:19:11 +04:00
Andrey Kamaev
fd4909360f
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
2012-11-01 12:44:10 +04:00
Andrey Kamaev
7267d518d5
Fix build in Visual Studio 2005
2012-11-01 12:42:51 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
Andrey Kamaev
74fe158f4b
Merge pull request #117 from vpisarev/doc_updates
2012-10-31 16:56:04 +04:00
Andrey Kamaev
3e10e057cb
Merge pull request #110 from vpisarev/test_fixes2
2012-10-31 16:52:50 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
NikoKJ
2045c85ad5
a minor bug fix for brute force
2012-10-31 16:01:56 +08:00
Vadim Pisarevsky
adc1d94e95
updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request
2012-10-30 15:25:46 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
08ff5f92f4
minor updates for doc redirections and tutorial images size
2012-10-30 15:06:13 +04:00
Alexander
b0106ca25e
Test data form features2d updated.
2012-10-30 15:05:09 +04:00
Andrey Kamaev
f3a158c862
Merge pull request #102 from NikoKJ/ocl4_2.43
2012-10-30 13:01:57 +04:00
NikoKJ
9ccdd17376
eliminate all the warnings on win32 and win64
...
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
2012-10-30 13:01:42 +04:00
Vadim Pisarevsky
63bd6f9adf
fixed compile errors in ocl tests; disabled a few problematic tests
2012-10-29 23:37:18 +04:00
marina.kolpakova
0f65dacb8b
Merge pull request #104 from AoD314:master
2012-10-29 15:12:52 +04:00
marina.kolpakova
e55b2f7d60
Merge pull request #99 from jet47:tvl1-opt-flow
2012-10-29 15:00:40 +04:00
alexandre benoit
a0c92265db
minor updates for doc redirections and tutorial images size
2012-10-28 18:52:04 +01:00
morozov.andrey
e0cfc0ccf5
fixed bug with incorrect syntax in CommandLineParser
2012-10-26 19:46:17 +04:00
Andrey Kamaev
ad982f4ed6
Turn off video IO perf tests on Android
2012-10-26 17:00:31 +04:00
Andrey Kamaev
fcad269e53
Specify sanity threshold for WarpPerspective perf test
2012-10-26 17:00:31 +04:00
Andrey Kamaev
84934f7bfc
Fix SHORT data type support in Algorithm
...
* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages
2012-10-26 17:00:13 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
016b2cadb0
Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
...
Some code refactoring done.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
9217095955
Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.
2012-10-26 13:30:20 +04:00
Andrey Kamaev
729d76ad09
Merge branch '2.4'
2012-10-25 15:32:48 +04:00
Andrey Kamaev
bbb2d27add
Merge pull request #74 from taka-no-me/cl2cpp
2012-10-25 14:56:53 +04:00
Andrey Kamaev
63397e825c
Cleanup CMakeLists.txt of ocl module
2012-10-25 14:55:37 +04:00
Andrey Kamaev
42414b5689
Merge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4
2012-10-25 14:52:50 +04:00
Vladislav Vinogradov
8db5b7d7d4
fixed warnings under Windows
2012-10-25 13:28:30 +04:00
Vladislav Vinogradov
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
marina.kolpakova
772586801b
Merge pull request #87 from jet47:cmd-parser-fix
2012-10-25 00:40:50 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
ca20228956
Merge pull request #95 from apavlenko/perf-test/warp
2012-10-24 15:39:53 +04:00
Andrey Kamaev
6c5922542e
Merge pull request #97 from asmorkalov/2.4
2012-10-24 15:02:05 +04:00
Vadim Pisarevsky
ae10ecd264
fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions)
2012-10-24 14:41:15 +04:00
Alexander Smorkalov
4f0f6686d1
Undefind behavior in Async Service Helper fixed.
2012-10-24 12:28:31 +04:00
Andrey Pavlenko
a94e80bea3
fixing typos in perf tests for warp funcs
2012-10-24 11:21:58 +04:00
Alexander Smorkalov
76bcf72ded
2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.
2012-10-24 09:51:01 +04:00
LeonidBeynenson
d6aa3bd8ed
Made changes in cv::Algorithm
...
made it to give more verbose errors when arguments of wrong types are passed, added setters with types (e.g. setInt, etc)
2012-10-23 21:37:27 +04:00
Andrey Kamaev
080b9bbcd3
Merge pull request #80 from apavlenko/android-samples-refactor
2012-10-23 20:53:59 +04:00
Andrey Kamaev
b88323afc3
Merge pull request #91 from taka-no-me/warnings/windows
2012-10-23 20:52:42 +04:00
Andrey Kamaev
f14a711bda
Merge pull request #85 from Nerei/master
2012-10-23 20:47:56 +04:00
Andrey Kamaev
9b149edde6
Merge pull request #90 from taka-no-me/version_2.4.3-rc
2012-10-23 20:36:51 +04:00
Andrey Kamaev
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Alexander Smorkalov
c1d42664bc
Refactring. Bug fix.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046
Code review coments fixed. Lint wornings fixed.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
641ee645ab
New sample framework integrated to Java part of SDK;
...
Frame format setter added to both views.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0
openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.
2012-10-23 20:06:33 +04:00
Andrey Kamaev
1a500813f6
Remove dead blobtrackingkalman.cpp
2012-10-23 18:20:07 +04:00
Andrey Kamaev
9751014067
Fix warnings from MSVC 10 64-bit
2012-10-23 18:20:07 +04:00
Andrey Kamaev
afc79e2a02
Fix warnings from MSVC 9 64-bit
2012-10-23 18:20:07 +04:00
Andrey Kamaev
0072078857
Hide non-windows variable in gtest
2012-10-23 18:09:49 +04:00
Andrey Kamaev
1d8729a7aa
Don't use _interlockedExchangeAdd in case of GNU compiler
2012-10-23 18:09:49 +04:00
Andrey Kamaev
15b7b01243
Merge pull request #86 from taka-no-me/test/python_kmeans
2012-10-23 18:03:52 +04:00
Andrey Kamaev
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
Andrey Kamaev
08e4298a96
Merge pull request #84 from Daniil-Osokin/perfTest-warpPerspective
2012-10-23 17:35:05 +04:00
Daniil Osokin
e9ba5c225d
extended perf test warpPerspectiveLarge
2012-10-23 16:06:03 +04:00
Andrey Kamaev
e64bb3654a
Remove wrong assertion
2012-10-23 15:28:44 +04:00
Vladislav Vinogradov
26f9534544
fixed string->string conversion
2012-10-23 15:24:21 +04:00
Anatoly Baksheev
d681717702
warnings
2012-10-23 15:13:46 +04:00
Andrey Kamaev
585f3bc391
Disable perf test for unstable solvePnPRansac
2012-10-23 12:13:39 +04:00
Andrey Kamaev
b45a870d9a
Limit 32S data in perf test for addWeighted to avoid integer overflow
2012-10-23 12:07:32 +04:00
Andrey Kamaev
c13eb07d47
Fix argument parsing for old command line parser
2012-10-23 12:07:01 +04:00
Andrey Kamaev
22e352d9cc
Merge pull request #76 vpisarev/test_fixes_1
2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
2012-10-22 21:13:26 +04:00
Andrey Kamaev
781d89829f
Merge pull request #79 from taka-no-me:warnings
2012-10-22 20:56:53 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Andrey Kamaev
40030d2ca0
Fix windows build warnings
2012-10-22 19:13:18 +04:00
Andrey Kamaev
15076f9232
Fix implementation of PCA overload with retained variance parameter
2012-10-22 18:46:20 +04:00
Andrey Kamaev
d0ec65e80c
Fix linux build warning
2012-10-22 18:38:22 +04:00
Andrey Kamaev
9900f8deb2
Remove russian comments
2012-10-22 17:24:43 +04:00
Andrey Kamaev
ecb707ca7b
Convert cl2cpp.py script to cmake
...
New version removes inner comments and empty lines
2012-10-22 17:19:55 +04:00
Andrey Kamaev
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
Andrey Kamaev
769f61f8c7
Merge pull request #55 from vpisarev/ocl_fixes
2012-10-22 16:40:18 +04:00
Andrey Kamaev
d1d6ce63fc
Merge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 16:27:10 +04:00
Vadim Pisarevsky
eea6fe8e7f
Merge pull request #71 from NikoKJ/ocl4_2.4.3
...
This patch is for the ocl module of 2.4.3
(tested on Mac (OSX 10.8, Xcode 4.5, OpenCL 1.1(?))
2012-10-22 04:57:42 -07:00
marina.kolpakova
8e2f729aa7
Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
2012-10-22 13:16:27 +04:00
Niko
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
Maria Dimashova
78dd1893bb
added tests for cv::merge, cv::split, cv::phase
2012-10-21 12:22:39 +04:00
marina.kolpakova
b14f447cc6
fix GPU SURF tests for masked case
2012-10-21 11:40:08 +04:00
marina.kolpakova
99c666691e
Restore core multiply/divide depth to CV_64F value.
...
After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests for multiply/device functions.
2012-10-21 11:20:39 +04:00
Kazuki MATSUDA
72c93dabd3
Add stream operators (Requested #2430 )
...
Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.
And putting together all operator<<.
(Matx, Point_, Point3_, Vec, Size_, Rect_)
2012-10-20 11:19:42 +09:00
Andrey Kamaev
b6a2717c2b
Merge pull request #65 from taka-no-me:android/warnings
2012-10-19 20:49:19 +04:00
Andrey Kamaev
59452dfc6f
Merge pull request #64 from vpisarev/bugs_1939_2100
2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
40a30b6f30
fixed type "compatible -> incompatible" in the error message
2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
d652cc72f2
fixed bugs #2100 (kind of) and #1393
...
[edit: cleaned whitespace]
2012-10-19 20:47:57 +04:00
Andrey Kamaev
8fb6d9f650
Fix Android build warnings
2012-10-19 16:14:14 +04:00
Andrey Kamaev
e8dd73798c
Merge pull request #59 from taka-no-me:doc/fix-signatures-master
2012-10-19 15:03:26 +04:00
Andrey Kamaev
546ec2af65
Merge pull request #54 from taka-no-me:doc/fix-signatures
2012-10-19 15:02:30 +04:00
Andrey Kamaev
5bc104cef5
Merge branch '2.4'
2012-10-19 15:00:05 +04:00
Andrey Kamaev
09abcd567e
Merge pull request #50 from taka-no-me:parallel/fix-build-2445
2012-10-19 14:57:08 +04:00
Andrey Kamaev
7173c82382
Include unistd.h to parallel.cpp on UNIX-like systems
...
This fixes build without TBB and CUDA. Issue #2445
2012-10-19 14:38:30 +04:00
Vladislav Vinogradov
34b4a35ea7
gpu separable filters for CV_8UC3, CV_32FC3 and CV_32FC4 types
2012-10-19 12:41:14 +04:00
Andrey Kamaev
9a97c74ef3
Merge pull request #61 from vpisarev/bug_2509
2012-10-19 11:17:25 +04:00
Andrey Kamaev
1341c64290
Merge pull request #51 from taka-no-me/java/fix-build-after-normalization
2012-10-19 10:27:16 +04:00
Andrey Kamaev
65d07c56fb
Merge pull request #57 from vpisarev/bug_2429_2.4
2012-10-18 19:42:14 +04:00
Andrey Kamaev
e1c3ffb23f
Fix weight calculation for the last pixel in generic area resize.
...
Also removed assigned only variable.
2012-10-18 19:41:45 +04:00
Vadim Pisarevsky
80f9bd864f
fixed bug #2429
...
[edit: cleaned whitespace]
2012-10-18 19:39:22 +04:00
Vadim Pisarevsky
c40718ab61
fixed bug #2059
2012-10-18 14:41:26 +04:00
Vadim Pisarevsky
f5742e6cac
fix bug #2447 - unary operator bug for single column matrix
2012-10-18 13:28:01 +04:00
Andrey Kamaev
73bbabf207
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-18 13:03:12 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
Andrey Kamaev
57d077b936
Fix Java API generation after normalization
...
The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation.
2012-10-17 18:20:46 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
vpisarev
f75946a16a
made opencv_ocl module build with VS2012
2012-10-17 15:08:03 +04:00
Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
marina.kolpakova
e5437e5486
Fix binary compatibility of opencv_gpu
2012-10-17 02:09:40 +04:00
Andrey Kamaev
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +04:00
Andrey Kamaev
42c8a42ad3
Fix binary compatibility of opencv_objdetect
2012-10-17 02:09:34 +04:00
Andrey Kamaev
a07cc84436
Fix binary compatibility of opencv_nonfree
2012-10-17 02:09:31 +04:00
Andrey Kamaev
26bcb3812c
Fix binary compatibility of opencv_contrib
2012-10-17 02:09:28 +04:00
Andrey Kamaev
971d02cde6
Fix binary compatibility of opencv_stitching
2012-10-17 02:09:26 +04:00
Andrey Kamaev
edee177ef1
Fix binary compatibility of opencv_ml
2012-10-17 02:09:23 +04:00
Andrey Kamaev
7d6a2f1bca
Revert "skip of table header in MLData ( #1962 )"
...
This reverts commit 4d36be8794
2012-10-17 02:09:20 +04:00
Andrey Kamaev
0dc3d61071
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
2012-10-17 02:09:17 +04:00
Andrey Kamaev
5a730d09cd
Fix binary compatibility of opencv_features2d
2012-10-17 02:09:14 +04:00
Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
2012-10-16 19:37:12 +04:00
Andrey Kamaev
075372a71c
Revert "fixed compilation error because of DetectionBasedTracker"
...
This reverts commit 9b8c47399a
2012-10-16 19:37:02 +04:00
Andrey Kamaev
e7b81688a4
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
2012-10-16 19:35:57 +04:00
Andrey Kamaev
18ab16dbd3
Revert "some more fixes towards binary compatibility"
...
This reverts commit a8c5e35619
2012-10-16 19:35:28 +04:00
Andrey Kamaev
88e9a072ec
Fix binary compatibility of opencv_flann
2012-10-16 15:13:00 +04:00
Andrey Kamaev
64b56d7018
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
...
This reverts commit 4aaaef5967
2012-10-16 15:13:00 +04:00
Andrey Kamaev
ebac3a02aa
Fix backward compatibility of opencv_core
2012-10-16 15:13:00 +04:00
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
2012-10-15 20:01:44 +04:00
Andrey Kamaev
52e490ef88
Revert "fixed compile error under linux"
...
This reverts commit e2d9fc4dcc
2012-10-15 20:01:44 +04:00
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
2012-10-15 18:12:33 +04:00
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
2012-10-15 17:53:57 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Andrey Kamaev
3ffe0f0117
Remove unused tbb::task_scheduler_init from perf tests
2012-10-15 16:25:06 +04:00
Andrey Kamaev
c3881ede62
Refactor thread management in performance tests
2012-10-15 16:14:11 +04:00
Kirill Kornyakov
aedf56404e
made imread description slightly better #2406
2012-10-15 15:23:38 +04:00
Vadim Pisarevsky
5b2271c6fb
another fix for #2332 test
2012-10-15 14:12:32 +04:00
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
2012-10-15 13:55:32 +04:00
Andrey Kamaev
460644b8a4
Reimplement thread management functions:
...
* Refactor auto-detection of parallel frameworks
* Implement cv:getNumThreads, cv::setNumThreads and cv::getThreadNum for all supported frameworks
* From now cv::setNumThreads(0) can be used to turn off parallelisation
2012-10-15 12:44:16 +04:00
Andrey Kamaev
b54f59de90
Move thread-related functions implementation to parallel.cpp
2012-10-15 12:44:16 +04:00
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
2012-10-15 12:22:36 +04:00
Ilya Lavrenov
5f9aedbe01
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
2012-10-15 12:21:16 +04:00
KOLANICH
c1f2b1fcc4
replaced python build script with WSH one for windows platforms
2012-10-12 23:03:30 +04:00
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
2012-10-12 18:43:00 +04:00
Kirill Kornyakov
e770691522
deleted wrong line
2012-10-12 17:31:26 +04:00
Kirill Kornyakov
de98da42f7
commented wrong line
2012-10-12 17:30:23 +04:00
Kirill Kornyakov
84176fa027
Added perf test for warpPerpsective with large resolutions
2012-10-12 17:14:23 +04:00
Vadim Pisarevsky
fa368d6202
Merge remote-tracking branch 'origin/master'
2012-10-12 16:29:20 +04:00
Vadim Pisarevsky
5474b4d4bc
finally, a proper fix for VNG (both SSE2 and C version)
2012-10-12 16:28:26 +04:00
marina.kolpakova
319e861cf2
FAIL_NO_CPU marco
2012-10-12 14:46:18 +04:00
marina.kolpakova
8d7ac8ad19
minor ending fix
2012-10-12 14:46:18 +04:00
marina.kolpakova
800cb9d0e6
allow gpu module write sanity data for GPU and CPU tests in one xml
2012-10-12 14:46:18 +04:00
Daniil Osokin
4500c48349
fixed 7 point mode in findFundamentalMat #1978
2012-10-12 14:38:52 +04:00
Evgeny Talanin
5dd1ec98f7
#720 patch apply
2012-10-12 14:25:36 +04:00
Vsevolod Glumov
b91ca6a73f
Removed the phrase, that was causing all the confusion. Issue #2406 .
...
+ Some minor formatting fixes.
2012-10-12 14:15:30 +04:00
Vadim Pisarevsky
7bbf8744d6
Merge remote-tracking branch 'origin/master'
2012-10-12 14:01:47 +04:00
Vadim Pisarevsky
cb58e5a3a4
let Kalman handle the missing measurements (bug #1380 )
2012-10-12 14:01:36 +04:00
marina.kolpakova
296aa7c4fb
One more fix for Kepler-specific gpu::integral usage
2012-10-12 13:45:09 +04:00
Daniil Osokin
1d3ec99102
fixed batchDistance minimum finding #2292
2012-10-12 13:25:55 +04:00
Andrey Kamaev
2abb67cc92
Merge pull request #29 from thorikawa/feature-523
2012-10-12 13:16:17 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Vladislav Vinogradov
304714862f
fixed bug in gpu::HOGDescriptor::computeConfidenceMultiScale
2012-10-12 12:49:10 +04:00
Andrey Kamaev
a390c1e2e6
Merge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-12 12:31:11 +04:00
Eric Christiansen
594ce1c869
fixed indentation
2012-10-12 12:31:11 +04:00
Eric Christiansen
caebcdcb3d
Minor tweak to add BRISK and FREAK support for the Java wrapper
2012-10-12 12:31:11 +04:00
Andrey Kamaev
a3a658c034
Quiet MSVC warning
2012-10-12 12:19:34 +04:00
Vadim Pisarevsky
bddd06e6c4
another fix for the updated parallel_for_ implementation
2012-10-11 23:22:32 +04:00
Vadim Pisarevsky
d64438dcfd
fixed build errors in the case of TBB and Concurrency
2012-10-11 23:04:45 +04:00
Vadim Pisarevsky
8441cf700d
added function cv::findNonZero (patch #2205 )
2012-10-11 22:52:15 +04:00
Vadim Pisarevsky
d72cc06b96
fixed possibly inccorrect interval measurements in flann's timer (bug #1165 ). Note: this may break binary compatibility, but since the class is not wrapped in Java and not exposed in Windows API, for example (it's considered internal-use class for flann), the effect should be minimal
2012-10-11 22:40:37 +04:00
Vadim Pisarevsky
354a5f2686
added recommended number of stripes to parallel_for_, modified some of the functions to use larger stripes (for better performance)
2012-10-11 22:37:14 +04:00
Andrey Kamaev
821de96346
Adjust thresholds in sanity checks for batchDistance
2012-10-11 20:35:28 +04:00
Andrey Kamaev
b8a67dc0e3
Adjust thresholds in sanity checks for calcOpticalFlowPyrLK
2012-10-11 19:46:18 +04:00
Alexander Smorkalov
5a524bdfd7
Issue #1861 Improve Javadoc documentation fixed. Multiline code segments added to Javadoc.
2012-10-11 19:21:40 +04:00
Andrey Kamaev
97640847c5
Add methods to sort keypoints and corresponding descriptors
2012-10-11 18:25:45 +04:00
Andrey Kamaev
18295bc778
Improve performance tests failures formatting
2012-10-11 17:41:02 +04:00
Andrey Kamaev
8f44f25f47
Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt)
2012-10-11 17:09:57 +04:00
Andrey Kamaev
f41ab3a330
Merge pull request #34 from roynos/master
2012-10-11 16:31:20 +04:00
Andrey Kamaev
7cb525d63f
Fix AndroidManifest.xml generation for OpenCV Android library project
2012-10-11 15:47:57 +04:00
Andrey Kamaev
dc4a649513
Fix OS X build
2012-10-11 15:36:47 +04:00
Andrey Kamaev
be98693aaf
Enable parallel CvtColorLoop for all platforms
2012-10-11 15:05:43 +04:00
Andrey Kamaev
df94591336
Fix instability of Luv/Lab color conversions
2012-10-11 15:05:43 +04:00
Vadim Pisarevsky
7ee6040192
enable Matx as Mat elements (bug #1705 ).
2012-10-11 15:02:48 +04:00
Daniil Osokin
e435674a90
added perf test for gabor filter
2012-10-11 14:52:35 +04:00
Daniil Osokin
f1e025dc68
delete normalization in gabor kernel #1995
2012-10-11 14:40:15 +04:00
Evgeny Talanin
bd4620f04e
#2408 patch apply (see pull request at https://github.com/Itseez/opencv/pull/33 )
2012-10-11 14:38:25 +04:00
Vadim Pisarevsky
43e3b83832
fixed potential memory buffer corruption in StereoSGBM (patch #2203 )
2012-10-11 14:07:07 +04:00
Evgeny Talanin
8528b0abcd
#1941 fix
2012-10-11 13:45:21 +04:00
Vadim Pisarevsky
56d3cad326
enabled odd size in DFT_COMPLEX_OUTPUT test
2012-10-11 12:27:10 +04:00
niko
97156897b2
format files to ANSI C style with coolformat
...
change the download channels to oclchannles()
fix bugs of arithm functions
perf fix of bilateral
bug fix of split test case
add build_warps functions
2012-10-11 16:22:47 +08:00
Vadim Pisarevsky
37ad10bf0d
fixed bug with partly uninitialized output of dft with DFT_COMPLEX_OUTPUT flag (bug #2223 )
2012-10-11 00:53:43 +04:00
Vadim Pisarevsky
63c9412922
enable huge value range in highgui sliders on Windows (patch #941 )
2012-10-10 23:05:15 +04:00
Andrey Kamaev
354b77e2e1
Applied fix from bug #2324 : ocv_list_unique makes for incorrect linking
2012-10-10 19:40:55 +04:00
Andrey Kamaev
d6a8753124
Remove second argument from VideoCapture_Reading perf test
2012-10-10 19:40:19 +04:00
Andrey Kamaev
d40083a926
Add concurrency test for solvePnPRansac
2012-10-10 18:23:11 +04:00
Andrey Kamaev
423837ddae
Restore theRNG seed reset on test SetUp as it is still needed
2012-10-10 18:07:03 +04:00
Vadim Pisarevsky
0e314163e5
fixed INT64_C & UINT64_C definitions (patch #2033 )
2012-10-10 17:27:32 +04:00
Oleg Sklyarov
2f4e8ee73e
Merge branch 'master' of git://code.opencv.org/opencv
2012-10-10 17:05:29 +04:00
Oleg Sklyarov
3f61b9792b
fixed bug #2407 : run.py now understands android device names with spaces
2012-10-10 16:59:00 +04:00
Vladislav Vinogradov
a008d6fc17
fixed bug #2425 : Concurrent convolutions with streams
2012-10-10 16:55:16 +04:00
marina.kolpakova
b28acfc12e
add GPU module specific command line arguments
2012-10-10 16:13:25 +04:00
marina.kolpakova
f88be98ec4
print information message about target device for GPU module tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
715a0032e0
add sanity checks into the denoising gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
45190aea47
add sanity checks into the features2d gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
2243645d36
add sanity checks into the objdetect gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
3de2023c61
add sanity checks into the calib3d gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
dce323a67b
add sanity checks into the video gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
d7ef6f078f
temporarily disable HoughLines test
2012-10-10 16:13:25 +04:00
marina.kolpakova
3dbfde421c
add sanity checks into the matop gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
2a277fb777
add sanity checks into the filters gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
1e344d7eba
add sanity checks into the imgproc gpu performance tests
2012-10-10 16:13:24 +04:00
marina.kolpakova
e46e928429
add sanity checks in core gpu pefrormance tests
2012-10-10 16:13:24 +04:00
marina.kolpakova
f5d6367ea1
GPU module performance tests are aligned with other OpenCV pefrofmance tests
2012-10-10 16:13:24 +04:00
marina.kolpakova
10f1004465
move GPU utiluty functions in utility.cpp
2012-10-10 16:13:24 +04:00
marina.kolpakova
a9ab26f799
main.cpp moved to perf_main.cpp
2012-10-10 16:13:24 +04:00
Vladislav Vinogradov
ece77e3930
fixed cvtColor parameter in KeypointBasedMotionEstimatorGpu::estimate
2012-10-10 16:07:07 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Daniil Osokin
1516a6169a
fixed one more msvc warning in tbb kmeans
2012-10-10 14:53:29 +04:00
Daniil Osokin
cc2d12b3e6
fixed msvc warning in tbb kmeans
2012-10-10 14:35:28 +04:00
Alexander Smorkalov
9ad5fd709b
Fixed Javadoc problems with ">" and "<" symbols.
2012-10-10 13:31:03 +04:00
Andrey Kamaev
006a4ba529
Fix gcc build error introduced in a9f36df
2012-10-10 13:24:49 +04:00
Andrey Kamaev
cabddaeb4f
Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed."
...
This reverts commit 36135fc59d
2012-10-10 13:24:49 +04:00
daniil.osokin
e83ff354bd
added TBB for kmeans (patch #1261 : thanks to Boris Mansencal)
2012-10-10 12:51:12 +04:00
daniil.osokin
a245161de6
added perf test for kmeans
2012-10-10 12:51:11 +04:00
Alexander Smorkalov
36135fc59d
Issue #2035 Calling cv::namedWindow crashes on Android fixed.
...
Window-related functions is guarded from calls from application code.
Old implementations with "no-gui" exception are stell compiled and linked to OpenCV library for binary compatibility.
2012-10-10 12:40:36 +04:00
Alexander Smorkalov
306ed9801a
Issue #2284 BaseLoaderCallback requires use of Activity fixed.
2012-10-10 11:44:01 +04:00
Andrey Kamaev
a9f36dfcfe
Fix read after the end of local buffer in SSE-optimized TYPE_5_8 and TYPE_7_12 FAST cornerScore
2012-10-10 02:32:47 +04:00
Andrey Kamaev
56b27bcc7e
Fix inconsistent argument type in HammingLUT distance (flann)
...
this fixes 64-bit MSVC warning
2012-10-10 00:31:22 +04:00
Vadim Pisarevsky
044d38a051
expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching
2012-10-09 22:38:04 +04:00
Vadim Pisarevsky
e365726c4a
fixed example of iteration through a SparseMat (bug #2310 )
2012-10-09 22:16:57 +04:00
Vadim Pisarevsky
a09c88ab16
added Asus Xtion QVGA modes to the OpenNI backend (patch #1753 )
2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
89de0bebd8
Merge remote-tracking branch 'origin/master'
2012-10-09 21:52:56 +04:00
Vadim Pisarevsky
3243ad3483
applied patch #1473 (timestamp retrieval in OpenNI)
2012-10-09 21:52:41 +04:00
Andrey Kamaev
0afd51253d
Add else branch to previous fix
2012-10-09 20:34:10 +04:00
Andrey Kamaev
34bfda10ca
Fix regression in core arithmetic
2012-10-09 20:25:36 +04:00
Andrey Kamaev
8ebd04cbf9
Fix sanity checks in highgui module
2012-10-09 19:39:03 +04:00
Andrey Kamaev
4a53199e7a
Quiet logs in stitching module
2012-10-09 19:28:15 +04:00
Andrey Kamaev
7cc67701a6
Add sanity checks to stitching perf tests
2012-10-09 19:17:58 +04:00
Andrey Kamaev
39d6eb7312
Add sanity check support for vector<DMatch>
2012-10-09 19:17:58 +04:00
Andrey Kamaev
d970a9159e
Add sanity checks to nonfree module
2012-10-09 19:17:58 +04:00
Kirill Kornyakov
e8a173bcaf
Merge branch 'master' of git://5.9.49.245/opencv
2012-10-09 18:57:02 +04:00
Kirill Kornyakov
9b8c47399a
fixed compilation error because of DetectionBasedTracker
2012-10-09 18:55:20 +04:00
Andrey Kamaev
5047f2d64d
Fix perf tests in features2d module
2012-10-09 18:41:27 +04:00
Andrey Kamaev
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
2012-10-09 18:41:26 +04:00
Andrey Kamaev
5a5c477be6
Make performance tests for solvePnPRansec more determenistic
2012-10-09 18:41:26 +04:00
Andrey Kamaev
d4cf9e22cc
Fix terrible perf test for FAST detector
2012-10-09 18:41:26 +04:00
Andrey Kamaev
b95923360d
Add sanity checkes to video module perf tests
2012-10-09 18:41:26 +04:00
Alexander Smorkalov
9a76573172
Auto expand of OpenCV version for Android Library prject and some documentation pages added.
2012-10-09 18:30:58 +04:00
Vadim Pisarevsky
b0ad424087
fixed several warnings from VS2010
2012-10-09 17:24:37 +04:00
Vadim Pisarevsky
a135e862c1
made opencv headers windows.h-less (Bug #2122 )
2012-10-09 17:12:42 +04:00
Vadim Pisarevsky
df8364ce63
Fixed "arr = NaN" case (bug #2056 )
2012-10-09 16:28:31 +04:00
Vadim Pisarevsky
d54f4e1cfb
added #undef True/False to avoid collision with X11 (Patch #1562 )
2012-10-09 16:02:06 +04:00
Vadim Pisarevsky
a8c5e35619
some more fixes towards binary compatibility
2012-10-09 15:56:16 +04:00
Andrey Kamaev
e2ff0ed1fb
Add sanity checks to objdetect module perf tests
2012-10-09 15:28:51 +04:00
Andrey Kamaev
c146c54bcd
Fix sanity checks for empty objects
2012-10-09 15:28:51 +04:00
Andrey Kamaev
f8672d49a0
Add sanity checks to calib3d perf tests
2012-10-09 15:28:51 +04:00
Evgeny Talanin
7c71c8fa52
#2258 fix
2012-10-09 14:52:47 +04:00
Alexander Smorkalov
4b808b1199
RESTART_REQUIRED status removed from OpenCV Manager API;
...
OpenCV info library name fixed;
Minimum API level for OpenCV library project increased up to 3 for using message dialogs.
2012-10-09 10:34:40 +04:00
Anatoly Baksheev
408e0dcbd0
Fixed output log in GPU perf tests
2012-10-09 00:44:48 +04:00
Anatoly Baksheev
c9bcbda827
more compilation fixes
2012-10-09 00:12:28 +04:00
Anatoly Baksheev
91a1a71de2
fixed compilation under Ubuntu without CUDA
2012-10-08 22:44:11 +04:00
Anatoly Baksheev
bc0d0c8f31
fixed compilation without CUDA
2012-10-08 21:49:40 +04:00
Andrey Kamaev
13bfcd643e
Fix sanity checks in improc perf tests
2012-10-08 21:37:58 +04:00
Andrey Kamaev
a3ab6d147d
Fix CV_ENUM macro instability
2012-10-08 21:37:58 +04:00
Vadim Pisarevsky
4be7619ce4
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
2012-10-08 21:37:15 +04:00
Vadim Pisarevsky
618fbf5508
yet another portion of changes towards the binary compatibility
2012-10-08 21:36:27 +04:00
Anatoly Baksheev
5b31c46c4f
added MatCn enum to GPU perf tests
2012-10-08 19:57:20 +04:00
Anatoly Baksheev
9a4265a8d0
fast nlm (class version)
2012-10-08 19:57:20 +04:00
Anatoly Baksheev
4b5bbb7752
fast_nlm initial version
2012-10-08 19:57:19 +04:00
Andrey Kamaev
2446c9329f
Remove bad perf test for cvRound
2012-10-08 18:40:41 +04:00
Andrey Kamaev
8c8ebd9ca6
Fix sanity checks for arithmetic tests on CV_32S data
2012-10-08 18:06:17 +04:00
Andrey Kamaev
6151a6ea0b
Make SANITY_CHECK required for all performance tests
2012-10-08 17:17:42 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Andrey Kamaev
25a9b0a255
Fix depth calculation for Scalar in core arithmetic
2012-10-08 16:15:27 +04:00
Andrey Kamaev
c0f2a8e0cc
Fix build without SSE
2012-10-08 16:08:16 +04:00
Alexander Smorkalov
febfdc9fa2
Wating for OpenCV library package installation added.
2012-10-08 14:37:59 +04:00
Alexander Smorkalov
11839e2cc9
Wating for OpenCV Manager installation added.
2012-10-08 14:37:59 +04:00
Alexey Spizhevoy
cb705aad1a
updated DP seaming to support 4 channel images
2012-10-08 14:29:10 +04:00
Vadim Pisarevsky
925d0cc769
added test for box filter 16u, fixed bug #2416
2012-10-08 14:11:39 +04:00
Ilya Lavrenov
280ecb68bf
changed file path
2012-10-08 13:27:28 +04:00
Ilya Lavrenov
2759f026e9
fixed Bug #2074
2012-10-08 12:59:15 +04:00
Andrey Kamaev
b486a59221
Quiet MSVC warning
2012-10-08 10:36:48 +04:00
marina.kolpakova
23699acca0
fix for bug 2264
...
fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7
2012-10-08 02:37:22 +04:00
Alexey Spizhevoy
2ec264303e
Added initial docs for the videostab module
2012-10-05 21:33:00 +04:00
Andrey Kamaev
73cb77842e
Replace jpegs with png (see 06a13d9)
2012-10-05 18:15:44 +04:00
Vladislav Vinogradov
be19150672
deleted thrust header
2012-10-05 18:06:46 +04:00
Vladislav Vinogradov
ab3a5244ba
moved device layer headers to include directory
2012-10-05 18:04:23 +04:00
Vladislav Vinogradov
3ebec7448d
minor refactoring:
...
moved lbp.hpp to src/cuda folder
added missing cv::gpu::device namespace
deleted whitespaces
2012-10-05 17:43:22 +04:00
Ilya Lavrenov
a703df5456
parallel cvtColor for MSVS and Apple
2012-10-05 13:11:24 +04:00
Leonid Beynenson
2fd8ad65b9
Made changes in cv::DetectionBasedTracker -- now it can return status of the tracked objects
2012-10-04 20:50:59 +04:00
Andrey Kamaev
9218bdcbb4
TBB version of GridAdaptedFeatureDetector
2012-10-04 16:58:34 +04:00
Vladislav Vinogradov
8d07e92b2c
disabled NPP resize for 8uc4+Cubic (Bug #2388 )
2012-10-04 13:33:47 +04:00
Vladislav Vinogradov
cfc09d01c8
disabled NVidia test output by default
2012-10-04 13:33:06 +04:00
Roy Reapor
5d9d4659ad
Fixed issue 2404
...
- imdecode_() only creates a temporary file when needed.
- Use the string's empty() function to flag if the temporary file needs
to be deleted.
2012-10-03 23:06:59 -07:00
Roy Reapor
aa400c5837
Fixed issue 2403
...
Created temporary files are now deleted in Win32.
2012-10-03 22:44:29 -07:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Vladislav Vinogradov
11367e2c3d
added GpuMat support to OutputArray
2012-10-02 14:34:17 +04:00
Vadim Pisarevsky
b2bf90e951
fixed build errors in java bindings on desktop in Debug mode
2012-10-02 10:49:19 +04:00
Anatoly Baksheev
4df537bc1c
warnings
2012-10-01 23:57:38 +04:00
Anatoly Baksheev
55b1d7c097
added CUDA_DISABLER preprocessor commands
2012-10-01 23:57:38 +04:00
Anatoly Baksheev
46874d40df
warnings under windows
2012-10-01 23:57:37 +04:00
Ilya Lavrenov
c560a78c65
stable cvtColor
2012-10-01 18:52:27 +04:00
Ilya Lavrenov
45593030ab
fixed TestRemap_Remap
2012-10-01 17:29:56 +04:00
Vadim Pisarevsky
57d9699058
added the note about 1-pixel border in findContours (relates to ticket #2362 )
2012-10-01 16:43:07 +04:00
Vadim Pisarevsky
c9f1490302
added variant of cv::imdecode with the specified output matrix
2012-10-01 16:23:40 +04:00
Vadim Pisarevsky
420dd22258
fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST
2012-10-01 14:12:19 +04:00
marina.kolpakova
dc568d4de1
fix for 4-channels TIFF missing 'break' statement
2012-10-01 08:33:56 +04:00
Marius Muja
ae4ff999d7
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-28 10:40:51 -07:00
Marius Muja
5cf6c5f0b2
Added test to fix backwards compatibility with the way LSH was handled before comit 7236858b
2012-09-28 10:40:38 -07:00
Andrey Kamaev
06e7101795
Add Tegra optimization for fastNlMeansDenoising
2012-09-28 18:56:36 +04:00
Ilya Lavrenov
9ee87bd04b
added parallel version of CvtColorLoop - main inner function of cvtColor
2012-09-28 17:42:48 +04:00
marina.kolpakova
c6e741196a
fix device pointer alignmen in sft-based integral integration
2012-09-28 14:55:45 +04:00
marina.kolpakova
ed6885dd8b
fixed bit arifmetic in sft-based integral
2012-09-28 14:55:45 +04:00
Alexey Spizhevoy
eafb024112
fixed one of the log messages in the stitching module
2012-09-28 14:37:38 +04:00
Andrey Pavlenko
8c1550a4ec
a new Java test to imencode() with params
2012-09-27 19:11:02 +04:00
Marius Muja
7236858bea
Exposed HierarchicalClusteringIndex in OpenCV wrapper
2012-09-27 03:58:17 -07:00
Alexey Spizhevoy
317a27e9eb
fixed the bug #2385
2012-09-25 16:08:43 +04:00
Vadim Pisarevsky
60769f544f
possibly repaired FAST test (however, FAST<7/12> and <5/8> could still do something different than described in the paper)
2012-09-25 15:50:03 +04:00
Evgeny Talanin
6308be2c3e
Changed parallel_for to parallel_for_ in hog.cpp and cascadedetect.cpp
2012-09-25 12:18:33 +04:00
Ilya Lavrenov
b8c185de9f
changed map indexes in test_remap
2012-09-24 20:36:25 +04:00
Ilya Lavrenov
6a3d5a1355
reorganized the resize algorithm
2012-09-24 17:07:08 +04:00
Anatoly Baksheev
f059899329
fixed bug in nln (out of border access)
2012-09-24 17:01:44 +04:00
Vadim Pisarevsky
854902b077
lowered tolerance thresholds in BRISK tests
2012-09-24 16:31:07 +04:00
bitwangyaoyao
3579c61388
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-24 20:29:21 +08:00
bitwangyaoyao
09359982b1
some optimizations to ocl::pyrDown, PyrLK and Canny
2012-09-24 20:28:35 +08:00
Vadim Pisarevsky
d09b3828b8
fixed fail in arithmetic test
2012-09-24 16:14:19 +04:00
Kirill Kornyakov
494ae1562d
Added 240p resolution alias for perf tests
2012-09-24 15:44:11 +04:00
Ilya Lavrenov
33983bcbb7
edited misprint
2012-09-24 14:18:54 +04:00
Ilya Lavrenov
0e07b0d73a
uncommented auto enabling GCD on Mac
2012-09-24 14:18:15 +04:00
Ilya Lavrenov
9c89947433
edited misprint
2012-09-24 13:46:09 +04:00
Ilya Lavrenov
2627c91c5e
added platform specific definitions in resize algorithm
2012-09-24 12:57:39 +04:00
Ilya Lavrenov
077115bd4a
debug
2012-09-24 12:40:20 +04:00
Ilya Lavrenov
bb589a590e
debug
2012-09-24 11:35:46 +04:00
Vadim Pisarevsky
427ce1247a
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
2012-09-23 20:57:34 +04:00
Ilya Lavrenov
b7b32e74a5
some restructuring of resize algorithm code
2012-09-21 18:17:54 +04:00
Ilya Lavrenov
222303f24b
attempt
2012-09-21 17:25:42 +04:00
Ivan Korolev
a8ba2d7f52
Added Rotation motion mode in the videostab module
2012-09-21 17:04:28 +04:00
Anatoly Baksheev
3b075a50e9
fixed warnings under windows
2012-09-21 13:41:56 +04:00
niko
0abe7f3196
many bugs fix for intel's HD4000
...
from my svn 855
2012-09-21 16:51:45 +08:00
Alexey Spizhevoy
f3bc1aede1
removed obsolte global motion estimation method
2012-09-21 10:46:21 +04:00
Leonid Beynenson
46ce5976ae
Fix: Windows compilation error in CommandLineParser.
2012-09-20 18:11:33 +04:00
Leonid Beynenson
0bde00a88a
Changed CommandLineParser to make it less verbose
...
when it is unrequired.
2012-09-20 18:01:24 +04:00
Alexander Kapustin
858f437162
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-20 17:32:54 +04:00
Andrey Kamaev
44e8d76d74
Change denoising strength parameter from int to float
2012-09-20 17:27:48 +04:00
Alexander Kapustin
8f4ddad52d
1. New function ActualScalarDepth was added
...
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
2012-09-20 17:24:20 +04:00
Alexander Kapustin
bb3332508e
1. New function ActualScalarDepth was added
...
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
Conflicts:
modules/core/src/arithm.cpp
2012-09-20 16:59:48 +04:00
Vladislav Vinogradov
6f175a3c52
changed the type of the arguments to const reference (Bug #2376 )
...
ORB_GPU::downloadKeyPoints
ORB_GPU::convertKeyPoints
2012-09-20 13:52:04 +04:00
yao
2e36338636
remove warnings of some functions in ocl module
2012-09-20 09:23:11 +08:00
Andrey Pavlenko
3bad6ac0ee
This reverts commit 738d3fef38.
2012-09-19 18:03:50 +04:00
Vadim Pisarevsky
1ded1597e7
fixed mixed-type array operations (bug #2336 )
2012-09-19 17:55:34 +04:00
Alexander Kapustin
738d3fef38
1. New function ActualScalarDepth was added
...
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
2012-09-19 17:08:25 +04:00
Vadim Pisarevsky
45fd6f509f
Merge remote-tracking branch 'origin/master'
2012-09-19 16:57:27 +04:00
Vadim Pisarevsky
40d5b026c7
fixed verbose mode in highgui's DirectShow wrapper (bug #2350 )
2012-09-19 16:57:10 +04:00
Andrey Kamaev
56ac2937d8
Fix typo
2012-09-19 16:56:54 +04:00
Vadim Pisarevsky
54705a009a
Merge remote-tracking branch 'origin/master'
2012-09-19 16:52:07 +04:00
Vadim Pisarevsky
c3c49a317b
fixed outlier filtering in cvStereoRectifyUncalibrated (bug #2367 )
2012-09-19 16:51:49 +04:00
Andrey Kamaev
f42b38ac44
Refactor fast NL-means denoising
...
* reorder arguments
* rewrite accuracy tests
* replace doubles with integer arithmetic inside the main loop
2012-09-19 16:50:56 +04:00
Vadim Pisarevsky
4e07561141
fixed possible compile error in cap_ffmpeg_impl.hpp (bug #2365 )
2012-09-19 16:48:19 +04:00
yao
d38359620e
some optimizations to ocl::blend
2012-09-19 10:52:25 +08:00
Oleg Sklyarov
bbe418427e
Added WQHD = 1444p frame size
2012-09-18 18:02:29 +04:00
Vadim Pisarevsky
2d334401b1
improved the condition in the FAST test
2012-09-18 14:34:50 +04:00
Vadim Pisarevsky
d2613dd9f6
added patches by Bram Bolder
2012-09-18 14:11:08 +04:00
yao
310bd8701c
a little optimizations to ocl::pyrDown
2012-09-18 17:57:37 +08:00
Ilya Lavrenov
fffd263ce4
attempt
2012-09-17 19:39:49 +04:00
Ilya Lavrenov
f58c5646b0
fixed wrong condition with interpolation types
2012-09-17 18:30:55 +04:00
Ilya Lavrenov
5ab3fe489f
changed resize_area test
2012-09-17 17:38:23 +04:00
Andrey Kamaev
7e35838849
Minor refactoring of NL-means denoising
2012-09-17 17:19:00 +04:00
Ilya Lavrenov
a65cb5d2de
added extra debug parameters in resize test
2012-09-17 17:08:06 +04:00
Vadim Pisarevsky
58fb8692c3
added test for png encoding bug #2352
2012-09-17 16:44:40 +04:00
Ilya Lavrenov
03daf44848
added recalculating scale coefficients
2012-09-17 16:31:30 +04:00
Vadim Pisarevsky
d9e801fbfa
improved image rendering performance in Qt backend for highgui UI (bug #2356 )
2012-09-17 16:13:53 +04:00
Vadim Pisarevsky
37f4ea6be7
Merge remote-tracking branch 'origin/master'
2012-09-17 16:12:36 +04:00
Vadim Pisarevsky
7946fcdb69
added test for #2336
2012-09-17 16:12:30 +04:00
Andrey Kamaev
e73089bdb5
Fix windows build warnings
2012-09-17 13:30:28 +04:00
Andrey Kamaev
089de14ed7
Fix copy-paste bug in AVX optimization of haar
2012-09-17 13:30:28 +04:00
Andrey Kamaev
f32eb05ea1
Fix AVX and other SIMD support detection
2012-09-17 13:30:28 +04:00
Andrey Kamaev
cd05d9aaad
Fix build of Java API for Windows
2012-09-17 13:21:20 +04:00
Andrey Kamaev
fe0d07ae53
Add experimental support for desktop Java
...
Based on pull request #31 (thanks to Eric Christiansen)
Support for Java is turned off by default and can be enabled setting
BUILD_opencv_java to ON (e.g. cmake -DBUILD_opencv_java=ON ..)
2012-09-17 13:21:20 +04:00
yao
78e89890b0
add PyrLK to ocl module
2012-09-17 09:48:34 +08:00
Andrey Kamaev
0e9405e591
Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation
2012-09-14 22:26:32 +04:00
Alexander Smorkalov
8104164c78
All HTC One S related changes reverted due to applyProperties problems on other devices. Libraries rebuilt.
2012-09-14 16:51:38 +04:00
yao
9efd7019ad
A more reasonable verify method for ocl::HOG accuracy test
2012-09-14 17:07:29 +08:00
Vladislav Vinogradov
538847e8a3
fixed compilation under VS2012 (Bug #2352 , #2355 )
2012-09-14 09:34:56 +04:00
Andrey Kamaev
4772c42c66
Tweak strip flags for Android camera wrapper libs
2012-09-13 20:28:25 +04:00
Vladislav Vinogradov
35b671efb5
disabled utility code in gpu tests when WITH_CUDA=false
2012-09-13 12:17:35 +04:00
Vladislav Vinogradov
fd77ef7ece
optimized gpu pyrDown and sepFilter2D
2012-09-13 10:21:43 +04:00
Vladislav Vinogradov
7591ee1688
fixed gpu perf tests (VideoCapture reopen)
2012-09-13 10:18:42 +04:00
Alexander Smorkalov
afe30d0f8a
Native camera fix for Nexus 7 with Android JB. Camera build script updated.
2012-09-12 14:29:00 +04:00
yao
656f06fa74
add bruteForceMatcher to ocl module
2012-09-12 11:40:13 +08:00
niko
23244a3565
rename all the perf test files
...
fix the channel 3 bug in matrix operation
perf and buf fix for LUT haardetect convertC3C4 resize warpaffine copytom settom
add convovle
remove stereo
2012-09-12 10:31:09 +08:00
Vadim Pisarevsky
e94cd1ec72
updated description of LineIterator with information about LineIterator::pos() (ticket #2338 )
2012-09-11 20:20:05 +04:00
Vadim Pisarevsky
52ede9c84d
fixed just introduced bug in Python wrapper generator
2012-09-11 20:04:18 +04:00
Vadim Pisarevsky
84087a8566
fixed crash in Python's SURF wrapper (bug #2325 )
2012-09-11 16:47:25 +04:00
Vladislav Vinogradov
e975259c06
several fixes in gpu module
...
fixed iterations>1 case in morphological operations
fixed possible access violation in HSV2RGB
fixed the case learningRate==0 in BackgroundSubtractorMOG2
2012-09-11 15:00:59 +04:00
Vadim Pisarevsky
9956c42804
fixed iterations>1 case in morphological operations (bug #2348 ; thanks to Andrei Zaharescu for the fix)
2012-09-11 14:49:56 +04:00
Vadim Pisarevsky
9ea5b6bb44
fixed possible access violation in HSV2RGB (patch #2020 )
2012-09-11 14:25:34 +04:00
Vadim Pisarevsky
bbeffcc115
fixed the case learningRate==0 in BackgroundSubtractorMOG2 (patch #2221 ; thanks to Will Lucas)
2012-09-11 14:13:37 +04:00
Vadim Pisarevsky
bb93651048
added support for bi-level PNG's (patch #2301 ; thanks to Costantino Grana)
2012-09-11 14:05:25 +04:00
Vadim Pisarevsky
b3408a9b3a
fixed bug #2186 (thanks to Joao Soares for the patch)
2012-09-11 13:56:25 +04:00
Ilya Lavrenov
fbd9bfba47
fixed some warnings and errors on windows
2012-09-10 21:37:44 +04:00
Andrey Kamaev
b1b5e392e6
Fix Android build warnings in new imgproc tests
2012-09-10 20:33:35 +04:00
Ilya Lavrenov
dd1091bbe1
a reference function for remap was stabilized
2012-09-10 19:55:03 +04:00
Andrey Kamaev
a201233b59
Fix warning in Android camera code
2012-09-10 19:44:59 +04:00
Alexander Smorkalov
7d4432df27
getWidth/getHeight optimized.
2012-09-10 17:08:35 +04:00
Vladislav Vinogradov
98c92f196e
added Generalized Hough implementation
2012-09-10 16:49:40 +04:00
Alexander Smorkalov
86c7e183d2
Issue #2316 Change default libnative_camera path implemented.
2012-09-10 16:29:37 +04:00
Andrey Kamaev
e564a53ccd
Add gitignore for Android tests and samples
2012-09-10 15:48:57 +04:00
yao
7d83db7d4d
fix ocl::columnsum bug
2012-09-10 14:52:28 +08:00
Philipp Wagner
42f7329c78
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-07 22:44:15 +02:00
Philipp Wagner
cfa250eff5
The labels of a model are now cloned instead of using Mat::copyTo, because Mat::copyTo leads to a crash with the Python wrapper. I need to further investigate it.
2012-09-07 22:42:46 +02:00
Andrey Kamaev
f268af8ef0
Removed remaining SWIG marks from headers
2012-09-07 22:19:43 +04:00
Philipp Wagner
a5e37779fb
Added a simple CMakeLists.txt to the facerec_samples, which are not included in the samples folder. Makes building these samples a lot easier.
2012-09-07 17:33:44 +02:00
Andrey Morozov
e2d9fc4dcc
fixed compile error under linux
2012-09-07 18:01:06 +04:00
Vadim Pisarevsky
7c13dc6cb3
little fix in command line parser - catch unknown parameter types
2012-09-07 17:49:38 +04:00
Vadim Pisarevsky
0598f33a85
refactored command line parser, fixed the docs
2012-09-07 17:44:01 +04:00
Alexander Smorkalov
710e070990
Native camera issue on HTC One S fixed.
...
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
2012-09-07 17:22:47 +04:00
AoD314
54a202b3d5
add new version of CommandLineParser. add empty docs
2012-09-07 13:24:48 +04:00
Andrey Kamaev
70234433d3
Reduce verbosity of Java API generators
2012-09-06 18:54:38 +04:00
Andrey Kamaev
b8adc04545
Fix Android build warnings
2012-09-06 18:54:38 +04:00
Andrey Kamaev
2cc262bce4
Fix Android CMake toolchain compiler and linker flags
2012-09-06 18:54:38 +04:00
Vsevolod Glumov
037e3ee288
Fixed some minor formatting issues in 'old_basic_structures' and 'operations_on_arrays'.
2012-09-06 10:57:28 +04:00
yao
a1796469f7
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-06 14:39:56 +08:00
yao
1b6639aa3d
A little optimization on ocl/pyrdown, ocl/canny
2012-09-06 14:39:20 +08:00
Vsevolod Glumov
3d072dce02
Revert "Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'."
...
This reverts commit 907a9101eb
2012-09-06 10:38:03 +04:00
Vsevolod Glumov
907a9101eb
Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'.
2012-09-05 18:13:54 +04:00
Vadim Pisarevsky
932100c5a3
fixed build errors and warnings on Windows
2012-09-05 17:06:07 +04:00
Vadim Pisarevsky
dcdbc638af
Merge https://github.com/urikz/opencv
2012-09-05 16:01:59 +04:00
Andrey Kamaev
bcd0aefbca
Fix gcc build errors and warnings
2012-09-05 15:51:51 +04:00
Yury Zemlyanskiy
66ce62cd0d
Small fixed #3
2012-09-05 14:39:33 +04:00
Yury Zemlyanskiy
036258b8da
Small fixed #2
2012-09-05 14:36:40 +04:00
Yury Zemlyanskiy
9d1aa37e21
Small fixes
2012-09-05 14:19:44 +04:00
Yury Zemlyanskiy
4e0fdf2205
Merge remote-tracking branch 'itseez/opencv'
...
Conflicts:
modules/video/src/simpleflow.cpp
modules/video/test/test_simpleflow.cpp
2012-09-05 13:40:14 +04:00
Yury Zemlyanskiy
0c10ed26e3
Update to improve performance of SimpleFlow algorithm
...
+ Improve performance of calcOpticalFlowSingleScale method
+ Small refactoring
Current results:
IMAGE NAMES RMSE
Beanbags
Dimetrodon 0.329428
DogDance
Grove2 0.550852
Grove3 1.464699
Hydrangea 0.523277
MiniCooper
RubberWhale 0.367246
Urban2 2.717003
Urban3 4.185070
Venus 0.775422
Walking
Time (for Urban3):
17.490248 sec
2012-09-05 13:27:47 +04:00
Takahiro Horikawa
ec45453baa
#523 Fix the problem where the MaxSize parameter in cvHaarDetectObjects does not work when the flag CV_HAAR_SCALE_IMAGE is not set.
2012-09-04 20:46:42 -07:00
Ilya Lavrenov
5eac0419b2
changed eps in validate_result function
2012-09-04 22:22:07 +04:00
Ilya Lavrenov
be51e5d1b1
More strict tests for image waring algorithms
2012-09-04 21:52:40 +04:00
Andrey Kamaev
07d92d9e5a
Fix android build warnings
2012-09-04 17:44:23 +04:00
Andrey Kamaev
8325a28d09
Merge branch 'android-toolchain'
2012-09-04 17:10:52 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Vsevolod Glumov
16717a8641
Partially cleaned 'operations_on_arrays' section of undocumented parameters.
2012-09-04 15:44:21 +04:00
Vadim Pisarevsky
959674618f
restored SSE2 and added AVX optimization of the old haar face detector
2012-09-04 14:59:38 +04:00
Vadim Pisarevsky
dea52eb730
fixed 4-channel resizeAreaFast x2 decimation case
2012-09-04 14:51:31 +04:00
Vadim Pisarevsky
e17b70e533
updated documentation with the new PCA functionality
2012-09-04 14:14:24 +04:00
Kevin
93155c6ae0
Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated
2012-09-04 13:58:59 +04:00
Vadim Pisarevsky
a74a2302aa
fixed bug #2331
2012-09-04 13:34:52 +04:00
yao
8f8a69d6f5
fix bug of ocl::canny
2012-09-04 08:51:08 +08:00
Vadim Pisarevsky
778c31a1c8
added SSE2-optimized boxfilter by Grigoriy Frolov
2012-09-03 17:31:20 +04:00
Vadim Pisarevsky
67ff95083d
added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters
2012-09-03 17:03:31 +04:00
Andrey Kamaev
6ee7ecb617
Merge pull request #28 : add openexr to 3rdparty libs
2012-09-03 16:03:25 +04:00
niko
11b403900e
add channel 3 for test/main.cpp
...
add remap
2012-09-03 18:07:31 +08:00
yao
c8bfc0fd89
A little fix to ocl accuracy tests, make them more uniformed
2012-09-03 17:23:13 +08:00
yao
0fdb55a54d
update some of the functions in ocl module to the latest version
2012-09-03 17:03:37 +08:00
