Maksim Shabunin [Fri, 8 Aug 2014 12:59:24 +0000 (16:59 +0400)]
Revert "Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors."
This reverts commit
e85bacff7b676a7789bea6501e694cac299b21be.
Maksim Shabunin [Fri, 8 Aug 2014 12:59:13 +0000 (16:59 +0400)]
Revert "Fix a heap issue with static on Windows"
This reverts commit
8e93c19de311a76704028b0195abfe04cfad900d.
Maksim Shabunin [Fri, 8 Aug 2014 12:58:35 +0000 (16:58 +0400)]
Revert "Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances"
This reverts commit
e63d7de87c3565555e4a73220a465ed39488160d.
Maksim Shabunin [Fri, 8 Aug 2014 12:55:10 +0000 (16:55 +0400)]
Revert "Fix local variable shadowing"
This reverts commit
2f8b5731dabb3162ca62a0e1901bb13f0ed83e4c.
Roman Donchenko [Fri, 1 Aug 2014 15:50:17 +0000 (19:50 +0400)]
Disable the broken fisheye undistortImage test
Roman Donchenko [Fri, 1 Aug 2014 11:01:41 +0000 (15:01 +0400)]
Merge remote-tracking branch 'origin/master' into merge-2.4
Vadim Pisarevsky [Fri, 1 Aug 2014 09:42:40 +0000 (09:42 +0000)]
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation
Vadim Pisarevsky [Fri, 1 Aug 2014 09:13:32 +0000 (09:13 +0000)]
Merge pull request #2608 from Siddharthk:master
Alexander Alekhin [Fri, 1 Aug 2014 08:57:37 +0000 (08:57 +0000)]
Merge pull request #3023 from vbystricky:ocl_minMaxLoc
Vadim Pisarevsky [Thu, 31 Jul 2014 18:20:07 +0000 (18:20 +0000)]
Merge pull request #3009 from vpisarev:ios_experiments
Alexander Alekhin [Thu, 31 Jul 2014 15:43:18 +0000 (15:43 +0000)]
Merge pull request #3002 from vbystricky:oclopt_pyrdown
vbystricky [Thu, 31 Jul 2014 15:12:10 +0000 (19:12 +0400)]
Enable ocl version of minmaxloc with mask
vbystricky [Thu, 31 Jul 2014 13:29:06 +0000 (17:29 +0400)]
Fix error in OCL minmaxloc
Alexander Alekhin [Thu, 31 Jul 2014 13:56:44 +0000 (13:56 +0000)]
Merge pull request #3021 from ElenaGvozdeva:ocl_flip
Vladislav Vinogradov [Thu, 31 Jul 2014 13:55:59 +0000 (17:55 +0400)]
fix cudabgsegm module compilation
Elena Gvozdeva [Thu, 31 Jul 2014 11:21:52 +0000 (15:21 +0400)]
fixed ocl_flip for cn==3
Vadim Pisarevsky [Thu, 31 Jul 2014 12:54:13 +0000 (12:54 +0000)]
Merge pull request #3020 from vpisarev:ocl_disable_more_funcs
Vadim Pisarevsky [Thu, 31 Jul 2014 10:24:21 +0000 (14:24 +0400)]
trying to make the tests pass
Vadim Pisarevsky [Wed, 30 Jul 2014 15:55:02 +0000 (15:55 +0000)]
Merge pull request #2983 from wnoise:shrink-global-cuda-usage
Vadim Pisarevsky [Wed, 30 Jul 2014 15:12:11 +0000 (19:12 +0400)]
put IPP ReduceSum_32f back
Vadim Pisarevsky [Wed, 30 Jul 2014 15:03:47 +0000 (15:03 +0000)]
Merge pull request #3017 from f-morozov:akaze
Vadim Pisarevsky [Wed, 30 Jul 2014 14:19:47 +0000 (18:19 +0400)]
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
f-morozov [Wed, 30 Jul 2014 14:02:08 +0000 (18:02 +0400)]
AKAZE fixes, tests and tutorial
Vadim Pisarevsky [Wed, 30 Jul 2014 12:48:41 +0000 (12:48 +0000)]
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
Sergei Nikulov [Tue, 29 Jul 2014 20:03:41 +0000 (00:03 +0400)]
#2992: update after review
Vadim Pisarevsky [Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)]
Merge pull request #2940 from davembradley:master
Vadim Pisarevsky [Tue, 29 Jul 2014 16:58:32 +0000 (16:58 +0000)]
Merge pull request #2991 from kovand11:calibrateDebevecFix
Andrey Pavlenko [Tue, 29 Jul 2014 15:29:35 +0000 (15:29 +0000)]
Merge pull request #3012 from vpisarev:clean_objdetect
Vadim Pisarevsky [Tue, 29 Jul 2014 14:10:18 +0000 (18:10 +0400)]
eliminated some unnecessary instructions
Vadim Pisarevsky [Tue, 29 Jul 2014 13:50:35 +0000 (13:50 +0000)]
Merge pull request #3016 from fradelg:master
Fco. Javier Delgado del Hoyo [Tue, 29 Jul 2014 09:13:00 +0000 (11:13 +0200)]
Another typo in comment inside OpenNI2 cmake file
Fco. Javier Delgado del Hoyo [Tue, 29 Jul 2014 09:10:58 +0000 (11:10 +0200)]
Fixed typo in OpenNI2 cmake file
Vadim Pisarevsky [Mon, 28 Jul 2014 21:15:39 +0000 (21:15 +0000)]
Merge pull request #2987 from anishp:master
Vadim Pisarevsky [Mon, 28 Jul 2014 21:13:59 +0000 (21:13 +0000)]
Merge pull request #3008 from jet47:fix-cudacodec-dependecies
siddharth [Mon, 14 Jul 2014 18:27:14 +0000 (23:57 +0530)]
test
siddharth [Thu, 29 May 2014 04:47:39 +0000 (10:17 +0530)]
Fixed mixed cloning bug
siddharth [Fri, 11 Apr 2014 23:04:41 +0000 (04:34 +0530)]
removed build error
Whitespaces removed
siddharth [Fri, 11 Apr 2014 05:35:52 +0000 (11:05 +0530)]
changed demo tutorial path
siddharth [Fri, 11 Apr 2014 05:22:34 +0000 (10:52 +0530)]
recursive filter output corrected
siddharth [Fri, 11 Apr 2014 05:19:35 +0000 (10:49 +0530)]
Updated Documentation
Vadim Pisarevsky [Mon, 28 Jul 2014 17:24:42 +0000 (17:24 +0000)]
Merge pull request #3010 from vpisarev:ocl_disable_some_norms2
Vadim Pisarevsky [Mon, 28 Jul 2014 16:00:33 +0000 (16:00 +0000)]
Merge pull request #2989 from smvv:gstreamer_capture_init
Vadim Pisarevsky [Mon, 28 Jul 2014 15:59:59 +0000 (15:59 +0000)]
Merge pull request #2996 from akarsakov:ocl_dft_new_concept
Vadim Pisarevsky [Mon, 28 Jul 2014 15:59:43 +0000 (15:59 +0000)]
Merge pull request #2998 from ernest-galbrun:cuda_concurrency
Vadim Pisarevsky [Mon, 28 Jul 2014 15:35:06 +0000 (19:35 +0400)]
disabled ocl_minmaxloc on 32-bit data completely
Vadim Pisarevsky [Mon, 28 Jul 2014 15:32:06 +0000 (19:32 +0400)]
disabled some more stuff
Vadim Pisarevsky [Mon, 28 Jul 2014 15:23:46 +0000 (19:23 +0400)]
fixed compile warning with GCC
Vadim Pisarevsky [Mon, 28 Jul 2014 13:18:28 +0000 (17:18 +0400)]
fixed doc builder warnings
Vadim Pisarevsky [Mon, 28 Jul 2014 13:16:02 +0000 (17:16 +0400)]
trying to make OpenCL builder green
Vadim Pisarevsky [Mon, 28 Jul 2014 12:48:53 +0000 (16:48 +0400)]
removed ERFilter (to be moved to opencv_contrib/modules/text) and lineMOD (to be moved to opencv_contrib/modules/rgbd)
Vadim Pisarevsky [Mon, 28 Jul 2014 11:52:26 +0000 (11:52 +0000)]
Merge pull request #2179 from adishavit:feature-SupportClipboardCopyOnWindows
Vadim Pisarevsky [Mon, 28 Jul 2014 11:45:54 +0000 (15:45 +0400)]
disable OpenCL difference norms with mask, since some of the tests fail
Vadim Pisarevsky [Mon, 28 Jul 2014 11:20:25 +0000 (15:20 +0400)]
fixed compile warnings and removed extra whitespaces
Vadim Pisarevsky [Mon, 28 Jul 2014 11:15:21 +0000 (11:15 +0000)]
Merge pull request #2994 from znah:py_hpp_glob
Vadim Pisarevsky [Mon, 28 Jul 2014 11:13:45 +0000 (11:13 +0000)]
Merge pull request #3006 from smvv:fix_findContours_for_python2
Vadim Pisarevsky [Mon, 28 Jul 2014 11:12:14 +0000 (11:12 +0000)]
Merge pull request #3007 from kobigurk:master
Vadim Pisarevsky [Mon, 28 Jul 2014 11:08:08 +0000 (11:08 +0000)]
Merge pull request #3003 from ElenaGvozdeva:ocl_sum
Vadim Pisarevsky [Mon, 28 Jul 2014 10:54:41 +0000 (14:54 +0400)]
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
Alexander Karsakov [Sun, 27 Jul 2014 09:31:46 +0000 (13:31 +0400)]
Using std::map in PlanCache
Elena Gvozdeva [Mon, 28 Jul 2014 08:21:00 +0000 (12:21 +0400)]
fixed
Vladislav Vinogradov [Mon, 28 Jul 2014 08:13:52 +0000 (12:13 +0400)]
fix cudacodec module dependecies
Alexander Mordvintsev [Sun, 27 Jul 2014 14:25:42 +0000 (18:25 +0400)]
double to float cast warning fix
Kobi Gurkan [Sun, 27 Jul 2014 14:14:54 +0000 (17:14 +0300)]
fixes tab indentation - replacing with 4 spaces
Kobi Gurkan [Sun, 27 Jul 2014 14:09:05 +0000 (17:09 +0300)]
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
Alexander Mordvintsev [Sun, 27 Jul 2014 14:03:27 +0000 (18:03 +0400)]
module blacklist
Alexander Mordvintsev [Sun, 27 Jul 2014 13:41:12 +0000 (17:41 +0400)]
'adas' extra module doesn't produce .lib on windows (causes link error)
Alexander Mordvintsev [Sun, 27 Jul 2014 12:35:35 +0000 (16:35 +0400)]
pass header list to gen2.py by a text file (avoid command line length limit on windows)
Alexander Mordvintsev [Wed, 23 Jul 2014 10:54:04 +0000 (14:54 +0400)]
fixed parsing enums with tailing comma
gen2.py reports headers it processes
cmake file restructured
Alexander Mordvintsev [Tue, 22 Jul 2014 10:22:46 +0000 (14:22 +0400)]
glob for python module dependences
Alexander Mordvintsev [Tue, 22 Jul 2014 08:36:36 +0000 (12:36 +0400)]
automatic search for headers for python wrapper generation
Sander Mathijs van Veen [Sat, 26 Jul 2014 14:40:09 +0000 (16:40 +0200)]
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`.
Vadim Pisarevsky [Fri, 25 Jul 2014 13:24:47 +0000 (13:24 +0000)]
Merge pull request #2999 from jpuigcerver:traincascade_choose_threads
Vadim Pisarevsky [Fri, 25 Jul 2014 12:54:22 +0000 (12:54 +0000)]
Merge pull request #2720 from pglotov:master
Vadim Pisarevsky [Fri, 25 Jul 2014 12:29:49 +0000 (12:29 +0000)]
Merge pull request #1292 from adrians:neon-pull
Vadim Pisarevsky [Fri, 25 Jul 2014 11:26:24 +0000 (11:26 +0000)]
Merge pull request #2993 from vbystricky:oclopt_warp_affine
Elena Gvozdeva [Fri, 25 Jul 2014 10:51:30 +0000 (14:51 +0400)]
Fixed bug in reduce.cl
vbystricky [Fri, 25 Jul 2014 06:46:45 +0000 (10:46 +0400)]
Optimize ocl function pyrDown
Alexander Karsakov [Fri, 25 Jul 2014 09:11:35 +0000 (13:11 +0400)]
Added license header, using cv::Ptr, small fixes.
Adrian Stratulat [Wed, 2 Oct 2013 19:23:42 +0000 (19:23 +0000)]
Add NEON intrinsics to core/src/arithm.cpp
Andrey Pavlenko [Thu, 24 Jul 2014 13:30:16 +0000 (13:30 +0000)]
Merge pull request #3000 from akarsakov:ocl_dft_new_tests
Alexander Karsakov [Thu, 24 Jul 2014 09:11:58 +0000 (13:11 +0400)]
Added accuracy and performance tests for DFT all modes.
Alexander Karsakov [Wed, 23 Jul 2014 08:13:09 +0000 (12:13 +0400)]
Final refactoring, fixes
Joan Puigcerver [Wed, 23 Jul 2014 20:47:51 +0000 (22:47 +0200)]
Added an option to traincascade program to select the maximum number of threads to use during training
Sander Mathijs van Veen [Wed, 23 Jul 2014 17:15:16 +0000 (19:15 +0200)]
Reset class members to NULL after gst_*_unref()
Sander Mathijs van Veen [Mon, 21 Jul 2014 08:12:25 +0000 (10:12 +0200)]
Initialize all pointers of CvCapture_GStreamer correctly
Ernest Galbrun [Wed, 23 Jul 2014 12:34:22 +0000 (14:34 +0200)]
trailing whitespace
Ernest Galbrun [Wed, 23 Jul 2014 12:21:45 +0000 (14:21 +0200)]
Merge branch 'master' of https://github.com/Itseez/opencv
Ernest Galbrun [Wed, 23 Jul 2014 12:16:53 +0000 (14:16 +0200)]
modified default stream initialization to allow concurrent calls modified cuda surf.cuda.cpp to allow concurrent call
Vadim Pisarevsky [Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)]
Merge pull request #2990 from vbystricky:highgui_split2
Vadim Pisarevsky [Wed, 23 Jul 2014 11:23:48 +0000 (11:23 +0000)]
Merge pull request #2919 from larshg:Openni2Support
Alexander Alekhin [Wed, 23 Jul 2014 10:50:43 +0000 (10:50 +0000)]
Merge pull request #2995 from ElenaGvozdeva:ipp_DFT
Elena Gvozdeva [Wed, 23 Jul 2014 09:39:31 +0000 (13:39 +0400)]
Fixed ippiDFT call
Alexander Karsakov [Tue, 22 Jul 2014 10:54:38 +0000 (14:54 +0400)]
Added nonzero_rows support
Alexander Karsakov [Tue, 22 Jul 2014 07:24:19 +0000 (11:24 +0400)]
Added rest Elena's changes
Alexander Karsakov [Mon, 21 Jul 2014 06:42:56 +0000 (10:42 +0400)]
Added multi-block scheme
Alexander Karsakov [Fri, 18 Jul 2014 09:41:57 +0000 (13:41 +0400)]
Added Elena's changes with implemented DFT_INVERSE C2C mode.
Alexander Karsakov [Thu, 17 Jul 2014 12:20:04 +0000 (16:20 +0400)]
Added DFT_SCALE for forward transforms
Alexander Karsakov [Thu, 17 Jul 2014 08:31:41 +0000 (12:31 +0400)]
Added packing to CCS format
Alexander Karsakov [Tue, 15 Jul 2014 14:25:46 +0000 (18:25 +0400)]
Completed all forward transforms.
Alexander Karsakov [Fri, 11 Jul 2014 11:01:46 +0000 (15:01 +0400)]
Added fftplan cache