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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						3f95818252
					 | 
					
						
						
							
							Added cloud shading support - additional normals array is used
						
						
						
						
						
						
					 | 
					
						2014-04-08 20:31:28 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						40a740ff88
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4
						
						
						
						
						
						
						
						Conflicts:
	modules/imgproc/src/opencl/precornerdetect.cl
	modules/nonfree/perf/perf_main.cpp
	modules/nonfree/perf/perf_surf.ocl.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/opencl/arithm_bitwise.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_minMax.cl
	modules/ocl/src/opencl/arithm_nonzero.cl
	modules/ocl/src/opencl/arithm_sum.cl
	modules/ocl/test/test_arithm.cpp
	modules/viz/src/precomp.hpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkXYZReader.cpp
	modules/viz/src/vtk/vtkXYZReader.h
	modules/viz/test/test_precomp.hpp 
						
						
					 | 
					
						2014-03-17 14:14:07 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						fde0185a77
					 | 
					
						
						
							
							iteractor work
						
						
						
						
						
						
					 | 
					
						2014-03-06 03:26:21 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						56754e907d
					 | 
					
						
						
							
							fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
						
						
						
						
						
						
					 | 
					
						2014-02-15 20:08:04 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						1a5dfe421d
					 | 
					
						
						
							
							Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
						
						
						
						
						
						
					 | 
					
						2014-02-15 17:02:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						261546f6f6
					 | 
					
						
						
							
							casting Vec3b operator for viz::Color
						
						
						
						
						
						
					 | 
					
						2014-02-11 23:27:19 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						f1c062c30a
					 | 
					
						
						
							
							cloud collection finalize
						
						
						
						
						
						
					 | 
					
						2014-02-10 15:45:46 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						1f5007f106
					 | 
					
						
						
							
							modified viz module header layout for 2.4 compatibility
						
						
						
						
						
						
					 | 
					
						2014-02-02 16:23:34 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						3dc2dbc17e
					 | 
					
						
						
							
							VTK off by default
						
						
						
						
						
						
					 | 
					
						2014-01-26 14:48:29 +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
							
						 
					 | 
					
						
						
							
						
						4cc8f7012b
					 | 
					
						
						
							
							closing window
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:39:01 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						d7ca0bb757
					 | 
					
						
						
							
							merged background color with background gradient methods, updated tests to show description of scene
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						16281027af
					 | 
					
						
						
							
							resolved problem with multiple spin()/spinOnce()
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						ffad7b699c
					 | 
					
						
						
							
							added test for textured mesh
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						e472d45d99
					 | 
					
						
						
							
							updated mesh reading (texture support)
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:58 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						625c35a9f9
					 | 
					
						
						
							
							added support of texture for mesh
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:58 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						74206e0159
					 | 
					
						
						
							
							added painted cloud widget
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:57 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						3086095837
					 | 
					
						
						
							
							improved background gradient
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:57 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						d7c30281a5
					 | 
					
						
						
							
							set background texture method
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:57 +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
							
						 
					 | 
					
						
						
							
						
						53b8218652
					 | 
					
						
						
							
							addeed test for text 2d/3d
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
						
						d90a068e0e
					 | 
					
						
						
							
							fixed bug with setImage
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:54 +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
							
						 
					 | 
					
						
						
							
						
						25b417e8b2
					 | 
					
						
						
							
							added test for trajectories and fixed bug with float type
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:51 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						0d702b83f4
					 | 
					
						
						
							
							updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:51 +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
							
						 
					 | 
					
						
						
							
						
						d264465422
					 | 
					
						
						
							
							more refactoring
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
						
						cd57c4e189
					 | 
					
						
						
							
							refactored CloudNormals and added test for it
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
						
						baee8c3aa5
					 | 
					
						
						
							
							refactored Mesh, added tests, added failing "twice spin()" test
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:46 +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
							
						 
					 | 
					
						
						
							
						
						f610c295f2
					 | 
					
						
						
							
							more tests
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						e7791e1590
					 | 
					
						
						
							
							colors minor
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						c1b41caa7c
					 | 
					
						
						
							
							added vtkCloudMatSink, reworked cloud IO functions, added normals support
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						84d6fe397d
					 | 
					
						
						
							
							reading/writing clouds functionality
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:42 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						80ab6e889f
					 | 
					
						
						
							
							refactoring
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:42 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						2705068290
					 | 
					
						
						
							
							refactored Keyboard and Mouse Events
						
						
						
						
						
						
					 | 
					
						2014-01-19 18:38:41 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |