From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Tue, 20 Nov 2012 15:12:00 +0000 (+0400)
Subject: Merge branch 2.4
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1242
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f542e391aa75301333f1a8a6a36f5f6484a5425;p=profile%2Fivi%2Fopencv.git

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
---

7f542e391aa75301333f1a8a6a36f5f6484a5425
diff --cc modules/contrib/src/detection_based_tracker.cpp
index 238ac5c,a1e5dea..11263a8
--- a/modules/contrib/src/detection_based_tracker.cpp
+++ b/modules/contrib/src/detection_based_tracker.cpp
@@@ -1,14 -1,9 +1,16 @@@
  #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID)
  #include "opencv2/contrib/detection_based_tracker.hpp"
  
+ #include <pthread.h>
+ 
 +#if defined(DEBUG) || defined(_DEBUG)
 +#undef DEBUGLOGS
  #define DEBUGLOGS 1
 +#endif
 +
 +#ifndef DEBUGLOGS
 +#define DEBUGLOGS 0
 +#endif
  
  #ifdef ANDROID
  #include <android/log.h>