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 |
|
Anatoly Baksheev
|
02ebc4368c
|
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
|
2014-01-20 22:51:33 +04:00 |
|
Anatoly Baksheev
|
4e18007066
|
fixed white spaces
|
2014-01-19 18:39:01 +04:00 |
|
Anatoly Baksheev
|
d29c3d2f0d
|
fixed documentation warnings
|
2014-01-19 18:39:00 +04:00 |
|
Anatoly Baksheev
|
16281027af
|
resolved problem with multiple spin()/spinOnce()
|
2014-01-19 18:38:59 +04:00 |
|
Anatoly Baksheev
|
e2ef558c8a
|
refactored WGrid
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
658f4a7d38
|
refactoed plane
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
bb891f0570
|
added cone implementation
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
08f50314cb
|
updated cylinder and cube
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
c0cc551228
|
refactored circle
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
1449823bcd
|
implemented showImage
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
e21f2a81ff
|
factored camera postions with image
|
2014-01-19 18:38:54 +04:00 |
|
Anatoly Baksheev
|
e3ff28dacc
|
refactored WImage3D
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
8309d19f31
|
renamed Mesh3d -> Mesh
|
2014-01-19 18:38:52 +04:00 |
|
Anatoly Baksheev
|
e478d6b1e9
|
renamed cv::viz::get() to getWindowByName()
|
2014-01-19 18:38:52 +04:00 |
|
Anatoly Baksheev
|
a3b1f29d23
|
refactored spheres trajectory
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
4833976a0c
|
refactored frustum trajectory to use glyphs
|
2014-01-19 18:38:50 +04:00 |
|
Anatoly Baksheev
|
56819eaf19
|
switched completer API to doubles, updated docs
|
2014-01-19 18:38:48 +04:00 |
|
Anatoly Baksheev
|
e26b7e1e4f
|
ported some trajectories functionality to InputArray style
|
2014-01-19 18:38:47 +04:00 |
|
Anatoly Baksheev
|
b7cb3fe8e0
|
switched more to doubles
|
2014-01-19 18:38:47 +04:00 |
|
Anatoly Baksheev
|
70a81db567
|
fixed bugs in cloud collection and added test
|
2014-01-19 18:38:46 +04:00 |
|
Anatoly Baksheev
|
186853a50f
|
mass switch from Affine3f to Affine3d
|
2014-01-19 18:38:45 +04:00 |
|
Anatoly Baksheev
|
2705068290
|
refactored Keyboard and Mouse Events
|
2014-01-19 18:38:41 +04:00 |
|
Anatoly Baksheev
|
31d42ce18f
|
refactored Trajectory: split into Trajectory and TrajectoryFrustums)
|
2014-01-19 18:38:39 +04:00 |
|
Anatoly Baksheev
|
54fa69cab2
|
renamed Spheres Trajectory, minor changes in Trajectory
|
2014-01-19 18:38:39 +04:00 |
|
Anatoly Baksheev
|
a6ab9be5a6
|
removed VizAccessor from docs
|
2013-12-07 18:50:47 +04:00 |
|
Anatoly Baksheev
|
0895616576
|
switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale)
|
2013-12-07 18:50:43 +04:00 |
|
Ozan Tonkal
|
5780b418c9
|
delete duplicate bunny.ply, remove tabs and extra lines
|
2013-09-18 13:46:43 +01:00 |
|
Ozan Tonkal
|
8de46e1f81
|
removed trailing spaces
|
2013-09-18 12:50:55 +01:00 |
|
Ozan Tonkal
|
c31fb8ffff
|
rename widgets from *Widgets to W*
|
2013-09-15 16:26:53 +02:00 |
|
Ozan Tonkal
|
c773061457
|
updated documentation
|
2013-09-08 19:03:55 +02:00 |
|
Ozan Tonkal
|
31501ebf4f
|
replace tabs by spaces
|
2013-09-05 21:03:39 +02:00 |
|
Ozan Tonkal
|
a5b75769a3
|
initial documentation
|
2013-09-05 21:03:39 +02:00 |
|