Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
1629d50999
removed some more trailing whitespaces
2014-08-12 14:33:18 +04:00
Vadim Pisarevsky
bca4eb5e00
fixed more doc builder warnings
2014-08-12 10:40:23 +04:00
Vadim Pisarevsky
d119afafdb
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:30:06 +04:00
Vadim Pisarevsky
fe7b48aa8f
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:29:56 +04:00
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
berak
3500c940d4
add Bag of Words to python wrapper
2014-06-11 11:50:22 +02:00
Ilya Lavrenov
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
berak
fc610979bb
export BOW to script wrappers
2014-06-07 16:34:53 +02:00
Alexander Alekhin
776728ef2a
KAZE: disable tests (too many crashes)
2014-05-29 23:12:48 +04:00
Vadim Pisarevsky
8bd1efa523
Merge pull request #2673 from BloodAxe:kaze
2014-05-19 17:35:22 +04:00
Ievgen Khvedchenia
12e1d7fc2b
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 21:07:30 +03:00
Ievgen Khvedchenia
87972d0d7c
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 13:15:24 +03:00
Ievgen Khvedchenia
03db61b33b
FixFix documentation warnings
2014-05-10 23:06:23 +03:00
Ievgen Khvedchenia
029a8c443a
Remove GSURF descriptor from KAZE algorithm
2014-05-10 20:57:37 +03:00
Ievgen Khvedchenia
a068ccbf51
Fix "Title underline too short" warning
2014-05-09 22:53:28 +03:00
Ievgen Khvedchenia
616c348536
Fix documentation warnings
2014-05-09 22:31:20 +03:00
Ievgen Khvedchenia
3a8e15fad9
Fix documentation warnings
2014-05-09 22:21:26 +03:00
Ievgen Khvedchenia
c4e49463a9
Initial commit of the KAZE & AKAZE docs
2014-05-09 19:35:41 +03:00
Ievgen Khvedchenia
b42c268164
Temporary remove of CV_WRAP
2014-05-09 19:34:54 +03:00
Ievgen Khvedchenia
1a5fcd715d
Refactor of KAZE and AKAZE:
...
1) Clean-up from the unused code
2) Remove of SURF extraction method
3) Enabled threading for KAZE extraction
4) Exposed new properties for runtime configuration
2014-05-09 18:46:00 +03:00
Ievgen Khvedchenia
220de14077
Clean-up from the dead code
2014-05-05 21:48:54 +03:00
Ievgen Khvedchenia
e7e00201f1
Enabled parallel processing of the nld_step_scalar function
2014-05-02 14:07:30 +03:00
Ievgen Khvedchenia
9fc90f4069
Merged nldiffusion functions into one module with removal of duplicate functions
2014-05-01 22:24:15 +03:00
Ievgen Khvedchenia
2df7242646
Prepare to merge KAZE and AKAZE nldiffusion_functions source files (work in progress).
2014-05-01 18:27:24 +03:00
Ievgen Khvedchenia
30f73623ce
Replace runtime checks with assertions
2014-05-01 18:24:13 +03:00
Ievgen Khvedchenia
3e51da38fb
Removed Feature_Suppression_Distance function that is not used anywhere.
2014-05-01 10:58:34 +03:00
Ievgen Khvedchenia
ab1ef08f0e
Rename file config.h to KAZEConfig.h
2014-04-29 22:17:18 +03:00
Ievgen Khvedchenia
4509fe55c2
Clean-up of getters/setters that are not needed by OpenCV
2014-04-29 21:39:27 +03:00
Ievgen Khvedchenia
2daa14e3c7
Clean-up from dead code.
2014-04-29 21:07:53 +03:00
Ievgen Khvedchenia
a134e068ef
Fix wrong checking of returned descriptor type
2014-04-28 22:25:27 +03:00
Ievgen Khvedchenia
c1bf453266
Wrapped nldiffusion functions with details::kaze or details::amaze namespace to avoid collision of function names
2014-04-28 20:41:44 +03:00
Ievgen Khvedchenia
c68cbfced3
Fix size_t to int conversion
2014-04-28 19:32:29 +03:00
Ievgen Khvedchenia
0e3bbd7026
Fix "conditional expression constant" warning
2014-04-28 19:32:04 +03:00
Ievgen Khvedchenia
a941d25f6d
Fix size_t to int conversion
2014-04-28 16:46:09 +03:00
Ievgen Khvedchenia
5662294319
Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it)
2014-04-28 16:34:35 +03:00
Ievgen Khvedchenia
599bcfb591
Fix size_t to int conversion
2014-04-28 16:24:35 +03:00
Ievgen Khvedchenia
cc0a94c536
Fix "conditional expression constant" warning
2014-04-28 16:23:58 +03:00
Ievgen Khvedchenia
2162aab0e9
Remove AKAZEFeatures desctructor
2014-04-28 15:17:09 +03:00
Ievgen Khvedchenia
f9d3c49023
Bugfix: wrong variable name
2014-04-28 15:14:03 +03:00
Ievgen Khvedchenia
f9422f60a6
Fix Fix casting from/to int/float that caused lot of compiler warnings.
2014-04-28 15:13:42 +03:00
