edgarriba
|
3a2cf37115
|
fixed conflicts
|
2014-08-07 12:41:47 +02:00 |
|
Alexander Alekhin
|
55188fe991
|
world fix
|
2014-08-05 20:12:35 +04: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 |
|
Roman Donchenko
|
74e58ddbb1
|
Disable the broken fisheye undistortImage test
|
2014-08-01 19:50:17 +04:00 |
|
Roman Donchenko
|
983e75e5de
|
Merge remote-tracking branch 'origin/master' into merge-2.4
|
2014-08-01 15:01:41 +04:00 |
|
Samson Yilma
|
4fe04775d1
|
Merge remote-tracking branch 'upstream/master' into HomographyDecomp
|
2014-07-30 20:36:41 -04:00 |
|
edgarriba
|
4ddc6a4a77
|
Update for DLS test
|
2014-07-28 12:03:02 +02:00 |
|
edgarriba
|
a4e21c8fa8
|
Update DLS test
|
2014-07-25 11:29:34 +02:00 |
|
edgarriba
|
9abcd88435
|
Upate test ransac
|
2014-07-09 17:39:32 +02: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 |
|
Ilya Lavrenov
|
43e4946cca
|
fix for fisheye
|
2014-07-02 11:53:53 +04:00 |
|
Ilya Krylov
|
84bb77e914
|
Fixed android and windows x64 build issues
|
2014-06-23 17:06:40 +04:00 |
|
Ilya Krylov
|
3678020c28
|
Added license to source files
|
2014-05-20 12:37:37 +04:00 |
|
Ilya Krylov
|
651b13f72a
|
Refactored class Fisheye to namespace fisheye
|
2014-05-19 17:55:32 +04:00 |
|
Ilya Krylov
|
c30fef1f9d
|
Fixed build issues
|
2014-05-14 18:58:39 +04:00 |
|
Ilya Krylov
|
349ff631a5
|
Added sample of work of Fisheye::undistortImage and its description to documentation. Removed readPoints and readExtrinsic (useless)
|
2014-05-07 20:53:07 +04:00 |
|
Ilya Krylov
|
50b291995a
|
Added tests for stereoCalibrate
|
2014-05-05 17:23:03 +04:00 |
|
Ilya Krylov
|
e6aa8ce932
|
Corrected notes
|
2014-04-29 10:24:39 +04:00 |
|
Ilya Krylov
|
05ee15f108
|
Added FisheyeTest
|
2014-04-28 12:01:27 +04:00 |
|
Samson Yilma
|
de55126b69
|
Fixed warnings and parameter name mismatches, added #include needed in some platforms.
|
2014-04-27 13:02:36 -04:00 |
|
Samson Yilma
|
e6420bde73
|
Added function decomposeHomographyMat. New files added are homography_decomp.cpp and test_homography_decomp.cpp.
Modified files calib3d.hpp and camera_calibration_and_3d_reconstruction.rst.
|
2014-04-26 20:13:27 -04:00 |
|
Ilya Krylov
|
35e1b322cb
|
Added test for jacobians
|
2014-04-25 18:36:48 +04:00 |
|
Ilya Krylov
|
9c7e0bfd33
|
Added fisheye camera model
|
2014-04-25 14:49:36 +04:00 |
|
Roman Donchenko
|
799d2dabd6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
|
2014-04-14 16:08:02 +04:00 |
|
Maks Naumov
|
b033a63e63
|
fix typo in test_cameracalibration
|
2014-04-09 14:41:16 +03:00 |
|
Ilya Lavrenov
|
aa5326c231
|
cv::norm -> cvtest::norm in tests
Conflicts:
modules/core/src/stat.cpp
|
2014-04-08 14:49:20 +04:00 |
|
Konstantin Matskevich
|
1a43ed9893
|
finalizing
|
2014-03-17 10:42:19 +04:00 |
|
Konstantin Matskevich
|
af1084eb58
|
speedUp
|
2014-03-14 18:00:13 +04:00 |
|
Konstantin Matskevich
|
91e4334227
|
temp
|
2014-03-14 18:00:12 +04:00 |
|
Konstantin Matskevich
|
18a59b48ba
|
fixes
|
2014-03-14 18:00:12 +04:00 |
|
Konstantin Matskevich
|
ddc235172e
|
new approach
|
2014-03-14 18:00:11 +04:00 |
|
Konstantin Matskevich
|
a5d989f346
|
new attempt
|
2014-03-14 18:00:11 +04:00 |
|
Konstantin Matskevich
|
799d7e7a50
|
bad experiment =(
|
2014-03-14 18:00:10 +04:00 |
|
Konstantin Matskevich
|
0904f10ab5
|
optimizations
|
2014-03-14 18:00:10 +04:00 |
|
Konstantin Matskevich
|
bfc843a5f5
|
added optimization
|
2014-03-14 18:00:09 +04:00 |
|
Konstantin Matskevich
|
b5f717b6b3
|
stereoBM
|
2014-03-14 18:00:09 +04:00 |
|
Roman Donchenko
|
95a55453df
|
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
|
2014-03-11 17:20:01 +04:00 |
|
Ilya Lavrenov
|
099ea91823
|
typos
|
2014-03-04 12:47:40 +04:00 |
|
Roman Donchenko
|
db85c35e69
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
|
2014-03-03 13:45:22 +04:00 |
|
Ilya Lavrenov
|
eedf86402d
|
typos
|
2014-03-02 21:04:17 +04:00 |
|
Ilya Lavrenov
|
ce0557ebb8
|
fixed defects from Xcode
|
2014-02-25 17:33:12 +04:00 |
|
Ilya Lavrenov
|
32eb38ec98
|
fixed defects from coverity.com
|
2014-02-23 20:21:08 +04:00 |
|
Roman Donchenko
|
721d0145e0
|
Merge pull request #2002 from abak:stereo_calibrate
|
2014-02-05 17:47:27 +04:00 |
|
Andrey Pavlenko
|
494f7e3657
|
Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d
|
2014-01-20 23:35:06 +04:00 |
|
Ilya Lavrenov
|
37789f015a
|
deleted excess semicolons, commas
|
2014-01-18 01:31:33 +04:00 |
|
Roman Donchenko
|
79fcc06a4b
|
Merge pull request #2146 from SpecLad:merge-2.4
|
2014-01-17 16:28:30 +04:00 |
|
Konstantin Matskevich
|
e9e9e00d45
|
replaced sprintf with cv::format
|
2014-01-17 13:01:12 +04:00 |
|
Roman Donchenko
|
63c61b4b98
|
Revert "replaced sprintf with cv::format"
Fixing build breakage.
This reverts commit b83eff7ecf0a3a8a9d706168150d569c94f0b71e.
|
2014-01-16 17:58:26 +04:00 |
|
Konstantin Matskevich
|
b83eff7ecf
|
replaced sprintf with cv::format
|
2014-01-16 16:18:02 +04:00 |
|