Ilya Lavrenov
|
aa5326c231
|
cv::norm -> cvtest::norm in tests
Conflicts:
modules/core/src/stat.cpp
|
2014-04-08 14:49:20 +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
|
c7d2fdc4b2
|
Fixed some dubious uses of tbb::task_scheduler_init.
|
2013-09-05 19:03:00 +04:00 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Andrey Pavlenko
|
9aa29373b4
|
this test is unstable (fails from time to time), let's disable it until fixed
|
2013-04-02 11:39:26 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
d40083a926
|
Add concurrency test for solvePnPRansac
|
2012-10-10 18:23:11 +04:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Alexander Shishkov
|
c11551a510
|
added P3P method
added test for solvePnP
changed test for solvePnPRansac
fixed bug with mutex solvePnPRansac
|
2011-12-26 12:59:07 +00:00 |
|
Alexander Shishkov
|
8a79d414c0
|
fixed bug in solvePnPRansac test (thanks to Pieter-Jan Busschaert)
test was refactored
|
2011-04-29 15:00:37 +00:00 |
|
Vadim Pisarevsky
|
abeeb40d46
|
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
|
2011-04-17 13:14:45 +00:00 |
|
Alexander Shishkov
|
04461a53f1
|
added solvePnPRansac method
|
2011-03-05 00:18:49 +00:00 |
|