Commits · 70c409f0e81beb2924fee0e1e819baf1da0258ec · submodule / opencv

26 Nov, 2012 1 commit
- fixed building PDFs in master · 70c409f0
  Vadim Pisarevsky authored Nov 26, 2012
  
  70c409f0
23 Nov, 2012 1 commit
- Merge pull #173 request from cuda-geek/fix-sc-arm · 5c2d5906
  marina.kolpakova authored Nov 23, 2012
  
  5c2d5906
22 Nov, 2012 1 commit
- fix tests for arm · 6ccd7aca
  marina.kolpakova authored Nov 22, 2012
  
  6ccd7aca
20 Nov, 2012 12 commits
- Merge branch 2.4 · 7f542e39
  Andrey Kamaev authored Nov 20, 2012
```
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
```
  7f542e39
- Merge pull request #161 from apavlenko:fix/sdk_r21 · d559c18e
  Andrey Kamaev authored Nov 20, 2012
  
  d559c18e
- Improving compatibility with the latest Android SDK (r21) and NDK (r8c). · cfd634ca
  Andrey Pavlenko authored Nov 20, 2012
```
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
```
  cfd634ca
- Merge pull request #170 from asmorkalov:engine_build_fix · 4fce5a5e
  Andrey Kamaev authored Nov 20, 2012
  
  4fce5a5e
- Merging pull request #169 from taka-no-me:android-ndk-r8c · 934b623f
  Andrey Kamaev authored Nov 20, 2012
  
  934b623f
- Merging pull request #167 from asmorkalov:java_api_manager_test · d3397a1d
  Andrey Kamaev authored Nov 20, 2012
  
  d3397a1d
- Libinfo build fix; · 5b148083
  Alexander Smorkalov authored Nov 20, 2012
```
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
```
  5b148083
- Merging pull request #162 from taka-no-me/opencv · f172947e
  Andrey Kamaev authored Nov 20, 2012
  
  f172947e
- 'Merging pull request 163 from asmorkalov/opencv' · 5527fc62
  Andrey Kamaev authored Nov 20, 2012
  
  5527fc62
- Fix Android build with clang compiler · 04481d9e
  Andrey Kamaev authored Nov 19, 2012
  
  04481d9e
- Update Android CMake toolchain for NDK r8c · ab931194
  Andrey Kamaev authored Nov 15, 2012
  
  ab931194
- Test execution inside Eclipse fixed; · 66a1ea76
  Alexander Smorkalov authored Nov 20, 2012
```
OpenCV testing via OpenCV Manager implemented.
```
  66a1ea76
19 Nov, 2012 2 commits
- Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed. · 1f1d43fc
  Alexander Smorkalov authored Nov 19, 2012
  
  1f1d43fc
- Update URL for TBB download. Update to TBB 4.1 update 1 · 9ca1162b
  Andrey Kamaev authored Nov 19, 2012
  
  9ca1162b
16 Nov, 2012 4 commits
- Merge pull request #160 from asmorkalov/android_4_2_manager_fix · 6cd70c83
  Andrey Kamaev authored Nov 16, 2012
  
  6cd70c83
- Merge pull request #159 from asmorkalov/libinfo_install_fix · f6f1861a
  Andrey Kamaev authored Nov 16, 2012
  
  f6f1861a
- Merge pull request #157 from vpisarev/bug_fixes5 · 590d1d81
  Andrey Kamaev authored Nov 16, 2012
  
  590d1d81
- Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed. · 759863d9
  Alexander Smorkalov authored Nov 16, 2012
  
  759863d9
15 Nov, 2012 1 commit
- Issue #2541 make install does not work for Android build fixed. · 1e0bff32
  Alexander Smorkalov authored Nov 15, 2012
  
  1e0bff32
14 Nov, 2012 2 commits
- Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF · 2e2d9272
  Andrey Kamaev authored Nov 14, 2012
  
  2e2d9272
- Modified documentation for calcOpticalFlowSF. · 52a13622
  LeonidBeynenson authored Nov 14, 2012
  
  52a13622
13 Nov, 2012 16 commits
- Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4 · e3c93ad9
  marina.kolpakova authored Nov 13, 2012
```
This reverts commit 7e301c5c, reversing
changes made to b5e009eb.
```
  e3c93ad9
- Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu' · be40bd5c
  marina.kolpakova authored Nov 13, 2012
  
  be40bd5c
- added CV_OUT to StereoVar output paramiter · 9cfa51a4
  Alexander Mordvintsev authored Nov 12, 2012
  
  9cfa51a4
- fix for negative confidence · 1edab120
  marina.kolpakova authored Nov 13, 2012
  
  1edab120
- Merge branch 2.4 · 9719ea93
  Andrey Kamaev authored Nov 13, 2012
  
  9719ea93
- Merge pull request #147 from taka-no-me/win_warnings · aba5bae4
  Andrey Kamaev authored Nov 13, 2012
  
  aba5bae4
- Merge pull requests #136, #142, #150, #152 from… · 09383580
  Andrey Kamaev authored Nov 13, 2012
```
Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
```
  09383580
- Merge pull request #156 from jet47/gpu-hough-lines-fix · 72a63922
  Andrey Kamaev authored Nov 13, 2012
  
  72a63922
- Merge pull request #155 from jet47/gpu-test-fix · e4fb6805
  Andrey Kamaev authored Nov 13, 2012
  
  e4fb6805
- Merge pull request #149 from taka-no-me/osx_warnings · 5bc66ec8
  Andrey Kamaev authored Nov 13, 2012
  
  5bc66ec8
- Merge pull request #148 from taka-no-me/tutorial_codes · a2185075
  Andrey Kamaev authored Nov 13, 2012
  
  a2185075
- Merge pull request #146 from taka-no-me/win_opengl · 8ba9289a
  Andrey Kamaev authored Nov 13, 2012
  
  8ba9289a
- Merge pull request #145 from taka-no-me/vec_print · 4d6bdc15
  Andrey Kamaev authored Nov 13, 2012
  
  4d6bdc15
- Merge pull request #143 from vpisarev/bug_fixes4 · c803cbb9
  Andrey Kamaev authored Nov 13, 2012
  
  c803cbb9
- Merge pull request #141 from jet47/gpu-pyrlk-fix · 7e301c5c
  Andrey Kamaev authored Nov 13, 2012
  
  7e301c5c
- Merge pull request #144 from asmorkalov/fd_package_fix_2.4 · b5e009eb
  Andrey Kamaev authored Nov 13, 2012
  
  b5e009eb