Eric Christiansen 
							
						 
					 
					
						
						
							
						
						ad326cb0be 
					 
					
						
						
							
							adds desktop java junit tests  
						
						
						
						
					 
					
						2012-12-19 14:28:59 -08:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						d7c89fc649 
					 
					
						
						
							
							A lot of javadoc warnings duting javadoc build (Bug  #2647 ) issue fixed  
						
						... 
						
						
						
						Black list of entities, that are not implemented in Java API added to javadoc generator 
						
						
					 
					
						2012-12-19 12:53:44 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e10ee89ec4 
					 
					
						
						
							
							Merge branch 2.4  
						
						
						
						
					 
					
						2012-11-30 19:54:24 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						2e5a7284d2 
					 
					
						
						
							
							Code review comments applied.  
						
						
						
						
					 
					
						2012-11-27 14:55:49 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						0efc32fc21 
					 
					
						
						
							
							Attribure loading from layout improved.  
						
						... 
						
						
						
						OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message. 
						
						
					 
					
						2012-11-27 12:47:41 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						8266eab8b4 
					 
					
						
						
							
							OpenCV app framework improved  
						
						... 
						
						
						
						FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented. 
						
						
					 
					
						2012-11-27 12:47:41 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						285d6320be 
					 
					
						
						
							
							add #/usr/bin/env python to all python files  
						
						
						
						
					 
					
						2012-11-23 22:57:22 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						7f542e391a 
					 
					
						
						
							
							Merge branch 2.4  
						
						... 
						
						
						
						Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4 
						
						
					 
					
						2012-11-20 19:12:00 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						d559c18ee5 
					 
					
						
						
							
							Merge pull request  #161  from apavlenko:fix/sdk_r21  
						
						
						
						
					 
					
						2012-11-20 19:07:08 +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 
							
						 
					 
					
						
						
							
						
						66a1ea7604 
					 
					
						
						
							
							Test execution inside Eclipse fixed;  
						
						... 
						
						
						
						OpenCV testing via OpenCV Manager implemented. 
						
						
					 
					
						2012-11-20 10:45:46 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						96e4eed018 
					 
					
						
						
							
							Logcat message for disabled test cases added.  
						
						
						
						
					 
					
						2012-11-13 11:41:08 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						9f5fcff3ea 
					 
					
						
						
							
							More common way of test case disabling implemented.  
						
						
						
						
					 
					
						2012-11-13 10:29:49 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						e06c5b6fd5 
					 
					
						
						
							
							Code review comments applied.  
						
						
						
						
					 
					
						2012-11-12 17:47:20 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						baef62b4d2 
					 
					
						
						
							
							Java test fix. Eclipse test execution fix.  
						
						
						
						
					 
					
						2012-11-09 11:46:14 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						4d059e9e5b 
					 
					
						
						
							
							Merge release 2.4.3  
						
						
						
						
					 
					
						2012-11-02 17:58:02 +04:00 
						 
				 
			
				
					
						
							
							
								Kirill Kornyakov 
							
						 
					 
					
						
						
							
						
						2efd9b6ad7 
					 
					
						
						
							
							Fixed a couple of minor issues in Javadocs  
						
						
						
						
					 
					
						2012-11-01 22:28:46 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						358fcbd5b6 
					 
					
						
						
							
							Merge pull request  #115  from asmorkalov:java_test_data_update  
						
						
						
						
					 
					
						2012-11-01 19:29:18 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						34896529d5 
					 
					
						
						
							
							Review comments applied.  
						
						
						
						
					 
					
						2012-11-01 16:19:11 +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 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						468eefe0ce 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2012-10-30 15:10:17 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander 
							
						 
					 
					
						
						
							
						
						b0106ca25e 
					 
					
						
						
							
							Test data form features2d updated.  
						
						
						
						
					 
					
						2012-10-30 15:05:09 +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 
							
						 
					 
					
						
						
							
						
						016b2cadb0 
					 
					
						
						
							
							Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.  
						
						... 
						
						
						
						Some code refactoring done. 
						
						
					 
					
						2012-10-26 13:30:20 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						9217095955 
					 
					
						
						
							
							Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.  
						
						
						
						
					 
					
						2012-10-26 13:30:20 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						6211f156e6 
					 
					
						
						
							
							Merge 2.4.3-rc  
						
						
						
						
					 
					
						2012-10-24 19:56:27 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						4f0f6686d1 
					 
					
						
						
							
							Undefind behavior in Async Service Helper fixed.  
						
						
						
						
					 
					
						2012-10-24 12:28:31 +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 
							
						 
					 
					
						
						
							
						
						641ee645ab 
					 
					
						
						
							
							New sample framework integrated to Java part of SDK;  
						
						... 
						
						
						
						Frame format setter added to both views. 
						
						
					 
					
						2012-10-23 20:06:33 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						9029acf6f0 
					 
					
						
						
							
							openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.  
						
						
						
						
					 
					
						2012-10-23 20:06:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5bc104cef5 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2012-10-19 15:00:05 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						57d077b936 
					 
					
						
						
							
							Fix Java API generation after normalization  
						
						... 
						
						
						
						The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation. 
						
						
					 
					
						2012-10-17 18:20:46 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						81f826db2b 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:57:49 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						04384a71e4 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:32:23 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						ed51162568 
					 
					
						
						
							
							Fix binary compatibility of Java wrappers  
						
						
						
						
					 
					
						2012-10-17 02:09:37 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						dbd30d4fba 
					 
					
						
						
							
							Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"  
						
						... 
						
						
						
						This reverts commit eb4ce67dac 
						
						
					 
					
						2012-10-15 17:53:57 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						a390c1e2e6 
					 
					
						
						
							
							Merge pull request  #40  from emchristiansen/manualBRISKFREAK  
						
						
						
						
					 
					
						2012-10-12 12:31:11 +04:00 
						 
				 
			
				
					
						
							
							
								Eric Christiansen 
							
						 
					 
					
						
						
							
						
						594ce1c869 
					 
					
						
						
							
							fixed indentation  
						
						
						
						
					 
					
						2012-10-12 12:31:11 +04:00 
						 
				 
			
				
					
						
							
							
								Eric Christiansen 
							
						 
					 
					
						
						
							
						
						caebcdcb3d 
					 
					
						
						
							
							Minor tweak to add BRISK and FREAK support for the Java wrapper  
						
						
						
						
					 
					
						2012-10-12 12:31:11 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						5a524bdfd7 
					 
					
						
						
							
							Issue  #1861  Improve Javadoc documentation fixed. Multiline code segments added to Javadoc.  
						
						
						
						
					 
					
						2012-10-11 19:21:40 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						8f44f25f47 
					 
					
						
						
							
							Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt)  
						
						
						
						
					 
					
						2012-10-11 17:09:57 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						7cb525d63f 
					 
					
						
						
							
							Fix AndroidManifest.xml generation for OpenCV Android library project  
						
						
						
						
					 
					
						2012-10-11 15:47:57 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						9ad5fd709b 
					 
					
						
						
							
							Fixed Javadoc problems with ">" and "<" symbols.  
						
						
						
						
					 
					
						2012-10-10 13:31:03 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						306ed9801a 
					 
					
						
						
							
							Issue  #2284  BaseLoaderCallback requires use of Activity fixed.  
						
						
						
						
					 
					
						2012-10-10 11:44:01 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						9a76573172 
					 
					
						
						
							
							Auto expand of OpenCV version for Android Library prject and some documentation pages added.  
						
						
						
						
					 
					
						2012-10-09 18:30:58 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						4b808b1199 
					 
					
						
						
							
							RESTART_REQUIRED status removed from OpenCV Manager API;  
						
						... 
						
						
						
						OpenCV info library name fixed;
Minimum API level for OpenCV library project increased up to 3 for using message dialogs. 
						
						
					 
					
						2012-10-09 10:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						febfdc9fa2 
					 
					
						
						
							
							Wating for OpenCV library package installation added.  
						
						
						
						
					 
					
						2012-10-08 14:37:59 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						11839e2cc9 
					 
					
						
						
							
							Wating for OpenCV Manager installation added.  
						
						
						
						
					 
					
						2012-10-08 14:37:59 +04:00