generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into cuda-dev

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-12-24 13:48:33 +04:00
parent 4db68b50f2 c02179a765
commit 5138b7d209
66 changed files with 3506 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ts/include/opencv2/ts/ts_gtest.h
View File

@@ -433,8 +433,8 @@
// Defines this to true iff Google Test can use POSIX regular expressions.
#ifndef GTEST_HAS_POSIX_RE
# if GTEST_OS_LINUX_ANDROID
// On Android, <regex.h> is only available starting with Gingerbread.
# define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
// On Android, <regex.h> is only available starting with Froyo.
# define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 8)
# else
# define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
#endif