Vadim Pisarevsky
c4fdf71bb3
fixed some more compile warnings on Windows
2014-06-25 20:22:56 +04:00
Vadim Pisarevsky
8f2aaff6d7
fixed compile warnings on Windows
2014-06-25 16:17:52 +04:00
Vadim Pisarevsky
66f2e527b6
removed extra whitespaces
2014-06-24 23:05:24 +04:00
Vadim Pisarevsky
07c0d50edf
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.
2014-06-24 21:16:09 +04:00
Vadim Pisarevsky
3858f2291d
removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.
...
some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.
2014-06-24 19:18:51 +04:00
Alexander Alekhin
6d4c4dcd94
Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix
2014-06-23 14:27:10 +00:00
Alexander Alekhin
4f1d06d14a
Merge pull request #2874 from vbystricky:ocl_LUTAMDfix
2014-06-23 14:23:26 +00:00
Ilya Lavrenov
863784efc6
added extra condition
2014-06-22 19:18:14 +04:00
Alexander Alekhin
6952b90ed0
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
2014-06-20 13:49:14 +00:00
Alexander Alekhin
01a98fae93
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
2014-06-20 08:49:36 +00:00
Alexander Alekhin
6e0d77469a
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter
2014-06-20 08:47:51 +00:00
Alexander Alekhin
07446ec954
Merge pull request #2847 from ilya-lavrenov:tapi_pow
2014-06-20 08:47:18 +00:00
Alexander Alekhin
7688a18264
Merge pull request #2840 from ilya-lavrenov:tapi_calchist
2014-06-20 08:46:32 +00:00
vbystricky
655465d9f8
Increase epsilon for pass sanity check
2014-06-19 18:52:25 +04:00
vbystricky
eb54c83985
Fix error
2014-06-19 18:09:23 +04:00
vbystricky
6d6ad1b1d9
Change threshold
2014-06-19 17:45:04 +04:00
vbystricky
b32fbe72f6
Add peromance tests for OCL integral sum of square
2014-06-19 17:07:09 +04:00
Roman Donchenko
acebfcd24f
Merge pull request #2832 from BRAINSia:20140605_Upstream
2014-06-19 11:57:52 +04:00
Andrey Pavlenko
65953fe39a
Merge pull request #2863 from apavlenko:disable_cuda_stubs_defaults
2014-06-18 16:13:13 +04:00
vbystricky
ea6da6ee95
Change uchar2 to short
2014-06-18 15:44:56 +04:00
vbystricky
9391ccfe35
Move some variables into #ifdef
2014-06-18 15:03:09 +04:00
Hans Johnson
4c7ed03b5f
COMP: Fix problem with narrowing in c++11
...
modules/core/src/arithm.cpp:345:51:
error: constant expression evaluates to 4294967295 which cannot be narrowed to type 'int' [-Wc++11-narrowing]
static int CV_DECL_ALIGNED(16) v64f_absmask[] = { 0xffffffff, 0x7fffffff, 0xffffffff, 0x7fffffff };
^~~~~~~~~~
Converted to unsigned int. This variable is only used to initialize a bit pattern anywhy for a 128bit type.
2014-06-17 15:49:06 -05:00
Alexander Alekhin
ce5bae1c67
Merge pull request #2871 from vbystricky:oclopt_integral
2014-06-17 18:23:31 +04:00
Alexander Karsakov
06fb5da7c8
Removed storing of zeros in local memory
2014-06-17 17:24:11 +04:00
Alexander Alekhin
1db9cc3f0d
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
2014-06-17 16:59:00 +04:00
Alexander Alekhin
04628d770c
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
2014-06-17 14:37:52 +04:00
vbystricky
606df0469a
Fix pointer conversion
2014-06-16 18:14:05 +04:00
vbystricky
9bf296eeb0
Small refactoring
2014-06-16 17:17:16 +04:00
Ilya Lavrenov
c424d36041
optimized cv::boxFilter
2014-06-16 17:00:10 +04:00
Ilya Lavrenov
7391df386f
fixed usage of reshape
2014-06-16 15:19:13 +04:00
vbystricky
6550c4f682
Join kernel code for int and float destination types
2014-06-16 15:08:15 +04:00
Alexander Alekhin
f269a89792
Merge pull request #2865 from ilya-lavrenov:morph
2014-06-16 13:35:57 +04:00
Alexander Alekhin
758a1eb63d
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
2014-06-16 13:22:03 +04:00
vbystricky
504bc7634a
Remove pre_invalid parameter
2014-06-16 13:07:39 +04:00
Ilya Lavrenov
d5244eb645
invoking OCL before IPP
2014-06-16 12:33:13 +04:00
Andrey Pavlenko
724f5e7f19
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
Vadim Pisarevsky
45f21e4f12
Merge pull request #2783 from daferna2:master
2014-06-12 21:41:28 +04:00
Vadim Pisarevsky
2c134318f7
Merge pull request #2784 from saree90:bugfix_Simplex
2014-06-12 21:41:10 +04:00
Vadim Pisarevsky
41ceadf9ed
Merge pull request #2799 from 23pointsNorth:patch-1
2014-06-12 21:40:53 +04:00
Vadim Pisarevsky
afe6b66d33
Merge pull request #2828 from otsedom:updating_and_adding_haarcascades_mcs
2014-06-12 21:39:50 +04:00
Vadim Pisarevsky
052c8516a8
Merge pull request #2845 from shaibagon:patch-1
2014-06-12 21:38:56 +04:00
Vadim Pisarevsky
ad7440c014
Merge pull request #2850 from Sekunde:master
2014-06-12 21:38:41 +04:00
Ilya Lavrenov
7ccbe10970
fixed cv::warpPerspective
2014-06-12 15:17:24 +04:00
Alexander Alekhin
14671e0cd6
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine
2014-06-11 14:41:29 +04:00
侯骥
055adc2302
Update MatchTemplate_Demo.cpp
2014-06-11 10:29:30 +02:00
Elena Gvozdeva
feeb386bf3
Added support for 3-channels
2014-06-11 11:49:22 +04:00
Daniel Fernandes
b3655233f1
Changing #include to generic video.hpp
...
Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590
2014-06-11 02:00:21 -05:00
Alexander Alekhin
88ceee05c6
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
2014-06-10 22:21:09 +04:00
Ilya Lavrenov
33239fca70
cv::equalizeHist
2014-06-10 19:32:46 +04:00
Alexander Alekhin
96ce9810a9
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow
2014-06-10 19:32:03 +04:00
