Vadim Pisarevsky [Tue, 24 Jun 2014 17:16:09 +0000 (21:16 +0400)]
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.
Vadim Pisarevsky [Tue, 24 Jun 2014 15:18:51 +0000 (19:18 +0400)]
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.
Alexander Alekhin [Mon, 23 Jun 2014 14:27:10 +0000 (14:27 +0000)]
Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix
Alexander Alekhin [Mon, 23 Jun 2014 14:23:26 +0000 (14:23 +0000)]
Merge pull request #2874 from vbystricky:ocl_LUTAMDfix
Ilya Lavrenov [Sun, 22 Jun 2014 15:18:14 +0000 (19:18 +0400)]
added extra condition
Alexander Alekhin [Fri, 20 Jun 2014 13:49:14 +0000 (13:49 +0000)]
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
Alexander Alekhin [Fri, 20 Jun 2014 08:49:36 +0000 (08:49 +0000)]
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
Alexander Alekhin [Fri, 20 Jun 2014 08:47:51 +0000 (08:47 +0000)]
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter
Alexander Alekhin [Fri, 20 Jun 2014 08:47:18 +0000 (08:47 +0000)]
Merge pull request #2847 from ilya-lavrenov:tapi_pow
Alexander Alekhin [Fri, 20 Jun 2014 08:46:32 +0000 (08:46 +0000)]
Merge pull request #2840 from ilya-lavrenov:tapi_calchist
vbystricky [Thu, 19 Jun 2014 14:52:25 +0000 (18:52 +0400)]
Increase epsilon for pass sanity check
vbystricky [Thu, 19 Jun 2014 14:09:23 +0000 (18:09 +0400)]
Fix error
vbystricky [Thu, 19 Jun 2014 13:45:04 +0000 (17:45 +0400)]
Change threshold
vbystricky [Thu, 19 Jun 2014 13:07:09 +0000 (17:07 +0400)]
Add peromance tests for OCL integral sum of square
Roman Donchenko [Thu, 19 Jun 2014 07:57:51 +0000 (11:57 +0400)]
Merge pull request #2832 from BRAINSia:20140605_Upstream
Andrey Pavlenko [Wed, 18 Jun 2014 12:13:13 +0000 (16:13 +0400)]
Merge pull request #2863 from apavlenko:disable_cuda_stubs_defaults
vbystricky [Wed, 18 Jun 2014 11:44:56 +0000 (15:44 +0400)]
Change uchar2 to short
vbystricky [Wed, 18 Jun 2014 11:03:09 +0000 (15:03 +0400)]
Move some variables into #ifdef
Hans Johnson [Thu, 5 Jun 2014 15:14:56 +0000 (10:14 -0500)]
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.
Alexander Alekhin [Tue, 17 Jun 2014 14:23:31 +0000 (18:23 +0400)]
Merge pull request #2871 from vbystricky:oclopt_integral
Alexander Karsakov [Wed, 11 Jun 2014 11:15:15 +0000 (15:15 +0400)]
Removed storing of zeros in local memory
Alexander Alekhin [Tue, 17 Jun 2014 12:59:00 +0000 (16:59 +0400)]
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
Alexander Alekhin [Tue, 17 Jun 2014 10:37:51 +0000 (14:37 +0400)]
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
vbystricky [Mon, 16 Jun 2014 14:14:05 +0000 (18:14 +0400)]
Fix pointer conversion
vbystricky [Mon, 16 Jun 2014 13:17:16 +0000 (17:17 +0400)]
Small refactoring
Ilya Lavrenov [Thu, 12 Jun 2014 10:30:50 +0000 (14:30 +0400)]
optimized cv::boxFilter
Ilya Lavrenov [Thu, 12 Jun 2014 10:07:04 +0000 (14:07 +0400)]
fixed usage of reshape
vbystricky [Mon, 16 Jun 2014 11:08:15 +0000 (15:08 +0400)]
Join kernel code for int and float destination types
Alexander Alekhin [Mon, 16 Jun 2014 09:35:56 +0000 (13:35 +0400)]
Merge pull request #2865 from ilya-lavrenov:morph
Alexander Alekhin [Mon, 16 Jun 2014 09:22:03 +0000 (13:22 +0400)]
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
vbystricky [Mon, 16 Jun 2014 09:07:39 +0000 (13:07 +0400)]
Remove pre_invalid parameter
Ilya Lavrenov [Mon, 16 Jun 2014 08:33:13 +0000 (12:33 +0400)]
invoking OCL before IPP
Andrey Pavlenko [Mon, 16 Jun 2014 07:18:52 +0000 (11:18 +0400)]
Don't build CUDA modules stubs by default (use `-DBUILD_CUDA_STUBS=ON` if need them)
Vadim Pisarevsky [Thu, 12 Jun 2014 17:41:28 +0000 (21:41 +0400)]
Merge pull request #2783 from daferna2:master
Vadim Pisarevsky [Thu, 12 Jun 2014 17:41:09 +0000 (21:41 +0400)]
Merge pull request #2784 from saree90:bugfix_Simplex
Vadim Pisarevsky [Thu, 12 Jun 2014 17:40:53 +0000 (21:40 +0400)]
Merge pull request #2799 from 23pointsNorth:patch-1
Vadim Pisarevsky [Thu, 12 Jun 2014 17:39:49 +0000 (21:39 +0400)]
Merge pull request #2828 from otsedom:updating_and_adding_haarcascades_mcs
Vadim Pisarevsky [Thu, 12 Jun 2014 17:38:55 +0000 (21:38 +0400)]
Merge pull request #2845 from shaibagon:patch-1
Vadim Pisarevsky [Thu, 12 Jun 2014 17:38:41 +0000 (21:38 +0400)]
Merge pull request #2850 from Sekunde:master
Ilya Lavrenov [Thu, 12 Jun 2014 11:15:59 +0000 (15:15 +0400)]
fixed cv::warpPerspective
Alexander Alekhin [Wed, 11 Jun 2014 10:41:29 +0000 (14:41 +0400)]
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine
侯骥 [Wed, 11 Jun 2014 08:29:30 +0000 (10:29 +0200)]
Update MatchTemplate_Demo.cpp
Elena Gvozdeva [Wed, 21 May 2014 07:54:53 +0000 (11:54 +0400)]
Added support for 3-channels
Daniel Fernandes [Wed, 11 Jun 2014 07:00:21 +0000 (02:00 -0500)]
Changing #include to generic video.hpp
Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590
Alexander Alekhin [Tue, 10 Jun 2014 18:21:09 +0000 (22:21 +0400)]
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
Ilya Lavrenov [Tue, 10 Jun 2014 11:48:42 +0000 (15:48 +0400)]
cv::equalizeHist
Alexander Alekhin [Tue, 10 Jun 2014 15:32:03 +0000 (19:32 +0400)]
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow
Ilya Lavrenov [Mon, 9 Jun 2014 15:58:45 +0000 (19:58 +0400)]
optimized histogram merging
Ilya Lavrenov [Mon, 9 Jun 2014 15:45:37 +0000 (19:45 +0400)]
eliminated convertTo
Ilya Lavrenov [Mon, 9 Jun 2014 13:07:11 +0000 (17:07 +0400)]
optimized cv::calcHist
Alexander Alekhin [Tue, 10 Jun 2014 15:30:26 +0000 (19:30 +0400)]
Merge pull request #2839 from ilya-lavrenov:tapi_fix
Alexander Alekhin [Tue, 10 Jun 2014 15:29:46 +0000 (19:29 +0400)]
Merge pull request #2835 from ilya-lavrenov:defects
Ilya Lavrenov [Tue, 10 Jun 2014 14:34:50 +0000 (18:34 +0400)]
some optimizaions of cv::pow
Shai [Tue, 10 Jun 2014 14:31:18 +0000 (17:31 +0300)]
Update global_motion.cpp
An extremely rare case where, for numeric reasons bestM finds more inliers than ninliersMax.
This RARE case causes memory corruption and a nasty seg fault.
Ilya Lavrenov [Tue, 10 Jun 2014 13:25:31 +0000 (17:25 +0400)]
changed power in cv::pow test to test actual kernel
Ilya Lavrenov [Fri, 6 Jun 2014 15:29:51 +0000 (19:29 +0400)]
fixed defects found by coverity scan
Roman Donchenko [Tue, 10 Jun 2014 07:50:12 +0000 (11:50 +0400)]
Merge pull request #2841 from SpecLad:merge-2.4
Alexander Alekhin [Mon, 9 Jun 2014 16:25:28 +0000 (20:25 +0400)]
Merge pull request #2838 from ilya-lavrenov:tapi_warnings
Ilya Lavrenov [Mon, 9 Jun 2014 11:32:35 +0000 (15:32 +0400)]
added norm_inf support to minmaxloc kernel
Roman Donchenko [Mon, 9 Jun 2014 14:03:03 +0000 (18:03 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/spinimages.cpp
Ilya Lavrenov [Mon, 9 Jun 2014 13:09:44 +0000 (17:09 +0400)]
bixed cv::boxFilter
Ilya Lavrenov [Mon, 9 Jun 2014 12:48:59 +0000 (16:48 +0400)]
fixed possible runtime error
Roman Donchenko [Mon, 9 Jun 2014 11:58:24 +0000 (15:58 +0400)]
Merge pull request #2813 from 23pointsNorth:patch-2
Ilya Lavrenov [Mon, 9 Jun 2014 11:54:10 +0000 (15:54 +0400)]
fixed warnings
Roman Donchenko [Mon, 9 Jun 2014 11:06:06 +0000 (15:06 +0400)]
Merge pull request #2817 from bf:patch-1
Roman Donchenko [Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)]
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Roman Donchenko [Mon, 9 Jun 2014 10:27:51 +0000 (14:27 +0400)]
Merge pull request #2822 from timedia:akaze-java
Roman Donchenko [Mon, 9 Jun 2014 10:26:31 +0000 (14:26 +0400)]
Merge pull request #2831 from alalek:android_examples
Roman Donchenko [Mon, 9 Jun 2014 09:37:38 +0000 (13:37 +0400)]
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Ilya Lavrenov [Sun, 8 Jun 2014 20:50:14 +0000 (00:50 +0400)]
fixes
Ilya Lavrenov [Sat, 7 Jun 2014 16:53:20 +0000 (20:53 +0400)]
optimized cv::norm with NORM_RELATIVE
Ilya Lavrenov [Sat, 7 Jun 2014 11:51:41 +0000 (15:51 +0400)]
optimized cv::norm with 2 args
atinfinity [Fri, 6 Jun 2014 22:29:22 +0000 (07:29 +0900)]
fixed calculation method of "cv::TickMeter"
Ilya Lavrenov [Fri, 6 Jun 2014 13:15:19 +0000 (17:15 +0400)]
optimized cv::norm with NORM_INF
Alexander Alekhin [Fri, 6 Jun 2014 14:53:14 +0000 (18:53 +0400)]
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
Alexander Alekhin [Fri, 6 Jun 2014 14:52:39 +0000 (18:52 +0400)]
Merge pull request #2755 from vbystricky:oclopt_LUT
Ilya Lavrenov [Wed, 4 Jun 2014 14:22:55 +0000 (18:22 +0400)]
minmaxloc
Alexander Alekhin [Fri, 6 Jun 2014 14:38:21 +0000 (18:38 +0400)]
Merge pull request #2801 from ilya-lavrenov:tapi_reduction
Alexander Alekhin [Thu, 5 Jun 2014 08:29:36 +0000 (12:29 +0400)]
android: allow to build & run examples without Android OpenCV Manager
VBystricky [Thu, 5 Jun 2014 15:31:31 +0000 (19:31 +0400)]
If lut table has one channel and src aligned to 4, work with src as with one channel matrix
VBystricky [Wed, 4 Jun 2014 19:50:23 +0000 (23:50 +0400)]
Read 4 pixel for aligned data with 1 channel
VBystricky [Wed, 4 Jun 2014 16:13:42 +0000 (20:13 +0400)]
Fix kernel by comments
Alexander Alekhin [Wed, 4 Jun 2014 14:10:13 +0000 (18:10 +0400)]
Merge pull request #2808 from ilya-lavrenov:tapi_normalize_mask
Alexander Alekhin [Wed, 4 Jun 2014 12:36:37 +0000 (16:36 +0400)]
Merge pull request #2794 from mletavin:pullreq/140516-median
Modesto Castrillón [Wed, 4 Jun 2014 11:24:33 +0000 (12:24 +0100)]
Updated and added haarcascade_mcs*.xml files
Alexander Alekhin [Wed, 4 Jun 2014 11:22:06 +0000 (15:22 +0400)]
Merge pull request #2820 from ilya-lavrenov:tapi_flip
Ilya Lavrenov [Mon, 2 Jun 2014 10:21:03 +0000 (14:21 +0400)]
optimized cv::flip (CV_8UC1)
Alexander Alekhin [Wed, 4 Jun 2014 08:23:35 +0000 (12:23 +0400)]
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
Alexander Alekhin [Wed, 4 Jun 2014 08:22:51 +0000 (12:22 +0400)]
Merge pull request #2798 from ilya-lavrenov:tapi_copymakeborder
Alexander Alekhin [Wed, 4 Jun 2014 08:20:54 +0000 (12:20 +0400)]
Merge pull request #2812 from arkunze:pullreq/140520-filter2D
Alexander Alekhin [Wed, 4 Jun 2014 08:18:29 +0000 (12:18 +0400)]
Merge pull request #2821 from ilya-lavrenov:tapi_reduce
Alexander Alekhin [Wed, 4 Jun 2014 08:11:54 +0000 (12:11 +0400)]
Merge pull request #2826 from ilya-lavrenov:tapi_perf_warp
Roman Donchenko [Wed, 4 Jun 2014 08:07:17 +0000 (12:07 +0400)]
Merge pull request #1552 from Exocoder:gtk3
Tony [Tue, 3 Jun 2014 20:29:54 +0000 (21:29 +0100)]
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
Corrected merge error from last resync
Tony [Tue, 3 Jun 2014 19:55:49 +0000 (20:55 +0100)]
Merge branch 'gtk3' of https://github.com/Exocoder/opencv into gtk3
resyncing gtk3 with remote.
Ilya Lavrenov [Tue, 3 Jun 2014 09:35:49 +0000 (13:35 +0400)]
added missed INTER_CUBIC
Alexander Alekhin [Tue, 3 Jun 2014 12:36:48 +0000 (16:36 +0400)]
Merge pull request #2750 from ilya-lavrenov:tapi_convertto
Ilya Lavrenov [Fri, 30 May 2014 16:12:22 +0000 (20:12 +0400)]
optimized cv::warpAffine
Muto Masayuki [Fri, 30 May 2014 07:46:47 +0000 (16:46 +0900)]
Add AKAZE support for the Java wrapper
Alexander Alekhin [Tue, 3 Jun 2014 09:21:05 +0000 (13:21 +0400)]
Merge pull request #2795 from ilya-lavrenov:tapi_setto