Ievgen Khvedchenia [Thu, 1 May 2014 19:24:15 +0000 (22:24 +0300)]
Merged nldiffusion functions into one module with removal of duplicate functions
Ievgen Khvedchenia [Thu, 1 May 2014 15:27:24 +0000 (18:27 +0300)]
Prepare to merge KAZE and AKAZE nldiffusion_functions source files (work in progress).
Ievgen Khvedchenia [Thu, 1 May 2014 15:24:13 +0000 (18:24 +0300)]
Replace runtime checks with assertions
Ievgen Khvedchenia [Thu, 1 May 2014 07:58:34 +0000 (10:58 +0300)]
Removed Feature_Suppression_Distance function that is not used anywhere.
Ievgen Khvedchenia [Tue, 29 Apr 2014 19:17:18 +0000 (22:17 +0300)]
Rename file config.h to KAZEConfig.h
Ievgen Khvedchenia [Tue, 29 Apr 2014 18:39:27 +0000 (21:39 +0300)]
Clean-up of getters/setters that are not needed by OpenCV
Ievgen Khvedchenia [Tue, 29 Apr 2014 18:07:53 +0000 (21:07 +0300)]
Clean-up from dead code.
Ievgen Khvedchenia [Mon, 28 Apr 2014 19:25:27 +0000 (22:25 +0300)]
Fix wrong checking of returned descriptor type
Ievgen Khvedchenia [Mon, 28 Apr 2014 17:41:44 +0000 (20:41 +0300)]
Wrapped nldiffusion functions with details::kaze or details::amaze namespace to avoid collision of function names
Ievgen Khvedchenia [Mon, 28 Apr 2014 16:32:29 +0000 (19:32 +0300)]
Fix size_t to int conversion
Ievgen Khvedchenia [Mon, 28 Apr 2014 16:32:04 +0000 (19:32 +0300)]
Fix "conditional expression constant" warning
Ievgen Khvedchenia [Mon, 28 Apr 2014 13:46:09 +0000 (16:46 +0300)]
Fix size_t to int conversion
Ievgen Khvedchenia [Mon, 28 Apr 2014 13:34:35 +0000 (16:34 +0300)]
Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it)
Ievgen Khvedchenia [Mon, 28 Apr 2014 13:24:35 +0000 (16:24 +0300)]
Fix size_t to int conversion
Ievgen Khvedchenia [Mon, 28 Apr 2014 13:23:58 +0000 (16:23 +0300)]
Fix "conditional expression constant" warning
Ievgen Khvedchenia [Mon, 28 Apr 2014 12:17:09 +0000 (15:17 +0300)]
Remove AKAZEFeatures desctructor
Ievgen Khvedchenia [Mon, 28 Apr 2014 12:14:03 +0000 (15:14 +0300)]
Bugfix: wrong variable name
Ievgen Khvedchenia [Mon, 28 Apr 2014 12:13:42 +0000 (15:13 +0300)]
Fix Fix casting from/to int/float that caused lot of compiler warnings.
Ievgen Khvedchenia [Mon, 28 Apr 2014 12:01:42 +0000 (15:01 +0300)]
Added copyright headers for KAZE and AKAZE wrappers
Ievgen Khvedchenia [Mon, 28 Apr 2014 12:00:14 +0000 (15:00 +0300)]
Fix casting from/to int/float that caused lot of compiler warnings.
Ievgen Khvedchenia [Mon, 28 Apr 2014 07:53:09 +0000 (10:53 +0300)]
Fix line ending at EOF
Ievgen Khvedchenia [Mon, 28 Apr 2014 07:52:05 +0000 (10:52 +0300)]
Fix initialisation order of parallel loop classes for AKAZE descriptor extraction
Ievgen Khvedchenia [Mon, 28 Apr 2014 07:51:09 +0000 (10:51 +0300)]
Fix parenthesis in assert statements
Ievgen Khvedchenia [Mon, 28 Apr 2014 07:50:46 +0000 (10:50 +0300)]
Fix shadowed variable warnings
Ievgen Khvedchenia [Sun, 27 Apr 2014 20:07:48 +0000 (23:07 +0300)]
Fix mutable compilation error
Ievgen Khvedchenia [Sun, 27 Apr 2014 20:04:31 +0000 (23:04 +0300)]
Fix shadowed i variable warning
Ievgen Khvedchenia [Sun, 27 Apr 2014 19:28:18 +0000 (22:28 +0300)]
Enable multithreaded extraction of features using cv::parallel_for_
Ievgen Khvedchenia [Sat, 26 Apr 2014 20:34:38 +0000 (23:34 +0300)]
Clean-up of the iostream manipulator in AKAZEConfig.
Ievgen Khvedchenia [Sat, 26 Apr 2014 20:34:07 +0000 (23:34 +0300)]
Fix return value of descriptorType()
Ievgen Khvedchenia [Thu, 24 Apr 2014 21:01:45 +0000 (22:01 +0100)]
Replace swap with clear (more efficient)
Ievgen Khvedchenia [Thu, 24 Apr 2014 21:01:29 +0000 (22:01 +0100)]
Bugfix: clear input vector of key points for detection stage
Ievgen Khvedchenia [Thu, 24 Apr 2014 21:00:51 +0000 (22:00 +0100)]
Added missing operator()
Ievgen Khvedchenia [Thu, 24 Apr 2014 21:00:37 +0000 (22:00 +0100)]
Added missing operator()
Ievgen Khvedchenia [Wed, 23 Apr 2014 22:02:02 +0000 (23:02 +0100)]
Merge KAZE and AKAZE features with most recent version
Ievgen Khvedchenia [Wed, 23 Apr 2014 21:44:03 +0000 (22:44 +0100)]
Replace config with AKAZEConfig.h
Ievgen Khvedchenia [Sat, 5 Apr 2014 12:25:59 +0000 (15:25 +0300)]
Clean-up from unused utils.h/utils/cpp
Ievgen Khvedchenia [Sat, 5 Apr 2014 07:25:59 +0000 (10:25 +0300)]
Added unit-tests for KAZE and AKAZE features
Ievgen Khvedchenia [Sat, 5 Apr 2014 07:25:46 +0000 (10:25 +0300)]
Added KAZE and AKAZE wrappers
Ievgen Khvedchenia [Sat, 5 Apr 2014 07:24:27 +0000 (10:24 +0300)]
Prepare KAZE and AKAZE sources for integration
Ievgen Khvedchenia [Fri, 4 Apr 2014 11:25:38 +0000 (14:25 +0300)]
KAZE and AKAZE integration initial commit
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 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
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
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
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