Andrey Pavlenko [Thu, 20 Mar 2014 15:20:14 +0000 (19:20 +0400)]
Merge pull request #2496 from ilya-lavrenov:tapi_imgproc
Andrey Pavlenko [Thu, 20 Mar 2014 09:39:39 +0000 (13:39 +0400)]
Merge pull request #2494 from ilya-lavrenov:tapi_merge
Andrey Pavlenko [Thu, 20 Mar 2014 09:39:16 +0000 (13:39 +0400)]
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
Ilya Lavrenov [Wed, 19 Mar 2014 20:28:21 +0000 (00:28 +0400)]
fixed bug in cv::ocl::predictOptimalVectorWidth
Ilya Lavrenov [Tue, 18 Mar 2014 12:02:25 +0000 (16:02 +0400)]
eliminated restriction src[i].channels() == 1 in cv::merge
Andrey Pavlenko [Wed, 19 Mar 2014 08:56:11 +0000 (12:56 +0400)]
Merge pull request #2493 from ilya-lavrenov:tapi_fnlm
Konstantin Matskevich [Wed, 19 Mar 2014 08:14:48 +0000 (12:14 +0400)]
update error message
Ilya Lavrenov [Tue, 18 Mar 2014 16:02:04 +0000 (20:02 +0400)]
added 3-channels support to morphology operations
Roman Donchenko [Tue, 18 Mar 2014 12:18:32 +0000 (16:18 +0400)]
Merge pull request #1986 from GregoryMorse:patch-3
Andrey Pavlenko [Tue, 18 Mar 2014 11:53:09 +0000 (15:53 +0400)]
Merge pull request #2464 from KonstantinMatskevich:ocl_stereobm_experiment
Konstantin Matskevich [Tue, 18 Mar 2014 09:19:41 +0000 (13:19 +0400)]
fix for incorrect opencl device selection
Ilya Lavrenov [Tue, 18 Mar 2014 10:29:02 +0000 (14:29 +0400)]
added 4 channels support to fnlm
Roman Donchenko [Tue, 18 Mar 2014 09:55:56 +0000 (13:55 +0400)]
Merge pull request #2486 from SpecLad:merge-2.4
Roman Donchenko [Mon, 17 Mar 2014 10:14:07 +0000 (14:14 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
Andrey Pavlenko [Mon, 17 Mar 2014 10:04:22 +0000 (14:04 +0400)]
Merge pull request #2479 from alalek:ocl_compare_scalar
Andrey Pavlenko [Mon, 17 Mar 2014 09:10:34 +0000 (13:10 +0400)]
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
Alexander Alekhin [Mon, 17 Mar 2014 08:29:49 +0000 (12:29 +0400)]
ocl: compare: remove useless perf tests
Roman Donchenko [Mon, 17 Mar 2014 07:59:14 +0000 (11:59 +0400)]
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
Roman Donchenko [Mon, 17 Mar 2014 07:57:09 +0000 (11:57 +0400)]
Merge pull request #2484 from berak:mat_doc_24
Konstantin Matskevich [Fri, 14 Mar 2014 09:28:35 +0000 (13:28 +0400)]
finalizing
Anatoly Baksheev [Sun, 16 Mar 2014 16:07:05 +0000 (20:07 +0400)]
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
berak [Sun, 16 Mar 2014 13:04:05 +0000 (14:04 +0100)]
missing () on Mat::type()
Alexander Alekhin [Fri, 14 Mar 2014 15:50:38 +0000 (19:50 +0400)]
ocl: workaround for Pow accuracy test failure
Alexander Alekhin [Fri, 14 Mar 2014 10:01:05 +0000 (14:01 +0400)]
ocl: fixes
Alexander Alekhin [Thu, 13 Mar 2014 16:36:23 +0000 (20:36 +0400)]
ocl: compare with scalar
Andrey Pavlenko [Fri, 14 Mar 2014 15:17:03 +0000 (19:17 +0400)]
Merge pull request #2481 from akarsakov:fix_hog_intel
Andrey Pavlenko [Fri, 14 Mar 2014 15:14:35 +0000 (19:14 +0400)]
Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4
Andrey Pavlenko [Fri, 14 Mar 2014 15:08:06 +0000 (19:08 +0400)]
Merge pull request #2482 from ilya-lavrenov:tapi_fix
Andrey Pavlenko [Fri, 14 Mar 2014 15:05:55 +0000 (19:05 +0400)]
Merge pull request #2475 from ilya-lavrenov:ocl_2.4_fix
Andrey Pavlenko [Fri, 14 Mar 2014 15:04:18 +0000 (19:04 +0400)]
Merge pull request #2480 from vpisarev:ocl_orb
Konstantin Matskevich [Thu, 13 Mar 2014 05:33:15 +0000 (09:33 +0400)]
speedUp
Konstantin Matskevich [Wed, 12 Mar 2014 09:09:57 +0000 (13:09 +0400)]
temp
Konstantin Matskevich [Wed, 12 Mar 2014 07:20:23 +0000 (11:20 +0400)]
fixes
Konstantin Matskevich [Thu, 6 Mar 2014 13:56:42 +0000 (17:56 +0400)]
new approach
Konstantin Matskevich [Tue, 4 Mar 2014 06:25:07 +0000 (10:25 +0400)]
new attempt
Konstantin Matskevich [Fri, 28 Feb 2014 05:28:07 +0000 (09:28 +0400)]
bad experiment =(
Konstantin Matskevich [Tue, 18 Feb 2014 10:24:26 +0000 (14:24 +0400)]
optimizations
Konstantin Matskevich [Tue, 18 Feb 2014 10:08:22 +0000 (14:08 +0400)]
added optimization
Konstantin Matskevich [Thu, 16 Jan 2014 10:10:17 +0000 (14:10 +0400)]
stereoBM
Ilya Lavrenov [Fri, 14 Mar 2014 13:25:34 +0000 (17:25 +0400)]
added 3 vs 4 channels performance tests
Ilya Lavrenov [Fri, 14 Mar 2014 12:53:10 +0000 (16:53 +0400)]
fix for unsupported doubles
Roman Donchenko [Fri, 14 Mar 2014 11:17:45 +0000 (15:17 +0400)]
Merge pull request #2474 from akarsakov:fix_getpolicy
Alexander Karsakov [Fri, 14 Mar 2014 10:18:52 +0000 (14:18 +0400)]
Removed workaround for Intel platform.
Alexander Karsakov [Thu, 13 Mar 2014 06:22:36 +0000 (10:22 +0400)]
Fixed getPolicy() method to make it thread-safe.
Vadim Pisarevsky [Thu, 13 Mar 2014 19:18:41 +0000 (23:18 +0400)]
fixed extra whitespace
Vadim Pisarevsky [Thu, 13 Mar 2014 19:17:28 +0000 (23:17 +0400)]
fixed bug in FAST
Vadim Pisarevsky [Thu, 13 Mar 2014 18:56:53 +0000 (22:56 +0400)]
finished OpenCL port of ORB
Ilya Lavrenov [Thu, 13 Mar 2014 18:56:46 +0000 (22:56 +0400)]
typos
Ilya Lavrenov [Thu, 13 Mar 2014 18:35:08 +0000 (22:35 +0400)]
nonfree perf tests
Ilya Lavrenov [Thu, 13 Mar 2014 15:42:13 +0000 (19:42 +0400)]
improved performance of bitwise ops
Andrey Pavlenko [Thu, 13 Mar 2014 14:55:27 +0000 (18:55 +0400)]
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
Andrey Pavlenko [Thu, 13 Mar 2014 14:42:00 +0000 (18:42 +0400)]
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
Andrey Pavlenko [Thu, 13 Mar 2014 14:37:05 +0000 (18:37 +0400)]
Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels
Ilya Lavrenov [Thu, 13 Mar 2014 12:27:07 +0000 (16:27 +0400)]
improved performance of cv::ocl::sum
Andrey Pavlenko [Thu, 13 Mar 2014 12:56:01 +0000 (16:56 +0400)]
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
Andrey Pavlenko [Thu, 13 Mar 2014 12:49:56 +0000 (16:49 +0400)]
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
Andrey Pavlenko [Thu, 13 Mar 2014 12:48:38 +0000 (16:48 +0400)]
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
Alexander Alekhin [Thu, 13 Mar 2014 11:45:23 +0000 (15:45 +0400)]
ocl: cleanup workarounds
Ilya Lavrenov [Thu, 13 Mar 2014 11:35:53 +0000 (15:35 +0400)]
improved performance of cv::ocl::countNonZero
Ilya Lavrenov [Thu, 13 Mar 2014 10:57:13 +0000 (14:57 +0400)]
changes for GFTT
Ilya Lavrenov [Wed, 12 Mar 2014 15:58:53 +0000 (19:58 +0400)]
improved performance of cv::ocl::minMax
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
Roman Donchenko [Wed, 12 Mar 2014 12:53:41 +0000 (16:53 +0400)]
Merge pull request #2434 from Nerei:viz_continue
Anatoly Baksheev [Wed, 12 Mar 2014 12:21:36 +0000 (16:21 +0400)]
minor cmake fix fo macos
Ilya Lavrenov [Tue, 11 Mar 2014 21:00:29 +0000 (01:00 +0400)]
3-channel reduction operations
Alexander Alekhin [Thu, 27 Feb 2014 12:25:26 +0000 (16:25 +0400)]
ocl: pyrUp/pyrDown 3-channel
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
Ilya Lavrenov [Tue, 11 Mar 2014 19:41:44 +0000 (23:41 +0400)]
cv::compare
mlyashko [Wed, 12 Mar 2014 07:30:28 +0000 (11:30 +0400)]
added data type check for back projection fix
Ilya Lavrenov [Tue, 11 Mar 2014 20:08:55 +0000 (00:08 +0400)]
3 channel support to cv::transpose
Ilya Lavrenov [Fri, 7 Mar 2014 21:29:27 +0000 (01:29 +0400)]
experiments
Roman Donchenko [Tue, 11 Mar 2014 13:41:18 +0000 (17:41 +0400)]
Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo
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
Alexander Alekhin [Thu, 27 Feb 2014 10:49:36 +0000 (14:49 +0400)]
ocl: copyMakeBorder 3-channel
Ziyang LI [Mon, 10 Mar 2014 09:33:13 +0000 (17:33 +0800)]
Moved x = 0 into the parenthesis
Easier to understand
Ian Taylor [Mon, 10 Mar 2014 07:02:06 +0000 (03:02 -0400)]
fix variable name typo in calcBlurriness
Ilya Lavrenov [Sat, 8 Mar 2014 08:20:52 +0000 (12:20 +0400)]
optimized cv::calcHist
Vadim Pisarevsky [Fri, 7 Mar 2014 14:55:45 +0000 (18:55 +0400)]
do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient
Roman Donchenko [Fri, 7 Mar 2014 14:19:00 +0000 (18:19 +0400)]
Merge pull request #2397 from vbystricky:intelperc
Vadim Pisarevsky [Fri, 7 Mar 2014 14:18:10 +0000 (18:18 +0400)]
make the correctness test pass
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
projects / platform / upstream / opencv.git / log