Andrey Pavlenko [Thu, 13 Mar 2014 12:48:38 +0000 (16:48 +0400)]
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
Roman Donchenko [Thu, 13 Mar 2014 09:42:20 +0000 (13:42 +0400)]
Merge pull request #2468 from mlyashko:back_proj_fix
Roman Donchenko [Wed, 12 Mar 2014 14:51:40 +0000 (18:51 +0400)]
Merge pull request #2463 from ziyangli:master
Roman Donchenko [Wed, 12 Mar 2014 13:08:43 +0000 (17:08 +0400)]
Merge pull request #2465 from SpecLad:merge-2.4
ziyangli [Wed, 12 Mar 2014 10:16:54 +0000 (18:16 +0800)]
cleanup
Ziyang LI [Wed, 12 Mar 2014 10:14:43 +0000 (18:14 +0800)]
remove a whitepace
mlyashko [Wed, 12 Mar 2014 07:30:28 +0000 (11:30 +0400)]
added data type check for back projection fix
Roman Donchenko [Tue, 11 Mar 2014 13:20:01 +0000 (17:20 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
Andrey Pavlenko [Tue, 11 Mar 2014 12:00:21 +0000 (16:00 +0400)]
Merge pull request #2373 from mlyashko:optflow_dualtvl1
Andrey Pavlenko [Tue, 11 Mar 2014 11:59:11 +0000 (15:59 +0400)]
Merge pull request #2387 from alalek:ocl_remap_3cn
Andrey Pavlenko [Tue, 11 Mar 2014 11:58:32 +0000 (15:58 +0400)]
Merge pull request #2455 from ilya-lavrenov:tapi_fix
Ilya Lavrenov [Tue, 11 Mar 2014 11:21:14 +0000 (15:21 +0400)]
changes according to reviewer's suggestions
Andrey Pavlenko [Tue, 11 Mar 2014 08:57:28 +0000 (12:57 +0400)]
Merge pull request #2448 from akarsakov:ocl_cxt_termination
Andrey Pavlenko [Tue, 11 Mar 2014 08:44:33 +0000 (12:44 +0400)]
Merge pull request #2461 from ilya-lavrenov:tapi_calc_hist
Andrey Pavlenko [Tue, 11 Mar 2014 08:37:11 +0000 (12:37 +0400)]
Merge pull request #2457 from ilya-lavrenov:ocl_calc_hist
Ilya Lavrenov [Fri, 7 Mar 2014 10:35:51 +0000 (14:35 +0400)]
added performance tests for cv::ocl::calcHist
Alexander Alekhin [Thu, 20 Feb 2014 14:20:08 +0000 (18:20 +0400)]
TAPI: remap 3-channel
Ziyang LI [Mon, 10 Mar 2014 09:33:13 +0000 (17:33 +0800)]
Moved x = 0 into the parenthesis
Easier to understand
Ilya Lavrenov [Sat, 8 Mar 2014 08:20:52 +0000 (12:20 +0400)]
optimized cv::calcHist
Roman Donchenko [Fri, 7 Mar 2014 14:19:00 +0000 (18:19 +0400)]
Merge pull request #2397 from vbystricky:intelperc
vbystricky [Fri, 7 Mar 2014 12:25:15 +0000 (16:25 +0400)]
Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual
Andrey Pavlenko [Fri, 7 Mar 2014 10:00:09 +0000 (14:00 +0400)]
Merge pull request #2437 from ilya-lavrenov:tapi_morph
Andrey Pavlenko [Fri, 7 Mar 2014 09:54:34 +0000 (13:54 +0400)]
Merge pull request #2438 from ilya-lavrenov:tapi_flip
Andrey Pavlenko [Fri, 7 Mar 2014 09:54:12 +0000 (13:54 +0400)]
Merge pull request #2441 from akarsakov:ocl_platform_vendor
Andrey Pavlenko [Fri, 7 Mar 2014 09:53:43 +0000 (13:53 +0400)]
Merge pull request #2444 from ilya-lavrenov:tapi_gftt
Andrey Pavlenko [Fri, 7 Mar 2014 09:52:47 +0000 (13:52 +0400)]
Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data
Andrey Pavlenko [Fri, 7 Mar 2014 09:51:37 +0000 (13:51 +0400)]
Merge pull request #2453 from ilya-lavrenov:tapi_sobel
Alexander Karsakov [Wed, 5 Mar 2014 11:04:44 +0000 (15:04 +0400)]
Pass vendor macro to opencl kernel
mlyashko [Fri, 7 Mar 2014 07:15:54 +0000 (11:15 +0400)]
changed kernel.set to support unsuccssful set
Ilya Lavrenov [Tue, 25 Feb 2014 15:32:55 +0000 (19:32 +0400)]
fix bitwise ops and mask support
Andrey Pavlenko [Thu, 6 Mar 2014 18:17:44 +0000 (22:17 +0400)]
Merge pull request #2431 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Thu, 6 Mar 2014 18:03:01 +0000 (22:03 +0400)]
Merge pull request #2445 from ilya-lavrenov:ocl_perf
Andrey Pavlenko [Thu, 6 Mar 2014 17:55:50 +0000 (21:55 +0400)]
Merge pull request #2450 from ilya-lavrenov:tapi_test
Andrey Pavlenko [Thu, 6 Mar 2014 17:51:24 +0000 (21:51 +0400)]
Merge pull request #2452 from ilya-lavrenov:tapi_disable_surf
Ilya Lavrenov [Thu, 6 Mar 2014 13:28:00 +0000 (17:28 +0400)]
added new dtypes to cv::Sobel
Roman Donchenko [Thu, 6 Mar 2014 13:53:31 +0000 (17:53 +0400)]
Merge pull request #2443 from waveform80:issue-3554
Ilya Lavrenov [Thu, 6 Mar 2014 11:48:57 +0000 (15:48 +0400)]
improved cv::preCornerDetect
Ilya Lavrenov [Thu, 6 Mar 2014 12:49:22 +0000 (16:49 +0400)]
disable SURF
Alexander Karsakov [Thu, 6 Mar 2014 07:16:38 +0000 (11:16 +0400)]
Clarifying comments
Ilya Lavrenov [Thu, 6 Mar 2014 11:40:27 +0000 (15:40 +0400)]
ported fast calculation of covar data
Ilya Lavrenov [Thu, 6 Mar 2014 08:11:40 +0000 (12:11 +0400)]
test for clEnqueueReadBufferRect
mlyashko [Thu, 6 Mar 2014 07:43:01 +0000 (11:43 +0400)]
macro for normal return from thriveless kernel.set
Ilya Lavrenov [Thu, 6 Mar 2014 05:24:02 +0000 (09:24 +0400)]
tuned some tests
Ilya Lavrenov [Tue, 4 Mar 2014 16:04:16 +0000 (20:04 +0400)]
improved performance of GFTT
Alexander Karsakov [Wed, 5 Mar 2014 13:57:06 +0000 (17:57 +0400)]
Remove clReleaseDevice call (workaround for pure virtual call on Windows)
Roman Donchenko [Wed, 5 Mar 2014 13:28:08 +0000 (17:28 +0400)]
Merge pull request #2440 from codyrigney92:Master_LKOptFlow_NEON
Alexander Karsakov [Wed, 5 Mar 2014 07:25:37 +0000 (11:25 +0400)]
Added Device:: isAMD,isIntel,isNvidia methods.
vbystricky [Wed, 5 Mar 2014 09:06:36 +0000 (13:06 +0400)]
Change text of copyright
vbystricky [Wed, 5 Mar 2014 07:03:57 +0000 (11:03 +0400)]
Change text of license and copyright
Dave Hughes [Wed, 5 Mar 2014 02:44:40 +0000 (02:44 +0000)]
Fix for #3554
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
Cody Rigney [Tue, 4 Mar 2014 19:47:12 +0000 (14:47 -0500)]
Master Version: Added NEON Optimizations for LK Optical Flow.
Andrey Pavlenko [Tue, 4 Mar 2014 15:21:15 +0000 (19:21 +0400)]
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
Andrey Pavlenko [Tue, 4 Mar 2014 15:18:11 +0000 (19:18 +0400)]
Merge pull request #2429 from ilya-lavrenov:master_compatible_tests
Andrey Pavlenko [Tue, 4 Mar 2014 14:50:14 +0000 (18:50 +0400)]
Merge pull request #2391 from ilya-lavrenov:tapi_match_template
Andrey Pavlenko [Tue, 4 Mar 2014 14:37:26 +0000 (18:37 +0400)]
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
Roman Donchenko [Tue, 4 Mar 2014 11:32:12 +0000 (15:32 +0400)]
Merge pull request #2409 from juanmanpr:master
Roman Donchenko [Tue, 4 Mar 2014 11:30:26 +0000 (15:30 +0400)]
Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
Roman Donchenko [Tue, 4 Mar 2014 09:51:30 +0000 (13:51 +0400)]
Merge pull request #2439 from ilya-lavrenov:typo
Ilya Lavrenov [Mon, 3 Mar 2014 15:37:47 +0000 (19:37 +0400)]
typos
Roman Donchenko [Tue, 4 Mar 2014 07:49:01 +0000 (11:49 +0400)]
Merge pull request #2381 from ElenaGvozdeva:ipp_resize
Roman Donchenko [Tue, 4 Mar 2014 07:46:28 +0000 (11:46 +0400)]
Merge pull request #2432 from ilya-lavrenov:summary_py
mlyashko [Tue, 4 Mar 2014 07:36:47 +0000 (11:36 +0400)]
changed localsize to NULL (reviewers comment)
Ilya Lavrenov [Mon, 3 Mar 2014 15:04:32 +0000 (19:04 +0400)]
improved performance of cv::flip (flip cols)
Roman Donchenko [Mon, 3 Mar 2014 11:41:06 +0000 (15:41 +0400)]
Merge pull request #2435 from SpecLad:merge-2.4
Ilya Lavrenov [Mon, 3 Mar 2014 11:19:02 +0000 (15:19 +0400)]
fixed morphology operations
Ilya Lavrenov [Mon, 3 Mar 2014 10:32:38 +0000 (14:32 +0400)]
fixed cv::dft
Roman Donchenko [Mon, 3 Mar 2014 09:45:22 +0000 (13:45 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
Ilya Lavrenov [Sun, 2 Mar 2014 12:08:37 +0000 (16:08 +0400)]
ability to merge logs with intersections only
Roman Donchenko [Mon, 3 Mar 2014 08:20:34 +0000 (12:20 +0400)]
Merge pull request #2433 from ilya-lavrenov:typos
Ilya Lavrenov [Sun, 2 Mar 2014 17:04:17 +0000 (21:04 +0400)]
typos
Ilya Lavrenov [Sat, 1 Mar 2014 16:08:58 +0000 (20:08 +0400)]
added some new performance tests
Ilya Lavrenov [Sat, 1 Mar 2014 09:13:24 +0000 (13:13 +0400)]
tests
Cody Rigney [Mon, 24 Feb 2014 19:15:21 +0000 (14:15 -0500)]
Added NEON optimizations for LK optical flow (Intrinsics).
Ilya Lavrenov [Fri, 28 Feb 2014 10:15:56 +0000 (14:15 +0400)]
master-like performance tests
Andrey Pavlenko [Fri, 28 Feb 2014 14:22:03 +0000 (18:22 +0400)]
Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
Andrey Pavlenko [Fri, 28 Feb 2014 14:21:37 +0000 (18:21 +0400)]
Merge pull request #2427 from alalek:ocl_build_log
Elena Gvozdeva [Thu, 27 Feb 2014 14:10:16 +0000 (18:10 +0400)]
fixed
Alexander Alekhin [Thu, 27 Feb 2014 08:51:40 +0000 (12:51 +0400)]
core/ocl: OpenCL build log improvements
Andrey Pavlenko [Thu, 27 Feb 2014 05:37:04 +0000 (09:37 +0400)]
Merge pull request #2415 from vpisarev:fix_stereobm_sse
Alexander Karsakov [Wed, 26 Feb 2014 14:11:11 +0000 (18:11 +0400)]
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
Roman Donchenko [Wed, 26 Feb 2014 13:34:49 +0000 (17:34 +0400)]
Merge pull request #2419 from linquize:tgit.icon
Linquize [Tue, 25 Feb 2014 15:34:41 +0000 (23:34 +0800)]
Add tgit.icon project config
Roman Donchenko [Wed, 26 Feb 2014 08:16:35 +0000 (12:16 +0400)]
Merge pull request #2393 from ilya-lavrenov:coverity
mlyashko [Wed, 26 Feb 2014 06:55:18 +0000 (10:55 +0400)]
changed file name to case-sensitve to support linux
juanmanpr [Tue, 25 Feb 2014 18:58:08 +0000 (19:58 +0100)]
CV_Assert for photo module corrected
Roman Donchenko [Tue, 25 Feb 2014 15:42:53 +0000 (19:42 +0400)]
Merge pull request #2399 from SpecLad:merge-2.4
Vadim Pisarevsky [Tue, 25 Feb 2014 14:13:51 +0000 (18:13 +0400)]
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
Roman Donchenko [Tue, 25 Feb 2014 13:43:48 +0000 (17:43 +0400)]
Merge pull request #2358 from rohitgirdhar:rotatedRect
Ilya Lavrenov [Sun, 23 Feb 2014 17:07:20 +0000 (21:07 +0400)]
fixed defects from Xcode
Elena Gvozdeva [Tue, 25 Feb 2014 12:40:04 +0000 (16:40 +0400)]
fixed
Roman Donchenko [Tue, 25 Feb 2014 11:04:23 +0000 (15:04 +0400)]
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
Roman Donchenko [Mon, 24 Feb 2014 10:35:34 +0000 (14:35 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
Roman Donchenko [Tue, 25 Feb 2014 10:21:12 +0000 (14:21 +0400)]
Merge pull request #2412 from arunjvs:master
Ilya Lavrenov [Mon, 24 Feb 2014 20:29:17 +0000 (00:29 +0400)]
core tapi optimization
Arun JVS [Tue, 25 Feb 2014 09:04:32 +0000 (14:34 +0530)]
Fixed Bug #3568: Build fails with WITH_OPENGL=ON
Elena Gvozdeva [Mon, 24 Feb 2014 12:12:50 +0000 (16:12 +0400)]
fixed
Roman Donchenko [Tue, 25 Feb 2014 08:37:01 +0000 (12:37 +0400)]
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
Alexander Smorkalov [Tue, 25 Feb 2014 07:50:55 +0000 (11:50 +0400)]
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
The crash was cased by massive Mat objects leak in NativeCameraView class.
vbystricky [Mon, 17 Feb 2014 13:50:15 +0000 (17:50 +0400)]
Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera
Alexander Smorkalov [Tue, 25 Feb 2014 06:36:20 +0000 (10:36 +0400)]
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.