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 Karsakov
5898dcae4a
Added ROUNDING_EPS for identical rounding after dividing on different platforms
2014-08-12 14:28:48 +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
Alexander Karsakov
10b3d00fd1
Increased epsilon for passing test with IPPICV
2014-08-12 10:42:42 +04:00
Vadim Pisarevsky
bca4eb5e00
fixed more doc builder warnings
2014-08-12 10:40:23 +04:00
Alexander Karsakov
f3dfdfef8a
Fixed warning with "uninitialized local variable"
2014-08-12 10:35:15 +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
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
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
edgarriba
2d26f60192
test dls
2014-08-09 21:54:22 +02:00
edgarriba
3780de9d98
test for DLS
2014-08-09 21:26:38 +02:00
edgarriba
67eb6dde75
warning removed
2014-08-09 20:55:18 +02:00
Yury Gorbachev
9a233999a9
Fixed review comment from Vadim Pisarevsky
2014-08-09 13:37:53 +04:00
Vadim Pisarevsky
09907eeb62
Merge pull request #2639 from kazuki-ma:cv_mat_foreach
2014-08-09 08:25:05 +00:00
Vadim Pisarevsky
0224a20ff6
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
2014-08-08 22:33:40 +04:00
Vadim Pisarevsky
99eed2d885
Merge pull request #3057 from Adil-Ibragimov:adding-constness
2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
62f90219fc
Merge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur
2014-08-08 17:16:38 +00:00
Vadim Pisarevsky
74457cd3b5
Merge pull request #3055 from akarsakov:copyto_UMat_fix
2014-08-08 14:20:02 +00:00
Vadim Pisarevsky
ce0297ed61
Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg
2014-08-08 14:06:49 +00:00
Vadim Pisarevsky
88672f414b
Merge pull request #3056 from akarsakov:ocl_setIdentity_fix
2014-08-08 14:03:46 +00:00
Vadim Pisarevsky
951014803b
Merge pull request #3060 from akarsakov:ocl_dft_fix
2014-08-08 14:03:27 +00:00
Elena Gvozdeva
7cba3ac4f8
small fix for GaussianBlur ocl test
2014-08-08 17:47:57 +04:00
edgarriba
f8c5acee4c
modified number test points
2014-08-08 15:20:38 +02:00
Alexander Karsakov
7849c35de1
Changed check condition in tests for warpAffine and warpPerspective
2014-08-08 17:14:38 +04:00
Maksim Shabunin
f908c2b0e3
Revert "Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors."
...
This reverts commit e85bacff7b
2014-08-08 16:59:24 +04:00
Maksim Shabunin
032c363ea0
Revert "Fix a heap issue with static on Windows"
...
This reverts commit 8e93c19de3
2014-08-08 16:59:13 +04:00
Maksim Shabunin
0be18aca81
Revert "Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances"
...
This reverts commit e63d7de87c
2014-08-08 16:58:35 +04:00
Maksim Shabunin
4c54b287e4
Revert "Fix local variable shadowing"
...
This reverts commit 2f8b5731da
2014-08-08 16:55:10 +04:00
Elena Gvozdeva
b7899c3d5c
small fix for ocl_resize
2014-08-08 16:12:10 +04:00
Alexander Alekhin
03435c0d74
fix IOS framework
2014-08-08 15:57:54 +04:00
edgarriba
8b732e086d
updated ransanc model
2014-08-08 13:52:15 +02:00
Elena Gvozdeva
b5f251c815
fixed test ocl_MatchTemplate for sparse matrix
2014-08-08 13:37:18 +04:00
Alexander Karsakov
6ad4521b78
Fixed typos
2014-08-08 13:11:35 +04:00
Alexander Alekhin
d0f789dc90
Merge pull request #3044 from akarsakov:fix_ocl_tests
2014-08-07 20:14:17 +00:00
Adil Ibragimov
8dab2ffce7
fixing error, wrong template method param.
2014-08-07 17:43:32 +04:00
Adil Ibragimov
6b05ca589d
fixing Mac build
2014-08-07 17:06:22 +04:00
edgarriba
e5a91a8be8
Modification Ransac model points
2014-08-07 14:59:01 +02:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Karsakov
c5ad6de596
Fixed choice of kercn and rowsPerWI for non-Intel device.
2014-08-07 15:37:26 +04:00
Elena Gvozdeva
7dd7dd97cd
fixed nDiffs for CalcBackProject
2014-08-07 15:36:00 +04:00
Elena Gvozdeva
c9b5d8cf4c
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
2014-08-07 15:36:00 +04:00
edgarriba
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
Alexander Karsakov
00221e96fd
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
2014-08-07 13:16:02 +04:00
Alexander Karsakov
44fbfb2cf6
Fixed extrapolation in pyrDown
2014-08-07 10:39:25 +04:00
Alexander Karsakov
2a0b39d30a
Fixed calculate_histogram kernel
2014-08-07 10:39:24 +04:00
Alexander Karsakov
eb9fdb0164
Fixed rounding in remap INTER_LINEAR mode
2014-08-07 10:39:24 +04:00
Alexander Karsakov
fec21239c8
Revert optimization for warpAffine INTER_NEAREST mode
2014-08-07 10:39:18 +04:00
Vadim Pisarevsky
d30729a816
Merge pull request #3047 from prattmic:python2and3
2014-08-07 06:38:37 +00:00
Vadim Pisarevsky
44f24efad4
Merge pull request #3054 from zillatrooper:master
2014-08-07 06:34:31 +00:00
arc
3d0a270a66
Merge branch 'master' into python2and3
2014-08-07 01:04:26 -04:00
Michael Pratt
e9ccadebed
Support Python 2 and 3 in test script
...
Add Python 3 support to the Python test.py script.
The print function is used in place of the print statement.
The urlopen function has been moved to urllib.request in Python 3, so
attempt to import it from either location.
TestCase.assert_() has been deprecated in place of
TestCase.assertTrue().
The tests all pass in both Python 2 and 3.
2014-08-07 00:51:48 -04:00
Michael Pratt
7d41ce23a7
Build Python 3 bindings in subdirectory
...
Build the Python 3 cv2 module in lib/python3/, to avoid potential naming
conflicts with the Python 2 bindings.
The Python 2 bindings are placed directly in lib/, where they are
required for the Buildbot to successfully execute the Python tests.
2014-08-07 00:21:42 -04:00
Michael Pratt
d921cde4d2
Add opencv_matlab to Python ignored modules
...
Requested by @vpisarev in #3047 .
2014-08-07 00:16:49 -04:00
Vadim Pisarevsky
0428ce4703
Merge pull request #3037 from PhilLab:pnpPatch
2014-08-06 20:21:05 +00:00
Björn Wöldecke
f3aa4bdf59
fix misinterpretation of empty window name
...
The documentation states, that a NULL or an empty window name can be used
to refer to the control panel. But the string parameters of the C++ frontend
methods cannot be NULL and converting an empty string to a const char* by
c_str() doesn't produce a NULL pointer, but an empty string. Unfortunately,
the const char* pointer is just passed on to the standard C functions in
the QT backend, which doesn't check for the empty string case.
There are two places where the empty string check could have been introduced:
inside the frontend or inside the backend. As long as the documentation only
mentions this as a special case for the QT backend, the best place seems to
be there.
2014-08-06 19:02:48 +02:00
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
bab5700a09
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
2014-08-06 11:26:07 +00:00
Vadim Pisarevsky
d611684d9e
Merge pull request #3041 from adrians:optimize_split
2014-08-06 09:22:38 +00:00
Michael Pratt
9d9411555f
Place Python library out in dedicated folder
...
Place the built Python module library in a dedicated folder inside of
lib/. This ensures that even if the Python 2 and Python 3 module names
conflict, they will not overwrite one another.
2014-08-06 02:31:30 -04:00
Michael Pratt
976c727eec
Fix a few more PYTHON_NUMPY_INCLUDE_PATH
...
The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.
2014-08-06 02:30:35 -04:00
Michael Pratt
218b12c557
Merge branch 'master' into python2and3
2014-08-06 01:45:07 -04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1
Removed whitespaces
2014-08-05 17:02:06 +02:00
Alexander Alekhin
d2f1c00719
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
2014-08-05 14:52:22 +00:00
Alexander Alekhin
06547120aa
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
2014-08-05 14:17:06 +00:00
vbystricky
774d277c1f
Fix error in OpenCl version of meanstddev for continues src and not continues mask
2014-08-05 17:30:06 +04:00
vbystricky
2637b18b67
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
2014-08-05 16:34:23 +04:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
Elena Gvozdeva
7999fbf765
fixed ocl_integral
2014-08-05 12:01:28 +04:00
Elena Gvozdeva
f32b52ea8d
fixed test for CvtColor RGB -> Luv
2014-08-05 11:54:26 +04:00
Elena Gvozdeva
8c2c3b54d9
fixed ocl tests for BlendLinear, BoxFilter, Integral
2014-08-05 11:41:08 +04:00
Adrian Stratulat
b2acd1f75a
Vectorize split & merge for NEON
2014-08-05 06:51:36 +00:00
Vadim Pisarevsky
a05ce00a65
Merge pull request #2879 from alalek:ocl_runtime_flags
2014-08-04 16:43:01 +00:00
Vadim Pisarevsky
a58767eff8
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
2014-08-04 14:54:12 +00:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Yury Gorbachev
61423a2d47
ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions.
...
NOT verified on target platform, compilation passes with and without NEON.
2014-08-04 16:44:51 +04:00
unknown
3fe4980ce1
Double precision for solvePnPRansac()
2014-08-04 14:20:32 +02:00
vbystricky
2d587ad691
Prevent generating test case with mask filled 0 only
2014-08-04 15:12:36 +04:00
Vladislav Vinogradov
a3da3a01e1
fix test_opencv_imgproc compilation
2014-08-04 12:13:33 +04:00
Vladislav Vinogradov
cdb7b83741
fix python module compilation with enabled CUDA support:
...
filterout all CUDA related headers from python module include headers
2014-08-04 12:12:51 +04:00
Alexander Alekhin
add9ce46c3
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
2014-08-04 08:09:38 +00:00
Vadim Pisarevsky
222f8a3d5e
hopefully fixed test failure on Linux
2014-08-04 01:16:45 +04:00
Vadim Pisarevsky
24b01a8e4f
continuing to debug boost and fix MSVC compile errors
2014-08-03 21:21:11 +04:00
Vadim Pisarevsky
98a1181240
fixed the condition
2014-08-03 13:15:43 +04:00
Vadim Pisarevsky
79b593d8d8
more fixes and more debugging code
2014-08-03 13:08:03 +04:00
Vadim Pisarevsky
eeb786fcfd
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code
2014-08-03 12:46:28 +04:00
Vadim Pisarevsky
9cb79b9abb
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:31 +04:00
Vadim Pisarevsky
8e9d1d9fe6
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:20 +04:00
Vadim Pisarevsky
2520e335d1
removed many extra whitespaces; fixed 1 warning
2014-08-03 03:08:25 +04:00
Vadim Pisarevsky
28ca6ac05e
fixed building html docs
2014-08-03 02:34:47 +04:00
Vadim Pisarevsky
d3cdfefa03
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
2014-08-02 21:52:24 +00:00
Vadim Pisarevsky
c6593d02a6
updated docs
2014-08-03 01:41:30 +04:00
Vadim Pisarevsky
c20ff6ce19
made everything compile and even run somehow
2014-08-03 01:41:09 +04:00
VBystricky
2026094691
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
2014-08-02 13:21:34 +04:00
Alexander Alekhin
c595457ea0
Merge pull request #3011 from vbystricky:oclopt_morthosmall
2014-08-01 17:21:59 +00:00
Alexander Alekhin
11dd36f3aa
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
2014-08-01 17:15:53 +00:00
Alexander Alekhin
b33a093844
Merge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix
2014-08-01 17:15:38 +00:00
Roman Donchenko
74e58ddbb1
Disable the broken fisheye undistortImage test
2014-08-01 19:50:17 +04:00
VBystricky
0f9b79ef64
Change min-max to clamp
2014-08-01 19:45:11 +04:00
vbystricky
aad4104297
Fix accurency test for OpenCL matrix operations
2014-08-01 18:30:20 +04:00
vbystricky
184c5917bf
Fix accurency test of OpenCL merge function.
2014-08-01 17:53:24 +04:00
Vadim Pisarevsky
936536a284
Merge pull request #2671 from syilma:HomographyDecomp
2014-08-01 13:08:20 +00:00
Vadim Pisarevsky
d01ca30f55
Merge pull request #3018 from fradelg:master
2014-08-01 13:06:36 +00:00
Ernest Galbrun
6594d52185
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
2014-08-01 14:54:55 +02:00
vbystricky
b724208510
Fix Luv2RGB function
2014-08-01 16:39:12 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
345b69d5f7
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation
2014-08-01 09:42:40 +00:00
Vadim Pisarevsky
05164bf713
Merge pull request #2608 from Siddharthk:master
2014-08-01 09:13:32 +00:00
Alexander Alekhin
b3e31fb8d6
Merge pull request #3023 from vbystricky:ocl_minMaxLoc
2014-08-01 08:57:37 +00:00
edgarriba
3e2a57ff35
Update for non Eigen users
2014-08-01 10:48:39 +02:00
Fco. Javier Delgado del Hoyo
625fd61313
Removed OpticalFlowBM test from cudaoptflow module
2014-08-01 09:28:19 +02:00
Vadim Pisarevsky
18de8dee62
Merge pull request #3009 from vpisarev:ios_experiments
2014-07-31 18:20:07 +00:00
Alexander Alekhin
f8aecb2a32
Merge pull request #3002 from vbystricky:oclopt_pyrdown
2014-07-31 15:43:18 +00:00
vbystricky
b48e487d53
Enable ocl version of minmaxloc with mask
2014-07-31 19:12:10 +04:00
vbystricky
11a0e3ff78
Fix error in OCL minmaxloc
2014-07-31 19:04:38 +04:00
Ernest Galbrun
7b8bb4248b
Merge branch 'cuda_concurrency' into tvl1_chambolle
2014-07-31 16:08:57 +02:00
Ernest Galbrun
ae26368e78
Merge branch 'master' into cuda_concurrency
2014-07-31 16:03:51 +02:00
Ernest Galbrun
917107e635
removed bm legacy
2014-07-31 16:01:54 +02:00
Vladislav Vinogradov
7030a1f9a2
fix cudabgsegm module compilation
2014-07-31 17:55:59 +04:00
Elena Gvozdeva
9db8592aa8
fixed ocl_flip for cn==3
2014-07-31 16:57:47 +04:00
Vadim Pisarevsky
2f2a9ad536
Merge pull request #3020 from vpisarev:ocl_disable_more_funcs
2014-07-31 12:54:13 +00:00
Vadim Pisarevsky
b0cd822924
trying to make the tests pass
2014-07-31 14:24:21 +04:00
Vadim Pisarevsky
10b60f8d16
continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way
2014-07-31 14:12:10 +04:00
Michael Pratt
52df3b232d
Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH
...
PYTHON_NUMPY_INCLUDE_PATH was a typo, it should have been
PYTHON_NUMPY_INCLUDE_DIRS.
2014-07-31 03:27:06 -04:00
Fco. Javier Delgado del Hoyo
fd10557e78
Removed cvCalcOpticalFlowBM from cudaoptflow test
2014-07-31 09:21:44 +02:00
Fco. Javier Delgado del Hoyo
8def44047a
Removed cvCalcOpticalFlowBM from performance test
2014-07-31 09:08:29 +02:00
Michael Pratt
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
Samson Yilma
4fe04775d1
Merge remote-tracking branch 'upstream/master' into HomographyDecomp
2014-07-30 20:36:41 -04:00
Samson Yilma
3b608fa489
added comment.
2014-07-30 19:32:37 -04:00
Samson Yilma
3c5eb7de84
updated documentation for decomposeHomography
2014-07-30 18:53:33 -04:00
Vadim Pisarevsky
223cdcd0ee
fixed compilation of some samples; fixed ANN_MLP::predict
2014-07-30 22:53:46 +04:00
Vadim Pisarevsky
1a1097ab23
Merge pull request #2983 from wnoise:shrink-global-cuda-usage
2014-07-30 15:55:02 +00:00
Vadim Pisarevsky
ef8647fe30
put IPP ReduceSum_32f back
2014-07-30 19:12:11 +04:00
Vadim Pisarevsky
2ab7fb6051
Merge pull request #3017 from f-morozov:akaze
2014-07-30 15:03:47 +00:00
Vadim Pisarevsky
5267ed46c7
1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F), cv::convertScaleAbs (CV_32F) and cv::reduce (SUM, CV_32F), cv::reduce (MIN & MAX), cv::flip (3-channel case).
...
2. changed the number of test loops from 1 to 30 (except for cv::pow() test, which fails for yet unknown reason)
3. disabled IPP acceleration for 3-channel norms.
4. modified relativeNorm test function to handle very small values
2014-07-30 18:19:47 +04:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
Vadim Pisarevsky
a782ee93de
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
2014-07-30 12:48:41 +00:00
Vadim Pisarevsky
e368f17caf
fixed python bindings generation
2014-07-30 16:11:08 +04:00
Elena Gvozdeva
90ac88cb8e
use std::min,max
2014-07-30 14:28:02 +04:00
edgarriba
b6b0c2aa8e
MACRO for EIGEN libraries
2014-07-30 11:22:25 +02:00
vbystricky
bd8894002e
Fix some problems
2014-07-30 11:56:28 +04:00
Fco. Javier Delgado del Hoyo
d3d0434f07
Removed opencv_legacy dependency from cudaoptflow
2014-07-30 09:00:23 +02:00
vbystricky
878dec65c8
Optimize OpenCL version of morfology and box filters for small filter kernels
2014-07-30 10:32:52 +04:00
Sergei Nikulov
eaec132091
#2992 : update after review
2014-07-30 00:03:41 +04:00
Vadim Pisarevsky
ba3783d205
initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed
2014-07-29 23:54:23 +04:00
Vadim Pisarevsky
dce1824a91
Merge pull request #2940 from davembradley:master
2014-07-29 17:22:30 +00:00
Vadim Pisarevsky
cf2a307832
Merge pull request #2991 from kovand11:calibrateDebevecFix
2014-07-29 16:58:32 +00:00
Andrey Pavlenko
4c8a9c5d70
Merge pull request #3012 from vpisarev:clean_objdetect
2014-07-29 15:29:35 +00:00
Vadim Pisarevsky
101769d26c
eliminated some unnecessary instructions
2014-07-29 18:10:18 +04:00
Elena Gvozdeva
dbb5993d13
added dft for all platforms
2014-07-29 12:21:52 +04:00
Elena Gvozdeva
dc3c691c8c
new block size for dft
2014-07-29 12:06:20 +04:00
Elena Gvozdeva
e7216a5987
Used float instead of int for CV_8U in sumTemplate
2014-07-29 11:34:39 +04:00
Vadim Pisarevsky
277802483f
Merge pull request #2987 from anishp:master
2014-07-28 21:15:39 +00:00
Vadim Pisarevsky
e9bed17d98
Merge pull request #3008 from jet47:fix-cudacodec-dependecies
2014-07-28 21:13:59 +00:00
siddharth
4cdc155eac
test
2014-07-29 00:15:11 +05:30
siddharth
0972a2d758
Fixed mixed cloning bug
2014-07-29 00:15:11 +05:30
siddharth
88d05a89d4
removed build error
...
Whitespaces removed
2014-07-29 00:15:11 +05:30
siddharth
1a14d8506d
recursive filter output corrected
2014-07-29 00:15:11 +05:30
siddharth
14631be59f
Updated Documentation
2014-07-29 00:15:11 +05:30
Vadim Pisarevsky
41df63aacd
Merge pull request #3010 from vpisarev:ocl_disable_some_norms2
2014-07-28 17:24:42 +00:00
Vadim Pisarevsky
a587759d76
Merge pull request #2989 from smvv:gstreamer_capture_init
2014-07-28 16:00:33 +00:00
Vadim Pisarevsky
962b519708
Merge pull request #2996 from akarsakov:ocl_dft_new_concept
2014-07-28 15:59:59 +00:00
Vadim Pisarevsky
0c749fd7e5
Merge pull request #2998 from ernest-galbrun:cuda_concurrency
2014-07-28 15:59:43 +00:00
Vadim Pisarevsky
af83884dc7
disabled ocl_minmaxloc on 32-bit data completely
2014-07-28 19:35:06 +04:00
Vadim Pisarevsky
1925fab427
disabled some more stuff
2014-07-28 19:32:06 +04:00
Vadim Pisarevsky
11e9e375a3
fixed compile warning with GCC
2014-07-28 19:23:46 +04:00
Vadim Pisarevsky
2fd01dcced
fixed doc builder warnings
2014-07-28 17:18:28 +04:00
Vadim Pisarevsky
97f6dd1820
trying to make OpenCL builder green
2014-07-28 17:16:02 +04:00
Vadim Pisarevsky
1ad9827fc4
removed ERFilter (to be moved to opencv_contrib/modules/text) and lineMOD (to be moved to opencv_contrib/modules/rgbd)
2014-07-28 16:48:53 +04:00
Ernest Galbrun
5623701acb
performance issue for cuda TVL1 when gamma = 0
2014-07-28 14:24:21 +02:00
Vadim Pisarevsky
00263dd664
Merge pull request #2179 from adishavit:feature-SupportClipboardCopyOnWindows
2014-07-28 11:52:27 +00:00
Vadim Pisarevsky
f42bb0bd65
disable OpenCL difference norms with mask, since some of the tests fail
2014-07-28 15:45:54 +04:00
Vadim Pisarevsky
4255746c00
fixed compile warnings and removed extra whitespaces
2014-07-28 15:20:25 +04:00
Vadim Pisarevsky
1310dc4ca2
Merge pull request #2994 from znah:py_hpp_glob
2014-07-28 11:15:21 +00:00
Vadim Pisarevsky
50a1def80b
Merge pull request #3006 from smvv:fix_findContours_for_python2
2014-07-28 11:13:45 +00:00
Vadim Pisarevsky
cb492cc24d
Merge pull request #3007 from kobigurk:master
2014-07-28 11:12:14 +00:00
Vadim Pisarevsky
ef0f010437
Merge pull request #3003 from ElenaGvozdeva:ocl_sum
2014-07-28 11:08:08 +00:00
Vadim Pisarevsky
4dfb613c3e
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
2014-07-28 14:54:41 +04:00
Alexander Karsakov
fecfaf4092
Using std::map in PlanCache
2014-07-28 14:19:47 +04:00
edgarriba
4ddc6a4a77
Update for DLS test
2014-07-28 12:03:02 +02:00
edgarriba
0427b70a2f
Filtering solutions with imaginary part
2014-07-28 12:01:39 +02:00
Ernest Galbrun
df8f1a4355
removed legacy header
2014-07-28 10:58:19 +02:00
Elena Gvozdeva
27d97aa231
fixed
2014-07-28 12:21:00 +04:00
Vladislav Vinogradov
ba706177cb
fix cudacodec module dependecies
2014-07-28 12:13:52 +04:00
Alexander Mordvintsev
586ace1873
double to float cast warning fix
2014-07-27 18:25:42 +04:00
Kobi Gurkan
6cac76bfe4
fixes tab indentation - replacing with 4 spaces
2014-07-27 17:14:54 +03:00
Kobi Gurkan
fc8f0e341b
adding support for 16-bit 4 channel tiffs
...
- when IMREAD_UNCHANGED is set in flags, the tiff is read with 4 channels
- adding test for read/write
2014-07-27 17:09:05 +03:00
Alexander Mordvintsev
5f47f70183
module blacklist
2014-07-27 18:03:27 +04:00
Alexander Mordvintsev
a2ae1db31c
'adas' extra module doesn't produce .lib on windows (causes link error)
2014-07-27 17:41:12 +04:00
Alexander Mordvintsev
9ab3b89c53
pass header list to gen2.py by a text file (avoid command line length limit on windows)
2014-07-27 17:17:36 +04:00
Alexander Mordvintsev
42ecfc5538
fixed parsing enums with tailing comma
...
gen2.py reports headers it processes
cmake file restructured
2014-07-27 17:17:35 +04:00
Alexander Mordvintsev
964657a155
glob for python module dependences
2014-07-27 17:17:35 +04:00
Alexander Mordvintsev
1d1bfd3d7d
automatic search for headers for python wrapper generation
2014-07-27 17:17:35 +04:00
Sander Mathijs van Veen
d25770ee76
Fix Python 2 bindings for findContours
...
The sanity check prevents Python 2 from calling findContours, because the
Python 2 bindings pass an empty matrix for `_contours`. If `_contours` is not
empty, the channel and depth check should determine whether the matrix is of
the correct type and size.
Note: the Python 2 bindings passes a matrix of type `STD_VECTOR_MAT` to
parameters of the type `OutputArrayOfArrays`.
2014-07-26 16:40:09 +02:00
Vadim Pisarevsky
ee90b88dd7
Merge pull request #2720 from pglotov:master
2014-07-25 12:54:22 +00:00
Vadim Pisarevsky
8e80f9b7a8
Merge pull request #1292 from adrians:neon-pull
2014-07-25 12:29:49 +00:00
Vadim Pisarevsky
603030b005
Merge pull request #2993 from vbystricky:oclopt_warp_affine
2014-07-25 11:26:24 +00:00
Elena Gvozdeva
fe29af2e58
Fixed bug in reduce.cl
2014-07-25 14:51:30 +04:00
edgarriba
5f35bed5c5
Delete Debug functions
2014-07-25 11:54:41 +02:00
edgarriba
9cad1dfa0d
Update C headers for DLS
2014-07-25 11:49:20 +02:00
edgarriba
5980613317
Update
2014-07-25 11:46:28 +02:00
vbystricky
e49d148d47
Optimize ocl function pyrDown
2014-07-25 13:39:19 +04:00
edgarriba
5f54a22d29
Update documentation for DLS
2014-07-25 11:39:06 +02:00
edgarriba
a4e21c8fa8
Update DLS test
2014-07-25 11:29:34 +02:00
Alexander Karsakov
37d01e2d27
Added license header, using cv::Ptr, small fixes.
2014-07-25 13:27:00 +04:00
edgarriba
a3f065c409
DLS working
2014-07-25 11:01:47 +02:00
Adrian Stratulat
a98ce86ca3
Add NEON intrinsics to core/src/arithm.cpp
2014-07-24 19:45:32 +00:00
Alexander Karsakov
e51c0810b6
Added accuracy and performance tests for DFT all modes.
2014-07-24 15:17:31 +04:00
Alexander Karsakov
66ac46214d
Final refactoring, fixes
2014-07-24 13:23:02 +04:00
Sander Mathijs van Veen
facb2f9a81
Reset class members to NULL after gst_*_unref()
2014-07-23 19:15:16 +02:00
edgarriba
48c4a79d2e
DLS full algorithm compiling
2014-07-23 17:26:03 +02:00
Sander Mathijs van Veen
f8442da945
Initialize all pointers of CvCapture_GStreamer correctly
2014-07-23 14:41:17 +02:00
Ernest Galbrun
551ab83cf2
trailing whitespace
2014-07-23 14:34:22 +02:00
Ernest Galbrun
d7038423dd
Merge branch 'master' of https://github.com/Itseez/opencv
2014-07-23 14:21:45 +02:00
Ernest Galbrun
6a769c92b3
modified default stream initialization to allow concurrent calls modified cuda surf.cuda.cpp to allow concurrent call
2014-07-23 14:21:21 +02:00
Vadim Pisarevsky
da1ac35930
Merge pull request #2990 from vbystricky:highgui_split2
2014-07-23 11:27:25 +00:00
Vadim Pisarevsky
7bd7c85b1d
Merge pull request #2919 from larshg:Openni2Support
2014-07-23 11:23:48 +00:00
Elena Gvozdeva
4fdd6de8e8
Fixed ippiDFT call
2014-07-23 13:39:31 +04:00
edgarriba
730fe9e582
Hessian+ cayley2rotbar
2014-07-22 17:56:25 +02:00
Alexander Karsakov
1d2cf0e20e
Added nonzero_rows support
2014-07-22 18:31:08 +04:00
Alexander Karsakov
52f76a3283
Added rest Elena's changes
2014-07-22 18:31:08 +04:00
Alexander Karsakov
7791264525
Added multi-block scheme
2014-07-22 18:31:03 +04:00
Alexander Karsakov
2b9e556055
Added Elena's changes with implemented DFT_INVERSE C2C mode.
2014-07-22 18:27:31 +04:00
Alexander Karsakov
b17bf031f6
Added DFT_SCALE for forward transforms
2014-07-22 18:27:31 +04:00
Alexander Karsakov
6c8b6bd0c7
Added packing to CCS format
2014-07-22 18:27:25 +04:00
Alexander Karsakov
ed07241f89
Completed all forward transforms.
2014-07-22 18:27:17 +04:00
Alexander Karsakov
e5a3ab3cb9
Added fftplan cache
2014-07-22 18:27:08 +04:00
Alexander Karsakov
0318d27720
Enabled precalculated wave
2014-07-22 18:26:58 +04:00
Alexander Karsakov
5dd9263848
Multi-radix with kernel generation
2014-07-22 18:25:59 +04:00
Alexander Alekhin
63a8cb594a
Merge pull request #2961 from ilya-lavrenov:tapi_corners
2014-07-22 09:38:11 +00:00
vbystricky
716218cac4
Optimize ocl version of warp_affine
2014-07-22 13:22:40 +04:00
edgarriba
b1b9a29e48
Extracting Eigenvalues and Eigenvectors
2014-07-21 17:45:54 +02:00
András Kovács
d1c7983fe5
calibrateDebevec index fix (issue 3664)
2014-07-21 17:27:03 +02:00
Sergey Nikulov
9d107fb2d5
fixed test compilation
2014-07-21 19:26:26 +04:00
Sergey Nikulov
bd144cfa64
upmerged pull req #2974 to master - added more jpeg options to imgcodecs
2014-07-21 18:56:35 +04:00
vbystricky
fd51c133df
Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs
2014-07-21 15:10:41 +04:00
Alexander Alekhin
9e3124a1c9
Merge pull request #2960 from ilya-lavrenov:tapi_perf_fix
2014-07-21 09:10:24 +00:00
edgarriba
40f6d320c2
last update
2014-07-21 09:31:45 +02:00
Anish Pednekar
d2493393db
added macro guard to enable overriding ENABLE_LOG
2014-07-20 21:06:37 +05:30
VBystricky
cc703b01df
Fix build errors with cap_v4l on Linux
2014-07-20 18:27:14 +04:00
Lars Glud
1242a66119
Openni2 support
2014-07-20 15:04:11 +02:00
Lars Glud
4dcd37f699
Merge remote-tracking branch 'origin/master' into Openni2Support
...
Conflicts:
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
2014-07-20 14:28:10 +02:00
Vadim Pisarevsky
9a58b1a3a0
Merge pull request #2925 from BloodAxe:osx-framework-script
2014-07-19 18:04:15 +00:00
Vadim Pisarevsky
a7006ac21c
Merge pull request #2979 from PhilLab:patch-2
2014-07-18 09:58:07 +00:00
Vadim Pisarevsky
17d69be902
Merge pull request #2933 from ilya-lavrenov:sse_moments
2014-07-18 09:25:22 +00:00
PhilLab
e82241cba5
Function for drawing arrows
...
Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970 ) To the new InputOutputArray type
2014-07-18 10:04:44 +02:00
Aaron Denney
4644689d5a
And remove final vestiges.
2014-07-17 09:43:21 -07:00
Aaron Denney
85601e03dd
remove constant memory use in compute_data_cost
2014-07-17 09:43:21 -07:00
Aaron Denney
52516085d9
remove constant memory from init_data_cost
2014-07-17 09:43:21 -07:00
Aaron Denney
1ff270e41c
init_message no longer uses constant memory.
2014-07-17 09:43:21 -07:00
Aaron Denney
9b8002cd43
remove use of constant memory in calc_all_iterations/compute_message/message_per_pixel
2014-07-17 09:43:21 -07:00
Aaron Denney
b792419cde
Remove compute_disp()'s use of constant memory.
2014-07-17 09:43:21 -07:00
Aaron Denney
6d86d63ac5
Last of csbp load_constants() gone.
2014-07-17 09:43:21 -07:00
Aaron Denney
9bc71f4cb6
Deconstify minimum disparity.
2014-07-17 09:43:21 -07:00
Aaron Denney
eed5cbc5db
More constant removal.
2014-07-17 09:43:21 -07:00
Aaron Denney
3ab117df04
Change struct with single static function to function.
2014-07-17 09:43:20 -07:00
Aaron Denney
021b0cb4d5
Pass max_disc_term as kernel parameter.
2014-07-17 09:43:20 -07:00
Aaron Denney
0e2ea45c93
ndisp no longer constant
2014-07-17 09:43:20 -07:00
Aaron Denney
2832cfdfe5
No longer use constant memory for image step.
2014-07-17 09:43:20 -07:00
Aaron Denney
d8d946a458
Constify cuda csbp
2014-07-17 09:43:20 -07:00
Aaron Denney
2982e77495
Pass in images and scratch space so that multiple copies can run concurrently.
2014-07-17 09:43:20 -07:00
Aaron Denney
fe29ed461c
Move shared interface to header file rather than repeating.
2014-07-17 09:43:20 -07:00
Aaron Denney
e532bd50d5
Move shared interface to header file rather than repeating.
2014-07-17 09:43:20 -07:00
Aaron Denney
1533d0448f
cdata_weight always positive; fewer multiplications.
2014-07-17 09:43:20 -07:00
Aaron Denney
d848704b35
cuda::DisparityBilateralFilter no longer uses constant memory for parameters
...
Now multiple filters can be used in the same context without stepping on each other.
2014-07-17 09:43:20 -07:00
Vadim Pisarevsky
8f8450793a
Merge pull request #2964 from vbystricky:highgui_split
2014-07-16 19:29:36 +00:00
Lars Glud
8b32235854
Openni2 support
2014-07-16 12:37:53 +02:00
edgarriba
42ab7fd876
dls() no compiles
2014-07-16 00:06:29 +02:00
Petr Glotov
7a77cf584a
added timelapse
2014-07-15 09:32:47 -07:00
Vadim Pisarevsky
dbefbbc522
Merge pull request #2910 from ilya-lavrenov:sse2_canny
2014-07-15 09:46:28 +00:00
Vadim Pisarevsky
40370345c5
Merge pull request #2765 from pradeep-pyro:kullback_leibler
2014-07-15 08:57:31 +00:00
Vadim Pisarevsky
b1793e2fb9
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
2014-07-15 08:09:04 +00:00
edgarriba
fb67ab1257
Initial DLS add
2014-07-15 09:58:49 +02:00
pradeep
7171431e7c
Changed cv::log to std::log
2014-07-15 12:32:53 +08:00
VBystricky
ca307669d4
Refresh code. Fix merge conflict
2014-07-14 23:30:50 +04:00
Vadim Pisarevsky
b63a7e66db
Merge pull request #2953 from gongzg:master
2014-07-14 19:21:15 +00:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
Vadim Pisarevsky
f773cd9a3e
Merge pull request #2947 from vbystricky:capDShow
2014-07-14 18:53:25 +00:00
Alexander Alekhin
381986d044
Merge pull request #2882 from akarsakov:ocl_pyrDown_opt
2014-07-14 18:48:28 +00:00
Roman Donchenko
3490a5aded
Merge pull request #2962 from alalek:fix_v4l_build
2014-07-14 08:20:54 +00:00
Alexander Alekhin
e169083fed
Merge pull request #2918 from vbystricky:oclopt_reduce2
2014-07-12 05:00:57 +00:00
Alexander Alekhin
df74a266cf
Merge pull request #2963 from ilya-lavrenov:tapi_bufferpool
2014-07-11 14:55:13 +00:00
Alexander Alekhin
0876ec7a67
Merge pull request #2935 from vbystricky:oclopt_meanStdDev
2014-07-11 14:53:46 +00:00
Alexander Alekhin
cbf63b0709
Merge pull request #2851 from ilya-lavrenov:tapi_set_identity
2014-07-11 10:00:16 +00:00
Alexander Alekhin
910d8f8e0b
Merge pull request #2888 from ilya-lavrenov:tapi_remap
2014-07-11 09:59:27 +00:00
Ilya Lavrenov
f2a2467de3
enabled BufferPool
2014-07-11 12:21:10 +04:00
Alexander Alekhin
6dd3244019
fix build
2014-07-10 18:08:38 +04:00
Ilya Lavrenov
fee3d6931b
corners
2014-07-10 17:17:24 +04:00
Ilya Lavrenov
c949845a6b
fixed perf test
2014-07-10 16:03:31 +04:00
Alexander Alekhin
a0816c6d15
Merge pull request #2927 from ilya-lavrenov:tapi_lut
2014-07-10 09:38:37 +00:00
Vadim Pisarevsky
347eaa8685
Merge pull request #2943 from vbystricky:highgui_imgcodecs
2014-07-10 05:28:44 +00:00
edgarriba
9abcd88435
Upate test ransac
2014-07-09 17:39:32 +02:00
edgarriba
a5d40d7674
Test Run OK
2014-07-09 17:27:08 +02:00
edgarriba
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
edgarriba
ba5a8ee299
Solvepnpransac() returns boolean
2014-07-09 10:37:37 +02:00
Zhigang Gong
2e49ca4903
Avoid unmap an umat(ocl) which hasn't been mapped at all.
...
According to opencl 1.2 spec 5.4.2:
enqueues a command to unmap a previously mapped region of a memory object.
...
CL_INVALID_VALUE if mapped_ptr is not a valid pointer returned by
clEnqueueMapBuffer, or clEnqueueMapImage for memobj.
So if the u->data is not from a clEnqueueMapBuffer call, we should not
call clEnqueueUnmapMemObject() unmap it. With this patch, the cases
./opencv_test_video --gtest_filter=OCL_Video/FarnebackOpticalFlow.Mat/*
could work well with beignet 0.9.1, Otherwise, it will get a
CL_INVALID_VALUE at the clEnqueueUnmapMemObject().
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2014-07-09 16:21:20 +08:00
pradeep
0d49f97128
Fixed truncation warning
2014-07-09 15:29:47 +08:00
pradeep
f8b23cff18
Fixed test errors, added support for C data types.
2014-07-09 13:39:40 +08:00
edgarriba
ce07024a44
Updated solvePnPRansac()
2014-07-08 17:09:55 +02:00
Ilya Lavrenov
e8f5c2fcf6
OpenCL before IPP
2014-07-08 18:51:27 +04:00
edgarriba
b74cfe8c2c
nothing
2014-07-08 16:26:56 +02:00
edgarriba
ac8cce3963
solvepnpransac() confidence added
2014-07-08 16:23:25 +02:00
edgarriba
747c6a2bd2
solvepnpransac() interface changed
2014-07-08 16:07:30 +02:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
7fe7facfee
Remove unused variable
2014-07-08 13:29:28 +04:00
vbystricky
eb8366bb0a
DShow camera as IVideoCapture object
2014-07-08 12:28:34 +04:00
Alexander Alekhin
e79ceb4b45
Merge pull request #2936 from ilya-lavrenov:tapi_minmaxloc_opt
2014-07-08 07:30:49 +00:00
Vadim Pisarevsky
d05d235c01
Merge pull request #2669 from Adil-Ibragimov:flann_distance_fix
2014-07-07 13:35:09 +00:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Vadim Pisarevsky
e1553d5da3
Merge pull request #2929 from ilya-lavrenov:sse_pow
2014-07-07 11:22:26 +00:00
Vadim Pisarevsky
b2ab1b758a
Merge pull request #2937 from ilya-lavrenov:sse_patch_nans
2014-07-07 11:20:30 +00:00
Vadim Pisarevsky
41dcd0ac03
Merge pull request #2941 from ilya-lavrenov:sse_inrange
2014-07-07 11:19:54 +00:00
Ernest Galbrun
62fed8b7b2
retry after failure to load from the build bot
2014-07-07 12:55:07 +02:00
