Ilya Lavrenov
4116cbe2c0
Merge remote-tracking branch 'upstream/master' into Demosaicing
12 years ago
Andrey Kamaev
61a40ddff8
Merge pull request #186 from vpisarev:doc_fixes_master
12 years ago
Vadim Pisarevsky
70c409f0e8
fixed building PDFs in master
12 years ago
Ilya Lavrenov
3fa630639f
fixed bayer2bgra in case when size.width <= 2
12 years ago
Ilya Lavrenov
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
12 years ago
marina.kolpakova
5c2d59066f
Merge pull #173 request from cuda-geek/fix-sc-arm
12 years ago
marina.kolpakova
6ccd7aca4c
fix tests for arm
12 years ago
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
12 years ago
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
12 years ago
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
12 years ago
Andrey Kamaev
4fce5a5e83
Merge pull request #170 from asmorkalov:engine_build_fix
12 years ago
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
12 years ago
Andrey Kamaev
d3397a1d6d
Merging pull request #167 from asmorkalov:java_api_manager_test
12 years ago
Alexander Smorkalov
5b148083fe
Libinfo build fix;
...
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
12 years ago
Andrey Kamaev
f172947ed5
Merging pull request #162 from taka-no-me/opencv
12 years ago
Andrey Kamaev
5527fc62f4
'Merging pull request 163 from asmorkalov/opencv'
12 years ago
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
12 years ago
Andrey Kamaev
ab9311947a
Update Android CMake toolchain for NDK r8c
12 years ago
Alexander Smorkalov
66a1ea7604
Test execution inside Eclipse fixed;
...
OpenCV testing via OpenCV Manager implemented.
12 years ago
Alexander Smorkalov
1f1d43fc88
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
12 years ago
Andrey Kamaev
9ca1162be8
Update URL for TBB download. Update to TBB 4.1 update 1
12 years ago
Andrey Kamaev
6cd70c83fb
Merge pull request #160 from asmorkalov/android_4_2_manager_fix
12 years ago
Andrey Kamaev
f6f1861a2f
Merge pull request #159 from asmorkalov/libinfo_install_fix
12 years ago
Andrey Kamaev
590d1d8118
Merge pull request #157 from vpisarev/bug_fixes5
12 years ago
Alexander Smorkalov
759863d95c
Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.
12 years ago
Alexander Smorkalov
1e0bff3268
Issue #2541 make install does not work for Android build fixed.
12 years ago
Andrey Kamaev
2e2d927273
Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF
12 years ago
LeonidBeynenson
52a136227d
Modified documentation for calcOpticalFlowSF.
12 years ago
marina.kolpakova
e3c93ad9cf
Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4
...
This reverts commit 7e301c5c0e
, reversing
changes made to b5e009eb87
.
12 years ago
marina.kolpakova
be40bd5c74
Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
12 years ago
Alexander Mordvintsev
9cfa51a483
added CV_OUT to StereoVar output paramiter
12 years ago
marina.kolpakova
1edab12068
fix for negative confidence
12 years ago
Andrey Kamaev
9719ea93b6
Merge branch 2.4
12 years ago
Andrey Kamaev
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
12 years ago
Andrey Kamaev
0938358002
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
12 years ago
Andrey Kamaev
72a63922d2
Merge pull request #156 from jet47/gpu-hough-lines-fix
12 years ago
Andrey Kamaev
e4fb680566
Merge pull request #155 from jet47/gpu-test-fix
12 years ago
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
12 years ago
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
12 years ago
Andrey Kamaev
8ba9289a2c
Merge pull request #146 from taka-no-me/win_opengl
12 years ago
Andrey Kamaev
4d6bdc1533
Merge pull request #145 from taka-no-me/vec_print
12 years ago
Andrey Kamaev
c803cbb93b
Merge pull request #143 from vpisarev/bug_fixes4
12 years ago
Andrey Kamaev
7e301c5c0e
Merge pull request #141 from jet47/gpu-pyrlk-fix
12 years ago
Andrey Kamaev
b5e009eb87
Merge pull request #144 from asmorkalov/fd_package_fix_2.4
12 years ago
Vladislav Vinogradov
a9919e01d0
fixed bug in gpu::HoughLines
12 years ago
Vladislav Vinogradov
606c23b9aa
fixed gpu module tests
...
uses old CommandLineParser class
12 years ago
Alexander Smorkalov
96e4eed018
Logcat message for disabled test cases added.
12 years ago
Alexander Smorkalov
9f5fcff3ea
More common way of test case disabling implemented.
12 years ago
marina.kolpakova
bd9ca48fab
export to python/java
12 years ago
Alexander Smorkalov
6fb959710d
Code review comments applied.
12 years ago