Andrey Pavlenko
|
aaefd31844
|
more formatting
|
2013-03-05 19:03:36 +04:00 |
|
Andrey Pavlenko
|
23fb570cbd
|
updating JNI lib location for Unix; formatting update
|
2013-03-05 18:42:14 +04:00 |
|
Andrey Pavlenko
|
116d3be9c0
|
moving JNI library to 'build/lib' dir on non-Win
|
2013-03-05 18:41:44 +04:00 |
|
Andrey Kamaev
|
facab40745
|
Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown
|
2013-03-01 19:44:17 +04:00 |
|
Andrey Kamaev
|
08545b8f96
|
Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib
|
2013-03-01 17:10:46 +04:00 |
|
Andrey Kamaev
|
f22ee8fc19
|
Merge pull request #602 from bitwangyaoyao:2.4_fixAdd
|
2013-03-01 17:10:11 +04:00 |
|
Andrey Kamaev
|
e6cb44edc3
|
Merge pull request #600 from taka-no-me:fix_build_warnings
|
2013-03-01 17:09:56 +04:00 |
|
Andrey Kamaev
|
1094179155
|
Avoid build falure in armeabi build with Android SDK
|
2013-03-01 16:50:42 +04:00 |
|
cuda-geek
|
a706de2446
|
Merge pull request #601 from apavlenko:android_tutorial_update
|
2013-03-01 16:09:25 +04:00 |
|
yao
|
65bb4250a4
|
Fix a bug in addWeighted x64 mode
And a potential problem in remap
|
2013-03-01 18:08:53 +08:00 |
|
Andrey Pavlenko
|
07b1ccdeb0
|
removing redundant picture resize
|
2013-03-01 13:56:50 +04:00 |
|
Andrey Kamaev
|
2128b82c6b
|
Merge pull request #598 from asmorkalov:lib_info_fix
|
2013-03-01 13:52:57 +04:00 |
|
Andrey Pavlenko
|
978132edc1
|
minor Android tutorial fixes
|
2013-03-01 13:52:14 +04:00 |
|
Andrey Kamaev
|
22d33373fa
|
Fix build warnings on MSVC x64 and OS X clang
|
2013-03-01 13:29:43 +04:00 |
|
Andrey Kamaev
|
eaaba1336a
|
Merge pull request #595 from bitwangyaoyao:2.4_perfTest
|
2013-03-01 12:49:43 +04:00 |
|
Andrey Kamaev
|
85c7a36f93
|
Merge pull request #594 from asmorkalov:android_all_build_fix
|
2013-03-01 12:49:27 +04:00 |
|
Andrey Kamaev
|
6be6adbbed
|
Merge pull request #593 from apavlenko:java_tutorial_fixes
|
2013-03-01 12:49:15 +04:00 |
|
Alexander Smorkalov
|
da455efc26
|
Full package version fixed.
|
2013-03-01 12:44:14 +04:00 |
|
Vadim Pisarevsky
|
a910360689
|
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
|
2013-03-01 10:55:11 +04:00 |
|
yao
|
8f3883a28d
|
fix a compile warning
|
2013-03-01 10:06:51 +08:00 |
|
yao
|
82b9854837
|
fix compile warnings
|
2013-03-01 08:47:20 +08:00 |
|
Alexander
|
3cfd3d3ee0
|
Build with OpenCV.mk for all terget fixed.
|
2013-02-28 21:43:57 +04:00 |
|
Andrey Pavlenko
|
af2552d72c
|
fixing issues from http://www.code.opencv.org/issues/2807
|
2013-02-28 19:11:24 +04:00 |
|
Andrey Kamaev
|
c865b28243
|
Merge pull request #591 from jet47:gpu-sanity-tests
|
2013-02-28 18:08:11 +04:00 |
|
Andrey Kamaev
|
79cf292d78
|
Merge pull request #590 from apavlenko:java_fixes
|
2013-02-28 18:07:33 +04:00 |
|
Andrey Kamaev
|
1018d110d6
|
Merge pull request #589 from taka-no-me:2digit_pyversion
|
2013-02-28 18:06:43 +04:00 |
|
Andrey Kamaev
|
fba0e6fc5c
|
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
|
2013-02-28 18:06:28 +04:00 |
|
Andrey Kamaev
|
4811988caf
|
Merge pull request #585 from bitwangyaoyao:2.4_SURF
|
2013-02-28 18:06:14 +04:00 |
|
Andrey Kamaev
|
2a73a6c445
|
Merge pull request #525 from odeniz:2.4
|
2013-02-28 18:05:55 +04:00 |
|
Andrey Pavlenko
|
d18b2c2502
|
patch -> revision
|
2013-02-28 17:19:52 +04:00 |
|
Andrey Pavlenko
|
c24d7cc066
|
adding more version-related variables
|
2013-02-28 16:56:53 +04:00 |
|
Vladislav Vinogradov
|
f533f0dca9
|
fixed gpu sanity tests
|
2013-02-28 16:54:37 +04:00 |
|
Andrey Kamaev
|
bd38a1945d
|
Honor 2-digit python version
|
2013-02-28 16:32:13 +04:00 |
|
Andrey Pavlenko
|
29b763dc60
|
updating samples to load JNI lib with correct suffix
|
2013-02-28 16:24:52 +04:00 |
|
Andrey Pavlenko
|
5321da92cb
|
adding/fixing version suffix for desktop java library on all OSes
|
2013-02-28 16:12:44 +04:00 |
|
Andrey Kamaev
|
f4b413e830
|
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig
|
2013-02-28 15:45:45 +04:00 |
|
Andrey Kamaev
|
1f411b5a2b
|
Merge pull request #572 from asmorkalov:manager_4_digit_version
|
2013-02-28 15:44:57 +04:00 |
|
Andrey Kamaev
|
bf4c8c6ff1
|
Merge pull request #584 from bitwangyaoyao:2.4_perfTest
|
2013-02-28 15:44:06 +04:00 |
|
Andrey Kamaev
|
d0e340bc80
|
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
|
2013-02-28 15:43:51 +04:00 |
|
Alexander Smorkalov
|
ddc2e334da
|
OpenCV version swithed to 4 digit in GUI and package revision number.
|
2013-02-28 12:59:24 +04:00 |
|
yao
|
f12369a53c
|
Fix ocl::HOG crash on Intel OCL
|
2013-02-28 16:56:39 +08:00 |
|
Andrey Kamaev
|
831580ef31
|
Merge pull request #578 from jet47:nmake-ffmpeg-copy
|
2013-02-28 12:56:26 +04:00 |
|
Andrey Kamaev
|
6ce51d88a4
|
Merge pull request #573 from jet47:config-cross-compilation
|
2013-02-28 12:56:08 +04:00 |
|
cuda-geek
|
0771fd82c0
|
Merge pull request #557 from jet47:gpu-sanity
|
2013-02-28 11:17:12 +04:00 |
|
yao
|
f791344810
|
linux warning fix
|
2013-02-28 14:37:37 +08:00 |
|
Vladislav Vinogradov
|
61ef48eee6
|
fixed OpenCVConfig for cross-compilation:
* added CUDA to EXTRA libs if OpenCV uses it
* added -rpath-link option for linker if OpenCV was built as SHARED libs
|
2013-02-28 10:33:05 +04:00 |
|
yao
|
504008dbe0
|
Fix ocl::bruteforcematcher crash on Intel OCL
|
2013-02-28 14:31:08 +08:00 |
|
Vladislav Vinogradov
|
df456245e7
|
fixed ffmpeg destination folder for NMake generator
|
2013-02-28 10:16:41 +04:00 |
|
yao
|
7c1f1d8837
|
fix bug #2787
|
2013-02-28 14:05:36 +08:00 |
|
yao
|
ed3c3822fc
|
adjust some test cases, use original template file name in Haar
|
2013-02-28 12:15:13 +08:00 |
|