| 
							
							
								 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 | 24d8cbf940 | Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry) | 2014-03-16 20:07:05 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | fde0185a77 | iteractor work | 2014-03-06 03:26:21 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 03bd82796d | source compatibility with master | 2014-02-15 23:40:09 +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 | f1c062c30a | cloud collection finalize | 2014-02-10 15:45:46 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 069dd8a068 | default meshlab background | 2014-02-10 15:45:45 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 17fea0dd0a | fixed size_t/int conversion warnings | 2014-02-10 15:45:45 +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 | 8f15a8abdb | disabled Ubuntu workaround code for Windows | 2014-01-19 18:39:00 +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 | 8d327fa497 | updated for compatibility with VTK6.0 | 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 | b0ca93b22c | by default enabled tests vtk | 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 | dac27c9913 | refactored arrow | 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 | cad9a786c4 | optimized Mat to vtkImageData conversion | 2014-01-19 18:38:54 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | a23f1447a8 | minor | 2014-01-19 18:38:53 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | e3ff28dacc | refactored WImage3D | 2014-01-19 18:38:53 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | f37c31742a | created tests for images, created vtk/vtkImageMatSource, and switched all images to that class | 2014-01-19 18:38:53 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 462d516743 | added test for camera positions, slightly refactored the widgets | 2014-01-19 18:38:52 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 8309d19f31 | renamed Mesh3d -> Mesh | 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 | d264465422 | more refactoring | 2014-01-19 18:38:48 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 406444037d | refactored polyline | 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 | 1c4cfd8eaf | normals support for CloudMatSource | 2014-01-19 18:38:43 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | bf30c33e6e | getting data from opencv_extra | 2014-01-19 18:38:43 +04:00 |  | 
			
				
					| 
							
							
								 Anatoly Baksheev | 84d6fe397d | reading/writing clouds functionality | 2014-01-19 18:38:42 +04:00 |  |