edgarriba
4a214c08e5
removed old code
2014-08-12 17:07:38 +02:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
edgarriba
afdb67b462
SOLVEPNP_* flags
2014-08-11 16:28:09 +02: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
07744af790
Merge pull request #3066 from vpisarev:minor_fixes
2014-08-11 10:27:30 +00:00
edgarriba
b7a19a9a5f
Removed Timer
2014-08-11 11:06:05 +02:00
edgarriba
c7f6c0cb9f
Fixed warnings + RANSAC confidence to double
2014-08-11 10:17:42 +02:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
edgarriba
bc250c2e3f
bug fixed
2014-08-09 19:15:46 +02:00
edgarriba
80b4f99b1e
bug fixed
2014-08-09 18:16:44 +02:00
edgarriba
d09b404178
tutorial update
2014-08-09 17:32:52 +02:00
edgarriba
7ecad71ab0
fixed warnings
2014-08-09 17:18:47 +02:00
edgarriba
8c4b8cc0b4
fixed warnings
2014-08-09 17:14:24 +02:00
Vadim Pisarevsky
68305703bd
modified farneback sample to use T-API
2014-08-08 22:45:07 +04:00
edgarriba
3f5d3b2d40
video opening path modified
2014-08-08 15:36:27 +02:00
edgarriba
7d8a16ae39
remove unused tutorials
2014-08-08 14:45:43 +02:00
edgarriba
8b732e086d
updated ransanc model
2014-08-08 13:52:15 +02:00
edgarriba
c07cd007eb
Multi class tutorial compilation
2014-08-08 11:46:26 +02:00
edgarriba
8c08258cf2
moved headers
2014-08-07 13:06:24 +02:00
edgarriba
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
edgarriba
837f001789
update cmake
2014-08-07 11:55:17 +02:00
edgarriba
381574bdb7
Modified cmake
2014-08-07 11:33:32 +02:00
edgarriba
f1b6809eee
Updated Utils functions
2014-08-06 10:05:26 +02:00
edgarriba
2881f2a096
Fixed warnings
2014-08-06 09:21:38 +02:00
edgarriba
d2665b655e
Fixed warnings
2014-08-06 08:41:14 +02:00
edgarriba
e14f91dd37
Update headers
2014-08-06 08:18:11 +02:00
edgarriba
ddf5c86f3a
Added code
2014-08-06 08:12:55 +02:00
edgarriba
57d2cb8962
deleted: src/CsvReader.cpp
...
deleted: src/CsvReader.h
deleted: src/CsvWriter.cpp
deleted: src/CsvWriter.h
deleted: src/Mesh.cpp
deleted: src/Mesh.h
deleted: src/Model.cpp
deleted: src/Model.h
deleted: src/ModelRegistration.cpp
deleted: src/ModelRegistration.h
deleted: src/PnPProblem.cpp
deleted: src/PnPProblem.h
deleted: src/RobustMatcher.cpp
deleted: src/RobustMatcher.h
deleted: src/Utils.cpp
deleted: src/Utils.h
deleted: src/main_detection.cpp
deleted: src/main_registration.cpp
deleted: src/main_verification.cpp
deleted: src/test_pnp.cpp
2014-08-06 08:11:03 +02:00
edgarriba
43301096d3
Update tutorial
2014-08-05 20:06:47 +02:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1
Removed whitespaces
2014-08-05 17:02:06 +02:00
edgarriba
55819ae464
Tutorial code restructure
2014-08-05 15:48:54 +02:00
edgarriba
23785faf02
Update for NON BOOST libraries
2014-08-05 14:47:06 +02:00
edgarriba
16e750dd37
Update for Boost libraries
2014-08-05 14:02:23 +02:00
edgarriba
1727e0acf6
Update for Boost libraries
2014-08-05 14:00:23 +02:00
edgarriba
dfa3ccdea9
Update for Boost libraries
2014-08-05 13:43:01 +02:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Vadim Pisarevsky
cb9b88e65b
fixed more compile warnings on Windows
2014-08-04 14:22:31 +04:00
Vadim Pisarevsky
c20ff6ce19
made everything compile and even run somehow
2014-08-03 01:41:09 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
05164bf713
Merge pull request #2608 from Siddharthk:master
2014-08-01 09:13:32 +00:00
Vadim Pisarevsky
10b60f8d16
continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way
2014-07-31 14:12:10 +04:00
Vadim Pisarevsky
223cdcd0ee
fixed compilation of some samples; fixed ANN_MLP::predict
2014-07-30 22:53:46 +04:00
Vadim Pisarevsky
2ab7fb6051
Merge pull request #3017 from f-morozov:akaze
2014-07-30 15:03:47 +00:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
edgarriba
85ccac2633
Added help()
2014-07-30 15:23:52 +02:00
edgarriba
4a86900761
Added help()
2014-07-30 13:32:27 +02:00
