Andrey Pavlenko [Mon, 7 Apr 2014 09:03:10 +0000 (13:03 +0400)]
Merge pull request #2563 from alalek:ipp_builds
Andrey Pavlenko [Mon, 7 Apr 2014 06:57:21 +0000 (10:57 +0400)]
Merge pull request #2499 from mlyashko:back_proj_fix1
Andrey Pavlenko [Fri, 4 Apr 2014 09:34:30 +0000 (13:34 +0400)]
Merge pull request #2562 from akarsakov:gftt_fix
Andrey Pavlenko [Thu, 3 Apr 2014 18:08:17 +0000 (22:08 +0400)]
Merge pull request #2567 from apavlenko:fix_compare_scalar
Andrey Pavlenko [Thu, 3 Apr 2014 13:07:06 +0000 (17:07 +0400)]
Merge pull request #2556 from DeanF:master
Andrey Pavlenko [Thu, 3 Apr 2014 12:21:04 +0000 (16:21 +0400)]
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
Alexander Alekhin [Wed, 2 Apr 2014 14:32:19 +0000 (18:32 +0400)]
enable IPP ICV support
Alexander Karsakov [Wed, 2 Apr 2014 13:10:10 +0000 (17:10 +0400)]
Fixed error in case corners not found
Andrey Pavlenko [Wed, 2 Apr 2014 09:01:08 +0000 (13:01 +0400)]
Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix
Roman Donchenko [Wed, 2 Apr 2014 08:00:00 +0000 (12:00 +0400)]
Merge pull request #2550 from SpecLad:merge-2.4
Ilya Lavrenov [Tue, 1 Apr 2014 19:18:07 +0000 (23:18 +0400)]
fixed condition in cv::FNLM
DeanF [Tue, 1 Apr 2014 19:04:58 +0000 (22:04 +0300)]
Fixed trailing whitespace
DeanF [Tue, 1 Apr 2014 18:20:13 +0000 (21:20 +0300)]
Fixed problem with compilation without HAVE_OPENCL
When compiling without OpenCL, some classes from its namespace are still used in code.
Andrey Pavlenko [Tue, 1 Apr 2014 08:54:06 +0000 (12:54 +0400)]
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
Andrey Pavlenko [Mon, 31 Mar 2014 17:21:59 +0000 (21:21 +0400)]
Merge pull request #2552 from ilya-lavrenov:tapi_compare
Ilya Lavrenov [Tue, 25 Mar 2014 16:06:26 +0000 (20:06 +0400)]
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
Andrey Pavlenko [Mon, 31 Mar 2014 15:36:43 +0000 (19:36 +0400)]
Merge pull request #2549 from ilya-lavrenov:tapi_laplacian
Andrey Pavlenko [Mon, 31 Mar 2014 14:17:49 +0000 (18:17 +0400)]
Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb
Ilya Lavrenov [Mon, 31 Mar 2014 13:20:36 +0000 (17:20 +0400)]
compare with scalar (cn > 1)
Ilya Lavrenov [Fri, 14 Mar 2014 08:59:14 +0000 (12:59 +0400)]
performance tests for FAST
mlyashko [Mon, 31 Mar 2014 10:57:03 +0000 (14:57 +0400)]
copyright fix
Roman Donchenko [Mon, 31 Mar 2014 10:42:00 +0000 (14:42 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
Ilya Lavrenov [Fri, 28 Mar 2014 13:41:19 +0000 (17:41 +0400)]
added support of ksize >= 5 to cv::Laplacian
mlyashko [Mon, 31 Mar 2014 06:58:15 +0000 (10:58 +0400)]
bug fix
Andrey Pavlenko [Fri, 28 Mar 2014 19:17:07 +0000 (23:17 +0400)]
Merge pull request #2543 from apavlenko:24_haar_revert
Roman Donchenko [Fri, 28 Mar 2014 15:37:03 +0000 (19:37 +0400)]
Merge pull request #2534 from asmorkalov:opencv_config_cut_cuda_abs_path
Alexander Smorkalov [Wed, 26 Mar 2014 19:26:21 +0000 (23:26 +0400)]
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
Andrey Pavlenko [Fri, 28 Mar 2014 12:08:11 +0000 (16:08 +0400)]
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
This reverts commit
3dcddad88aa13b729313939648c29f420a9f8054.
Conflicts:
modules/ocl/src/opencl/haarobjectdetect.cl
Andrey Pavlenko [Fri, 28 Mar 2014 12:06:39 +0000 (16:06 +0400)]
- fix test
Andrey Pavlenko [Fri, 28 Mar 2014 12:05:04 +0000 (16:05 +0400)]
Revert "Merge pull request #1779 from perping:integral_2.4"
This reverts commit
54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa, reversing
changes made to
28e0d3d771d9db9d03ea55f8d0504558e17139b2.
Roman Donchenko [Fri, 28 Mar 2014 08:45:39 +0000 (12:45 +0400)]
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
Roman Donchenko [Fri, 28 Mar 2014 08:17:16 +0000 (12:17 +0400)]
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
Roman Donchenko [Fri, 28 Mar 2014 08:13:13 +0000 (12:13 +0400)]
Merge pull request #2403 from hbristow:issue-3451
Roman Donchenko [Fri, 28 Mar 2014 08:08:55 +0000 (12:08 +0400)]
Merge pull request #2379 from ngryman:optimize_jpeg
Roman Donchenko [Fri, 28 Mar 2014 08:08:23 +0000 (12:08 +0400)]
Merge pull request #2533 from kenaniah:master
Roman Donchenko [Fri, 28 Mar 2014 07:58:23 +0000 (11:58 +0400)]
Merge pull request #2539 from mjul:fixtypos
Roman Donchenko [Fri, 28 Mar 2014 07:58:11 +0000 (11:58 +0400)]
Merge pull request #2540 from mjul:fixtypos_2.4
Koji Miyazato [Fri, 28 Mar 2014 01:45:33 +0000 (10:45 +0900)]
corrected some style errors found by review.
Alexander Smorkalov [Fri, 28 Mar 2014 00:56:31 +0000 (04:56 +0400)]
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
Nicolas Gryman [Wed, 19 Feb 2014 04:45:48 +0000 (23:45 -0500)]
added jpeg with optimized coding support.
Roman Donchenko [Thu, 27 Mar 2014 13:43:02 +0000 (17:43 +0400)]
Merge pull request #2537 from ilya-lavrenov:doc_fix
mlyashko [Thu, 27 Mar 2014 13:08:05 +0000 (17:08 +0400)]
both tests by picture and rand mat
Martin Jul [Thu, 27 Mar 2014 12:52:49 +0000 (13:52 +0100)]
Fixed typo in BFMatcher in docs.
Ilya Lavrenov [Thu, 27 Mar 2014 12:30:29 +0000 (16:30 +0400)]
doc fix
Martin Jul [Thu, 27 Mar 2014 12:20:48 +0000 (13:20 +0100)]
Merge branch '2.4' into fixtypos
Andrey Pavlenko [Thu, 27 Mar 2014 11:22:45 +0000 (15:22 +0400)]
Merge pull request #2535 from akarsakov:stereobm_fix
Alexander Karsakov [Thu, 27 Mar 2014 07:18:30 +0000 (11:18 +0400)]
Fixed incorrect calculation of best_disp
Andrey Pavlenko [Thu, 27 Mar 2014 07:05:21 +0000 (11:05 +0400)]
Merge pull request #2286 from alalek:umat_unmap_issue
Kenaniah Cerny [Thu, 27 Mar 2014 06:15:42 +0000 (23:15 -0700)]
Fixed type gPython -> Python
Kenaniah Cerny [Thu, 27 Mar 2014 06:12:43 +0000 (23:12 -0700)]
Added link to main GitHub repo
Kenaniah Cerny [Thu, 27 Mar 2014 06:11:03 +0000 (23:11 -0700)]
Grammar
Hilton Bristow [Thu, 27 Mar 2014 04:58:53 +0000 (14:58 +1000)]
removed experimental slots
Hilton Bristow [Thu, 27 Mar 2014 04:52:23 +0000 (14:52 +1000)]
Improved standalone importing behaviour and creation of nested directories
Hilton Bristow [Thu, 27 Mar 2014 04:51:17 +0000 (14:51 +1000)]
Generalized todict implementation
Hilton Bristow [Thu, 27 Mar 2014 01:34:20 +0000 (11:34 +1000)]
More generic todict
Martin Jul [Wed, 26 Mar 2014 22:29:48 +0000 (23:29 +0100)]
Fixed typos in "matching"
Alexander Alekhin [Tue, 25 Mar 2014 11:51:54 +0000 (15:51 +0400)]
disable failed tests
Alexander Alekhin [Wed, 5 Feb 2014 11:26:11 +0000 (15:26 +0400)]
UMat: issue in OpenCLAllocator::unmap()
Andrey Pavlenko [Wed, 26 Mar 2014 15:08:15 +0000 (19:08 +0400)]
Merge pull request #2505 from alalek:umat_unmap_synchronization_test
Andrey Pavlenko [Wed, 26 Mar 2014 15:04:57 +0000 (19:04 +0400)]
Merge pull request #2529 from ilya-lavrenov:tapi_filter2D
Andrey Pavlenko [Wed, 26 Mar 2014 15:04:39 +0000 (19:04 +0400)]
Merge pull request #2528 from mlyashko:back_proj_fix
Andrey Pavlenko [Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)]
Merge pull request #2527 from apavlenko:ocl_surf_24
Andrey Pavlenko [Tue, 25 Mar 2014 12:19:45 +0000 (16:19 +0400)]
splitting plain and OCL tests for SURF.
Ilya Lavrenov [Mon, 24 Mar 2014 19:07:00 +0000 (23:07 +0400)]
improved cv::filter2D
Roman Donchenko [Wed, 26 Mar 2014 08:19:53 +0000 (12:19 +0400)]
Merge pull request #2478 from clemenscorny:master
Roman Donchenko [Wed, 26 Mar 2014 08:18:39 +0000 (12:18 +0400)]
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
Roman Donchenko [Wed, 26 Mar 2014 08:12:01 +0000 (12:12 +0400)]
Merge pull request #2378 from ngryman:progressive_jpeg
Alexander Karsakov [Wed, 26 Mar 2014 07:53:36 +0000 (11:53 +0400)]
Fixed stereoBM for Intel CPU.
Nicolas Gryman [Wed, 19 Feb 2014 04:36:26 +0000 (23:36 -0500)]
added jpeg progressive support.
mlyashko [Tue, 25 Mar 2014 12:43:20 +0000 (16:43 +0400)]
changed type of sanity check
Andrey Pavlenko [Tue, 25 Mar 2014 12:23:01 +0000 (16:23 +0400)]
Merge pull request #2523 from ilya-lavrenov:tapi_filters
Alexander Alekhin [Thu, 20 Mar 2014 15:53:38 +0000 (19:53 +0400)]
UMat map-unmap synchronization test
Clemens Korner [Thu, 13 Mar 2014 14:00:18 +0000 (15:00 +0100)]
FEATURES2D: add DenseFeatureDetector Python wrapper
mlyashko [Tue, 25 Mar 2014 10:52:39 +0000 (14:52 +0400)]
Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
mlyashko [Tue, 25 Mar 2014 10:50:37 +0000 (14:50 +0400)]
added perf test for CalcBackProj
Roman Donchenko [Tue, 25 Mar 2014 10:37:55 +0000 (14:37 +0400)]
Merge pull request #2123 from white-pony:vkysenko/fix-mertens
Andrey Pavlenko [Tue, 25 Mar 2014 10:09:49 +0000 (14:09 +0400)]
disabling calls to SURF_OCL causing tests failures
Andrey Pavlenko [Tue, 25 Mar 2014 09:16:42 +0000 (13:16 +0400)]
fixing conditional compilation
Andrey Pavlenko [Tue, 25 Mar 2014 09:15:56 +0000 (13:15 +0400)]
fixing check_docs2.py issue
Andrey Pavlenko [Tue, 25 Mar 2014 08:59:10 +0000 (12:59 +0400)]
Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix
Roman Donchenko [Tue, 25 Mar 2014 08:14:44 +0000 (12:14 +0400)]
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
Roman Donchenko [Tue, 25 Mar 2014 08:13:03 +0000 (12:13 +0400)]
Merge pull request #2524 from SpecLad:merge-2.4
Konstantin Matskevich [Tue, 25 Mar 2014 06:39:50 +0000 (10:39 +0400)]
ocl morphology fix
Andrey Pavlenko [Mon, 24 Mar 2014 18:43:34 +0000 (22:43 +0400)]
Merge pull request #2525 from ilya-lavrenov:tapi_sep
Andrey Pavlenko [Mon, 24 Mar 2014 15:31:25 +0000 (19:31 +0400)]
Merge pull request #2522 from ilya-lavrenov:tapi_canny
Roman Donchenko [Mon, 24 Mar 2014 11:47:56 +0000 (15:47 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
Roman Donchenko [Mon, 24 Mar 2014 14:54:00 +0000 (18:54 +0400)]
Merge pull request #2521 from atrebbi:#3620
Roman Donchenko [Mon, 24 Mar 2014 14:52:49 +0000 (18:52 +0400)]
Merge pull request #2516 from Daniil-Osokin:fix_docs
Andrey Pavlenko [Mon, 24 Mar 2014 14:46:00 +0000 (18:46 +0400)]
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
Daniil Osokin [Mon, 24 Mar 2014 09:02:22 +0000 (13:02 +0400)]
Removed obsolete list from docs
Ilya Lavrenov [Mon, 24 Mar 2014 13:38:34 +0000 (17:38 +0400)]
eliminated restriction delta == 0 from cv::sepFilter2D
Konstantin Matskevich [Mon, 24 Mar 2014 11:20:00 +0000 (15:20 +0400)]
case-insensitivity
Ilya Lavrenov [Fri, 21 Mar 2014 11:59:54 +0000 (15:59 +0400)]
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
Ilya Lavrenov [Tue, 18 Mar 2014 21:26:38 +0000 (01:26 +0400)]
added 3-channels support to cv::medianBlur
Ilya Lavrenov [Tue, 18 Mar 2014 21:02:46 +0000 (01:02 +0400)]
added 3-channels support to cv::filter2D, cv::Laplacian
Ilya Lavrenov [Tue, 18 Mar 2014 20:33:01 +0000 (00:33 +0400)]
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
Ilya Lavrenov [Tue, 18 Mar 2014 19:56:06 +0000 (23:56 +0400)]
added 3 channels support to cv::bilateralFilter
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
Roman Donchenko [Mon, 24 Mar 2014 10:05:17 +0000 (14:05 +0400)]
Merge pull request #2520 from vlkolesnikov:misprint_fix
Ilya Lavrenov [Wed, 19 Mar 2014 15:56:40 +0000 (19:56 +0400)]
added 3-channels support to cv::Canny
Daniil Osokin [Fri, 21 Mar 2014 16:32:14 +0000 (20:32 +0400)]
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
projects / profile / ivi / opencv.git / log