Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						491a3fdebc 
					 
					
						
						
							
							android samples: force setVisibility (see  #5812 )  
						
						
						
						
					 
					
						2015-12-16 14:31:49 +03:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						bfa77ff5a4 
					 
					
						
						
							
							Increase android samples versions  
						
						
						
						
					 
					
						2015-06-17 18:10:28 +03:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						231685133e 
					 
					
						
						
							
							OpenCV Manager: support 3.0.0 library  
						
						
						
						
					 
					
						2015-03-19 15:27:14 +03:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						c42424f2db 
					 
					
						
						
							
							Fixed android samples build  
						
						
						
						
					 
					
						2014-09-08 23:22:29 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						00b2124876 
					 
					
						
						
							
							fixing more compile problems with Java bindings etc  
						
						
						
						
					 
					
						2014-08-14 13:48:52 +04: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 
						 
				 
			
				
					
						
							
							
								Neo Alienson 
							
						 
					 
					
						
						
							
						
						b6e25a9fc7 
					 
					
						
						
							
							Fix typos  
						
						
						
						
					 
					
						2014-06-16 18:48:10 +08:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						15b6fd2ec4 
					 
					
						
						
							
							android: allow to build & run examples without Android OpenCV Manager  
						
						
						
						
					 
					
						2014-06-06 18:01:04 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						82c61eba49 
					 
					
						
						
							
							Feature  #2893  Create Java sample without layout.xml implemented.  
						
						
						
						
					 
					
						2013-04-10 13:38:59 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						076941bb07 
					 
					
						
						
							
							15-puzzle app reverted to usage of old CvCameraViewListener implementation;  
						
						... 
						
						
						
						super.onPause() call moved to begining of onPause method according Google recomandations. 
						
						
					 
					
						2013-02-08 12:36:33 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						f8720ec60e 
					 
					
						
						
							
							Code review issues fixed. Compatibility issues fixed.  
						
						
						
						
					 
					
						2013-02-07 13:11:08 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						6b5eac328f 
					 
					
						
						
							
							Android samples updated according onCameraFrame callback signature change.  
						
						... 
						
						
						
						FpsMeter class removed from Image Manipulations and Face Detection examples as unused code. 
						
						
					 
					
						2013-02-04 17:43:46 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						2c67731a7b 
					 
					
						
						
							
							Issue  #2549  OpenCV Samples does not expand on full screen fixed.  
						
						... 
						
						
						
						All samples use application style in android manifest instead of system calls in onCreate event now. 
						
						
					 
					
						2012-11-23 13:12:11 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						cfd634ca3e 
					 
					
						
						
							
							Improving compatibility with the latest Android SDK (r21) and NDK (r8c).  
						
						... 
						
						
						
						- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects 
						
						
					 
					
						2012-11-20 18:40:22 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						a1a2cb0aeb 
					 
					
						
						
							
							OpenCV Samples testing problems fixed:  
						
						... 
						
						
						
						Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated; 
						
						
					 
					
						2012-10-31 17:24:50 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander 
							
						 
					 
					
						
						
							
						
						d495daf1ed 
					 
					
						
						
							
							Memory leak of native OpenCV mats fixed.  
						
						
						
						
					 
					
						2012-10-29 16:56:21 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						83d8bc8c55 
					 
					
						
						
							
							Tutorial 1 updated. Execution time camera switching implemented.  
						
						... 
						
						
						
						Some unification done to simplify camera switching. 
						
						
					 
					
						2012-10-26 13:30:20 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						76bcf72ded 
					 
					
						
						
							
							2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.  
						
						
						
						
					 
					
						2012-10-24 09:51:01 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						c1d42664bc 
					 
					
						
						
							
							Refactring. Bug fix.  
						
						
						
						
					 
					
						2012-10-23 20:06:58 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						a942747046 
					 
					
						
						
							
							Code review coments fixed. Lint wornings fixed.  
						
						
						
						
					 
					
						2012-10-23 20:06:58 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						84856fa2c1 
					 
					
						
						
							
							CMakeLists.txt rescued. Androidmanifest unified.  
						
						
						
						
					 
					
						2012-10-23 20:06:58 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						898320a0f6 
					 
					
						
						
							
							Code clean up.  
						
						
						
						
					 
					
						2012-10-23 20:06:58 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						04384a71e4 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:32:23 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						a91de25f10 
					 
					
						
						
							
							Build fix after issue  #2284  fix.  
						
						
						
						
					 
					
						2012-10-10 14:27:17 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						a8e7f91e34 
					 
					
						
						
							
							java samples fix (clear view before drawing frame) of 'dirty' FPS display bug  
						
						
						
						
					 
					
						2012-09-28 18:21:22 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						067744d071 
					 
					
						
						
							
							Fix Android samples for devices having front camera only (Nexus 7)  
						
						
						
						
					 
					
						2012-08-31 18:25:08 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						bd12f636c8 
					 
					
						
						
							
							Unify manifest files in Android examples  
						
						
						
						
					 
					
						2012-08-31 17:47:12 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						47b9640785 
					 
					
						
						
							
							Updated package version in Android samples  
						
						
						
						
					 
					
						2012-08-28 15:07:42 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						285af48040 
					 
					
						
						
							
							Fix Andoid samples: black screen after resume problem  
						
						
						
						
					 
					
						2012-08-24 16:17:42 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						dc68a56bab 
					 
					
						
						
							
							fixing wording  
						
						
						
						
					 
					
						2012-07-15 05:51:29 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						92e6aa5f17 
					 
					
						
						
							
							customizing the 'Google Market error' message in samples  
						
						
						
						
					 
					
						2012-07-14 19:49:00 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						4e4db94b6b 
					 
					
						
						
							
							removing warnings on deprecated api when targeting to android-15+  
						
						
						
						
					 
					
						2012-07-14 19:07:27 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						51f6127e0a 
					 
					
						
						
							
							Merged the recent fixes from 2.4 branch  
						
						
						
						
					 
					
						2012-07-04 08:04:31 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						3a88fc5aa9 
					 
					
						
						
							
							Android samples renaming was done. Icon updated.  
						
						
						
						
					 
					
						2012-07-02 10:06:08 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						2984fa751e 
					 
					
						
						
							
							adding OpenCV Manager  
						
						
						
						
					 
					
						2012-06-21 14:50:05 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						5855c4905e 
					 
					
						
						
							
							Android samples are updated: onPause()/onResume() release/open camera, a message is shown on camera open error, minor fixes in code and resources  
						
						
						
						
					 
					
						2012-05-17 14:51:04 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d5a0088bbe 
					 
					
						
						
							
							merged 2.4 into trunk  
						
						
						
						
					 
					
						2012-04-30 14:33:52 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						6d49b075d9 
					 
					
						
						
							
							updating screen resolutions support settings  
						
						
						
						
					 
					
						2012-03-29 15:41:38 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e72a23243b 
					 
					
						
						
							
							Reworked build scripts for Android Java API, tests and examples  
						
						
						
						
					 
					
						2012-03-27 16:05:52 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						62591a1d5a 
					 
					
						
						
							
							#1283 , Mat <->Bitmap converters are updated to support CV_8UC(1,3,4) & non-continuous Mat-s and RGBA_8888 & RGB_565 Bitmaps; Android samples project files are updated according to the latest SDK req-s.  
						
						
						
						
					 
					
						2012-02-14 14:40:41 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e8032fa8e9 
					 
					
						
						
							
							Fixed Android build with SDK revision 14  
						
						
						
						
					 
					
						2011-10-21 08:35:34 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						d9d74678a9 
					 
					
						
						
							
							Java API: corrected names of methods in Utils class; fixed bug in DMatch (thank for Hussein Abdinoor); added new utility method loadResource  
						
						
						
						
					 
					
						2011-08-09 11:46:27 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						fa0daa4809 
					 
					
						
						
							
							Java API: fixing converters (copyData=true) and samples compilation  
						
						... 
						
						
						
						Testing: 1079/0/592 
						
						
					 
					
						2011-08-03 11:57:00 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						3d9cb082c9 
					 
					
						
						
							
							making CV data type to be int  
						
						
						
						
					 
					
						2011-07-22 15:11:35 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						ebf9916242 
					 
					
						
						
							
							Fixed android samples; fixed cmake files  
						
						
						
						
					 
					
						2011-07-22 13:34:25 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						930b2995eb 
					 
					
						
						
							
							Fixed Android samples; Fixed bugs in cmake (java module).  
						
						
						
						
					 
					
						2011-07-19 17:07:01 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5e3e283e30 
					 
					
						
						
							
							Changed labels for some android samples  
						
						
						
						
					 
					
						2011-07-19 07:40:26 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						cc3c034cf6 
					 
					
						
						
							
							Android samples: class SampleViewBase which uses native camera is renamed.  
						
						
						
						
					 
					
						2011-07-18 09:13:05 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						be2c4ddbdd 
					 
					
						
						
							
							Android:  
						
						... 
						
						
						
						* Added manual port for getTextSize;
* Fixed bugs in "native camera" sample;
* Added 15-puzzle sample. 
						
						
					 
					
						2011-07-16 22:31:47 +00:00