Ernest Galbrun
|
6207d338dd
|
merged new master branch
changed tests for tvl1 optflow
correction of a bug preventing compilation with cuda (fmin changed to fminf)
|
2014-08-18 15:29:45 +02:00 |
|
Vadim Pisarevsky
|
0ffc53bafe
|
Merge pull request #3107 from vpisarev:fixed_win_build
|
2014-08-18 09:00:54 +00:00 |
|
Ernest Galbrun
|
fae69df9a9
|
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
Conflicts:
modules/video/doc/motion_analysis_and_object_tracking.rst
|
2014-08-17 22:08:12 +02:00 |
|
Shubhra Pandit
|
6ca893be23
|
Adding feature 1544 and 1557
-cv::findHomography added a parameter for RANSAC iterations
-cv::findHomography added a parameter for RANSAC confidence
|
2014-08-17 13:06:06 -04:00 |
|
Vadim Pisarevsky
|
dea40e5e99
|
Merge pull request #3086 from fpuja:pragma_warning4127_fixing
|
2014-08-16 16:50:41 +00:00 |
|
Vadim Pisarevsky
|
5febdae36a
|
Merge pull request #3114 from abidrahmank:PyBindTutorials
|
2014-08-16 16:45:26 +00:00 |
|
abidrahmank
|
7f8e1f480a
|
Python bindings tutorial
|
2014-08-16 16:40:18 +05:30 |
|
Vadim Pisarevsky
|
e9729a9601
|
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
|
2014-08-16 00:29:10 +04:00 |
|
Vadim Pisarevsky
|
90905fb1e2
|
Merge pull request #3111 from vpisarev:make_ximgproc_compile
|
2014-08-15 15:08:34 +00:00 |
|
Vadim Pisarevsky
|
740c5234b1
|
fix compile problems with contributed ximgproc/xphoto
|
2014-08-15 18:00:41 +04:00 |
|
dkanafeev
|
1b0f0d7ead
|
Intel Summer School 2014
Switch branch to master.
New IPP func - ippiCopy
Conv: YUV2GRAY_420
|
2014-08-15 12:54:31 +04:00 |
|
Vadim Pisarevsky
|
daaa5a1824
|
removed duplicated Hershey fonts
|
2014-08-15 12:09:16 +04:00 |
|
Alexander Alekhin
|
b70a391e6c
|
fix VCS version
|
2014-08-15 12:09:16 +04:00 |
|
Vadim Pisarevsky
|
dfbeaddc72
|
Merge pull request #3106 from LeszekSwirski:fix-gemm-buf-allocate
|
2014-08-15 05:44:54 +00:00 |
|
jaco
|
dbb0fcdc7a
|
#pragma warning4127 fixation modified 2
|
2014-08-14 19:27:53 +02:00 |
|
Roman Donchenko
|
2222393b0a
|
OpenCV 3.0.0 Alpha
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iF4EABEIAAYFAlPs00gACgkQdDiF7KIeJGoEHQD9HDGKQBvXFhOVX4rNy1xUzpab
SqJawEVs6Zr74xyUlV0A+wVpN3X/sCITaewsC2aDU3OCXvCiJFpMtWwF970KPWri
=xir3
-----END PGP SIGNATURE-----
Merge tag '3.0.0-alpha'
OpenCV 3.0.0 Alpha
|
2014-08-14 19:19:19 +04:00 |
|
Roman Donchenko
|
fb9a143429
|
Set status to alpha
|
2014-08-14 19:17:29 +04:00 |
|
Leszek Swirski
|
de806330fd
|
Fix reallocation of D buffer in gemm
|
2014-08-14 15:54:54 +01:00 |
|
Alexander Alekhin
|
52ac61d87c
|
Merge pull request #3088 from vbystricky:ocl_enableNormEtc
|
2014-08-14 14:34:40 +00:00 |
|
vbystricky
|
942ff5be57
|
Disable OpenCL version of minMaxIdx with mask on AMD devices
|
2014-08-14 17:39:41 +04:00 |
|
Vadim Pisarevsky
|
95a4943762
|
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
|
2014-08-14 13:39:01 +00:00 |
|
Vadim Pisarevsky
|
ed8a7fa541
|
Merge pull request #3101 from akarsakov:ipp_thresh_fix
|
2014-08-14 11:42:14 +00:00 |
|
Vadim Pisarevsky
|
0e46b4cd03
|
Merge pull request #3102 from akarsakov:ocl_denoising_fix
|
2014-08-14 10:59:32 +00:00 |
|
Vadim Pisarevsky
|
75487d43f5
|
fixed trailing whitespaces
|
2014-08-14 14:53:02 +04:00 |
|
Vadim Pisarevsky
|
9a5aa4b23c
|
trying to solve compile problems; temporarily disabled some tests for just added optimization algo's
|
2014-08-14 14:37:30 +04:00 |
|
Alexander Alekhin
|
cf4a536440
|
Merge pull request #3098 from jet47:fix-cuda-compilation
|
2014-08-14 10:05:49 +00:00 |
|
Vadim Pisarevsky
|
00b2124876
|
fixing more compile problems with Java bindings etc
|
2014-08-14 13:48:52 +04:00 |
|
Vadim Pisarevsky
|
4530c7ad08
|
trying to fix builds
|
2014-08-14 13:18:04 +04:00 |
|
Vadim Pisarevsky
|
f7243be79c
|
Merge pull request #3090 from akarsakov:ocl_reduce_fix
|
2014-08-14 08:52:18 +00:00 |
|
Vadim Pisarevsky
|
5240a03217
|
Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios
|
2014-08-14 08:51:44 +00:00 |
|
Vadim Pisarevsky
|
257463719b
|
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
|
2014-08-14 12:50:07 +04:00 |
|
vbystricky
|
aab6f6c56f
|
Set sync=true in ocl_minMaxIdx kernel call. For tests
|
2014-08-14 12:14:56 +04:00 |
|
Alexander Karsakov
|
75ede6e17c
|
Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU.
|
2014-08-14 12:14:33 +04:00 |
|
Alexander Karsakov
|
8760a344ec
|
Fixed incorrect pointer conversion for in-place threshold
|
2014-08-14 11:02:55 +04:00 |
|
Vadim Pisarevsky
|
6f86c9f118
|
another mac-related fix, let's squeeze it in this PR too
|
2014-08-14 10:45:47 +04:00 |
|
Vadim Pisarevsky
|
5d8098a2c3
|
avoid compiler warnings
|
2014-08-14 10:06:10 +04:00 |
|
VBystricky
|
c5632d412e
|
Change epsilon for NORM_INF_2args accuracy tests
|
2014-08-13 23:50:32 +04:00 |
|
Vadim Pisarevsky
|
a602185fb6
|
Merge pull request #3097 from mshabunin:gdal-support
|
2014-08-13 19:26:10 +00:00 |
|
Vadim Pisarevsky
|
5f590ebed0
|
Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
|
2014-08-13 18:28:51 +00:00 |
|
Vadim Pisarevsky
|
71ff228ad3
|
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
|
2014-08-13 18:09:42 +00:00 |
|
Vadim Pisarevsky
|
a37876ab95
|
fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge
|
2014-08-13 19:59:26 +04:00 |
|
jaco
|
b81dcbdf2a
|
#pragma warning4127 fixation modified
Now use cleaner approach:
#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
|
2014-08-13 17:59:16 +02:00 |
|
Vladislav Vinogradov
|
9786e0a760
|
fix cudabgsegm module compilation
|
2014-08-13 19:20:23 +04:00 |
|
vbystricky
|
1fe403f461
|
Enable OpenCL version of norm and convertScaleAbs or 32F data
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
|
2014-08-13 18:33:01 +04:00 |
|
mshabunin
|
3ed89a8879
|
Merge with master and fix conflicts
|
2014-08-13 18:24:11 +04:00 |
|
Vladislav Vinogradov
|
8392296eda
|
remove -fvisibility-inlines-hidden from CUDA compiler flags
it generates warning
|
2014-08-13 18:08:48 +04:00 |
|
Vladislav Vinogradov
|
f5d9359da8
|
use directory-based include_directories command if we build with CUDA
|
2014-08-13 18:08:08 +04:00 |
|
Vladislav Vinogradov
|
0825120f6a
|
move CUDA compilation step from ocv_glob_module_sources to ocv_add_library
|
2014-08-13 18:07:31 +04:00 |
|
Vadim Pisarevsky
|
12c69ad490
|
Merge pull request #3095 from vpisarev:restore_ocl_div_mul_and_repeat
|
2014-08-13 13:56:19 +00:00 |
|
Adil Ibragimov
|
9ac06a9333
|
fix for gcc
|
2014-08-13 16:34:18 +04:00 |
|