edgarriba
4a214c08e5
removed old code
2014-08-12 17:07:38 +02:00
edgarriba
12f8d8069d
removed old code
2014-08-12 16:49:19 +02:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
edgarriba
de2861e7a9
DLS performance modifications
2014-08-12 16:20:22 +02:00
edgarriba
d1f4f6f4b8
DLS performance modifications
2014-08-12 16:15:19 +02:00
Vadim Pisarevsky
c97c0be4f2
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
2014-08-12 13:56:59 +00:00
Vadim Pisarevsky
5505aa28ce
Merge pull request #3078 from vpisarev:refactor_features2d_take3
2014-08-12 13:56:17 +00:00
Vadim Pisarevsky
5119564579
Merge pull request #3033 from nathanjackson:clahe_datatypes
2014-08-12 10:45:29 +00:00
Vadim Pisarevsky
1629d50999
removed some more trailing whitespaces
2014-08-12 14:33:18 +04:00
Alexander Alekhin
da806cc3e7
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
2014-08-12 10:21:41 +00:00
Elena Gvozdeva
8124d10526
fixed Erode and Dilate in case of kernel = Mat()
2014-08-12 12:19:13 +04:00
vbystricky
6fb282aa39
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result
2014-08-12 11:25:23 +04:00
Vadim Pisarevsky
bca4eb5e00
fixed more doc builder warnings
2014-08-12 10:40:23 +04:00
Nathan Jackson
563200fbf6
CPU (non-OpenCL) CLAHE now supports CV_16UC1.
2014-08-11 18:25:08 -04:00
Vadim Pisarevsky
d119afafdb
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:30:06 +04:00
Vadim Pisarevsky
fe7b48aa8f
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:29:56 +04:00
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
f937f4d951
Merge pull request #3077 from kenlck:master
2014-08-11 16:41:30 +00:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
edgarriba
dccc10ff12
DLS perf
2014-08-11 17:53:43 +02:00
edgarriba
2666da892f
DLS perf update
2014-08-11 17:09:26 +02:00
Alexander Alekhin
8fd61c9aa6
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
2014-08-11 15:02:53 +00:00
Alexander Alekhin
73115233bb
Merge pull request #3074 from ElenaGvozdeva:ocl_lut
2014-08-11 15:01:25 +00:00
edgarriba
cc81b4a5cd
SOLVEPNP_* flags whitespace
2014-08-11 16:31:28 +02:00
edgarriba
afdb67b462
SOLVEPNP_* flags
2014-08-11 16:28:09 +02:00
Vadim Pisarevsky
8202ab37d8
Merge pull request #3072 from nickdademo:pvapi_decimation_binning
2014-08-11 14:04:38 +00:00
Alexander Alekhin
b7d1a70919
Merge pull request #3063 from akarsakov:ocl_warps_check
2014-08-11 13:20:11 +00:00
Low Chin Kian
911e1bd1e4
Allow full range IPv4 support, up to 255.255.255.255
...
Signed-off-by: Low Chin Kian <kenlck1990@gmail.com>
2014-08-11 21:08:37 +08:00
Elena Gvozdeva
b73b28ab9c
fix for ocl_lut
2014-08-11 16:21:55 +04:00
vbystricky
dfe5fff2f5
Restore OpenCL branch for minmaxLoc on float data
2014-08-11 15:57:29 +04:00
Alexander Karsakov
498da24b8b
Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests
...
with test_loop_times=30
2014-08-11 15:52:53 +04:00
Alexander Karsakov
835b5e2179
Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30.
2014-08-11 15:50:06 +04:00
Alexander Karsakov
6b0e63b652
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
2014-08-11 15:37:05 +04:00
Nick D'Ademo
2b94bcffb9
Added get and set for additional PVAPI properties: DecimationHorizontal, DecimationVertical, BinningX, BinningY
2014-08-11 13:30:36 +02:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
edgarriba
90b3086f4a
RANSAC test confidence 0.99
2014-08-11 12:31:10 +02:00
Vadim Pisarevsky
07744af790
Merge pull request #3066 from vpisarev:minor_fixes
2014-08-11 10:27:30 +00:00
edgarriba
6c8b11afee
DLS test
2014-08-11 11:31:18 +02:00
edgarriba
b7a19a9a5f
Removed Timer
2014-08-11 11:06:05 +02:00
edgarriba
d7f0b9de25
DLS test
2014-08-11 11:02:00 +02:00
Vadim Pisarevsky
0f66e2757b
Merge pull request #3069 from vpisarev:refactor_video
2014-08-11 08:47:59 +00:00
edgarriba
c7f6c0cb9f
Fixed warnings + RANSAC confidence to double
2014-08-11 10:17:42 +02:00
edgarriba
213241c06a
DLS test update
2014-08-11 09:44:24 +02:00
Vadim Pisarevsky
8368d54d36
Merge pull request #3061 from ElenaGvozdeva:ocl_resize
2014-08-11 06:41:48 +00:00
Vadim Pisarevsky
9ef373f6a5
Merge pull request #3038 from yury-gorbachev:core_arithm_neon
2014-08-10 20:20:04 +00:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
4de4ff5682
Merge pull request #3067 from vpisarev:minor_fixes2
2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
92f326a1b1
Merge pull request #3068 from vpisarev:added_face_module
2014-08-10 10:50:56 +00:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00