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
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 13:16:02 +0000 (17:16 +0400)]
trying to make OpenCL builder green
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: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
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
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
Alexander Karsakov [Thu, 10 Jul 2014 14:10:46 +0000 (18:10 +0400)]
Enabled precalculated wave
Alexander Karsakov [Thu, 26 Jun 2014 06:09:15 +0000 (10:09 +0400)]
Multi-radix with kernel generation
Alexander Alekhin [Tue, 22 Jul 2014 09:38:11 +0000 (09:38 +0000)]
Merge pull request #2961 from ilya-lavrenov:tapi_corners
vbystricky [Tue, 22 Jul 2014 09:22:40 +0000 (13:22 +0400)]
Optimize ocl version of warp_affine
vbystricky [Mon, 21 Jul 2014 11:10:41 +0000 (15:10 +0400)]
Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs
Alexander Alekhin [Mon, 21 Jul 2014 09:10:24 +0000 (09:10 +0000)]
Merge pull request #2960 from ilya-lavrenov:tapi_perf_fix
Alexander Alekhin [Mon, 21 Jul 2014 08:21:18 +0000 (08:21 +0000)]
Merge pull request #2986 from vbystricky:videoio_fix
Anish Pednekar [Sun, 20 Jul 2014 15:29:17 +0000 (20:59 +0530)]
added macro guard to enable overriding ENABLE_LOG
VBystricky [Sun, 20 Jul 2014 14:27:14 +0000 (18:27 +0400)]
Fix build errors with cap_v4l on Linux
Lars Glud [Sun, 20 Jul 2014 12:49:47 +0000 (14:49 +0200)]
Openni2 support
Lars Glud [Sun, 20 Jul 2014 12:28:10 +0000 (14:28 +0200)]
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
Vadim Pisarevsky [Sat, 19 Jul 2014 18:04:14 +0000 (18:04 +0000)]
Merge pull request #2925 from BloodAxe:osx-framework-script
Vadim Pisarevsky [Fri, 18 Jul 2014 09:58:06 +0000 (09:58 +0000)]
Merge pull request #2979 from PhilLab:patch-2
Vadim Pisarevsky [Fri, 18 Jul 2014 09:25:22 +0000 (09:25 +0000)]
Merge pull request #2933 from ilya-lavrenov:sse_moments
PhilLab [Thu, 17 Jul 2014 07:19:31 +0000 (09:19 +0200)]
Function for drawing arrows
Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970) To the new InputOutputArray type
Vadim Pisarevsky [Wed, 16 Jul 2014 19:29:36 +0000 (19:29 +0000)]
Merge pull request #2964 from vbystricky:highgui_split
Lars Glud [Tue, 1 Jul 2014 08:07:01 +0000 (10:07 +0200)]
Openni2 support
Petr Glotov [Sat, 17 May 2014 05:52:07 +0000 (22:52 -0700)]
added timelapse
Vadim Pisarevsky [Tue, 15 Jul 2014 09:46:28 +0000 (09:46 +0000)]
Merge pull request #2910 from ilya-lavrenov:sse2_canny
Vadim Pisarevsky [Tue, 15 Jul 2014 08:57:31 +0000 (08:57 +0000)]
Merge pull request #2765 from pradeep-pyro:kullback_leibler
Vadim Pisarevsky [Tue, 15 Jul 2014 08:09:04 +0000 (08:09 +0000)]
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
pradeep [Tue, 15 Jul 2014 04:32:53 +0000 (12:32 +0800)]
Changed cv::log to std::log
VBystricky [Mon, 14 Jul 2014 19:30:50 +0000 (23:30 +0400)]
Refresh code. Fix merge conflict
Vadim Pisarevsky [Mon, 14 Jul 2014 19:21:14 +0000 (19:21 +0000)]
Merge pull request #2953 from gongzg:master
vbystricky [Thu, 10 Jul 2014 14:27:32 +0000 (18:27 +0400)]
Split highgui module to videoio and highgui
Vadim Pisarevsky [Mon, 14 Jul 2014 18:53:25 +0000 (18:53 +0000)]
Merge pull request #2947 from vbystricky:capDShow
Alexander Alekhin [Mon, 14 Jul 2014 18:48:28 +0000 (18:48 +0000)]
Merge pull request #2882 from akarsakov:ocl_pyrDown_opt
Roman Donchenko [Mon, 14 Jul 2014 08:20:54 +0000 (08:20 +0000)]
Merge pull request #2962 from alalek:fix_v4l_build
Alexander Alekhin [Sat, 12 Jul 2014 05:00:57 +0000 (05:00 +0000)]
Merge pull request #2918 from vbystricky:oclopt_reduce2
Alexander Alekhin [Fri, 11 Jul 2014 14:55:13 +0000 (14:55 +0000)]
Merge pull request #2963 from ilya-lavrenov:tapi_bufferpool
Alexander Alekhin [Fri, 11 Jul 2014 14:53:46 +0000 (14:53 +0000)]
Merge pull request #2935 from vbystricky:oclopt_meanStdDev
Alexander Alekhin [Fri, 11 Jul 2014 10:00:15 +0000 (10:00 +0000)]
Merge pull request #2851 from ilya-lavrenov:tapi_set_identity
Alexander Alekhin [Fri, 11 Jul 2014 09:59:26 +0000 (09:59 +0000)]
Merge pull request #2888 from ilya-lavrenov:tapi_remap
Ilya Lavrenov [Thu, 10 Jul 2014 14:13:01 +0000 (18:13 +0400)]
enabled BufferPool
Alexander Alekhin [Thu, 10 Jul 2014 13:59:37 +0000 (17:59 +0400)]
fix build
Ilya Lavrenov [Thu, 10 Jul 2014 13:04:24 +0000 (17:04 +0400)]
corners
Ilya Lavrenov [Thu, 10 Jul 2014 11:54:43 +0000 (15:54 +0400)]
fixed perf test
Alexander Alekhin [Thu, 10 Jul 2014 09:38:37 +0000 (09:38 +0000)]
Merge pull request #2927 from ilya-lavrenov:tapi_lut
Vadim Pisarevsky [Thu, 10 Jul 2014 05:28:44 +0000 (05:28 +0000)]
Merge pull request #2943 from vbystricky:highgui_imgcodecs
Zhigang Gong [Wed, 9 Jul 2014 08:04:22 +0000 (16:04 +0800)]
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>
pradeep [Wed, 9 Jul 2014 07:29:47 +0000 (15:29 +0800)]
Fixed truncation warning