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
2012-11-20 19:12:00 +04:00
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Andrey Kamaev
9ca1162be8
Update URL for TBB download. Update to TBB 4.1 update 1
2012-11-19 11:43:28 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
ac96bb357c
Suppress more warnings in libtiff
2012-10-23 18:20:07 +04:00
OpenCV Buildbot
1cb21d292b
update FFMPEG wrapper binaries
2012-10-23 13:17:43 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
2885eb86b8
Remove alignment reqirements from NEON optimizations in libpng
...
On Android memory is not guaranted to be aligned and applications often crash with BUSERROR
2012-10-05 18:15:44 +04:00
Alexander Smorkalov
d64d76086e
MIPS architecture support added. Native camera library built for MIPS device.
2012-10-02 16:21:53 +04:00
Andrey Pavlenko
56200dbd37
REVERT OF: Update libjpeg to release 8d (reverse-merged from commit d28af08ef3
)
2012-09-26 14:02:23 +04:00
Andrey Pavlenko
4e193a3380
REVERT OF reverted libjpeg to an earlier version (reverse-merged from commit bfc8a52402
)
2012-09-26 14:01:51 +04:00
Vadim Pisarevsky
bfc8a52402
reverted libjpeg to an earlier version
2012-09-24 15:11:29 +04:00
OpenCV Buildbot
87f282eed2
update FFMPEG wrapper binaries
2012-09-19 16:49:39 +04:00
Alexander Smorkalov
8104164c78
All HTC One S related changes reverted due to applyProperties problems on other devices. Libraries rebuilt.
2012-09-14 16:51:38 +04:00
Alexander Smorkalov
afe30d0f8a
Native camera fix for Nexus 7 with Android JB. Camera build script updated.
2012-09-12 14:29:00 +04:00
Alexander Smorkalov
568d9583c1
All native camera libraries rebuild after HTC One S fix.
2012-09-07 17:22:48 +04:00
Andrey Kamaev
6a112aa87a
Use TBB 4.1 on Android
2012-09-06 19:38:13 +04:00
Andrey Kamaev
b8adc04545
Fix Android build warnings
2012-09-06 18:54:38 +04:00
Andrey Kamaev
bcd0aefbca
Fix gcc build errors and warnings
2012-09-05 15:51:51 +04:00
Vadim Pisarevsky
bf7295f584
fixed multiple build warnings
2012-09-04 14:15:00 +04:00
Andrey Kamaev
52581750fc
Fix openexr build on Linux
2012-09-03 15:58:30 +04:00
Andrey Kamaev
7280039d8c
Update readme for 3rdparty libs
2012-09-02 21:16:57 +04:00
Andrey Kamaev
577d9cdece
Fix openexr build on MinGW
2012-09-02 20:44:09 +04:00
Andrey Kamaev
941391c0be
Fix openexr build with MSVC
2012-09-02 20:44:07 +04:00
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
OpenCV Buildbot
1a2bbfafba
update FFMPEG wrapper binaries
2012-08-31 14:36:22 +04:00
Andrey Kamaev
ecd96c8b18
Fix libjasper build on 32-bit MinGW
2012-08-30 23:14:09 +04:00
Andrey Kamaev
f02c1ad688
Fix MinGW warning on implicit 'exit' declaration
2012-08-30 22:51:03 +04:00
Vadim Pisarevsky
a6e2acbfee
added a few missing images for tutorials; integrated pull request #26
2012-08-30 16:23:18 +04:00
Andrey Kamaev
a881f165ec
Update readme for 3rdparty libs
2012-08-30 00:56:18 +04:00
Andrey Kamaev
d8015fd6ed
Fix libjasper build with MSVC
2012-08-30 00:40:40 +04:00
Andrey Kamaev
6e6cfdd024
Add changelog and copyright files from debian libjasper-dev (1.900.1-13) package
2012-08-30 00:40:32 +04:00
Andrey Kamaev
70fed019ae
Apply 03-CVE-2011-4516-and-CVE-2011-4517 patch from debian libjasper-dev (1.900.1-13) package
2012-08-30 00:40:29 +04:00
Andrey Kamaev
c7db1c1cc8
Apply 02-fix-filename-buffer-overflow patch from debian libjasper-dev (1.900.1-13) package
2012-08-30 00:40:26 +04:00
Andrey Kamaev
4157a640ba
Apply 01-misc-fixes patch from debian libjasper-dev (1.900.1-13) package
2012-08-30 00:40:23 +04:00
Andrey Kamaev
d28af08ef3
Update libjpeg to release 8d
2012-08-30 00:40:18 +04:00
Andrey Kamaev
35a869f6f0
Update libtiff to release v4.0.2
2012-08-30 00:23:45 +04:00
Andrey Kamaev
e9392d1466
Fix Android build with cmake 2.6.3
2012-08-30 00:23:41 +04:00
Andrey Kamaev
90a3d227c9
Enable libpng NEON optimization in Android build for armeabi-v7a with NEON target
2012-08-30 00:23:38 +04:00
Andrey Kamaev
c6d1421f9b
Update libpng to release v1.5.12
2012-08-30 00:23:34 +04:00
Andrey Kamaev
ae4718558d
Update zlib to release v1.2.7
2012-08-29 23:28:13 +04:00
OpenCV Buildbot
ee2bebf5f7
update FFMPEG wrapper binaries
2012-08-29 18:59:21 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
f2a02feffa
Fix Windows build issues
...
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Andrey Kamaev
fdc48abd18
Added ignore for tbb source tarballs
2012-08-06 19:10:55 +04:00
Alexander Smorkalov
d0608c2cd4
Shared libraries for native Android camera updated.
2012-07-31 13:20:36 +04:00
OpenCV Buildbot
8f41f592d7
update FFMPEG wrapper binaries
2012-07-26 19:11:14 +04:00
Andrey Kamaev
c474e27c1d
One more fix for zlib search #1902
2012-07-09 19:16:38 +00:00
Andrey Kamaev
b712bbe9a5
Android: updated default TBB version to 4.0 update 5
2012-07-05 09:22:52 +00:00
Alexander Shishkov
76a644372f
update FFMPEG wrapper binaries
2012-07-02 12:49:18 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Andrey Kamaev
a142a3b78a
Fixed Android Manager build
2012-06-26 08:48:45 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
8748cbc232
Fixed optional dependencies tracking in CMake. Fixed TBB compiler definitions for Android.
2012-06-19 20:08:15 +00:00
Andrey Kamaev
7cccc93bdf
Fixed Android build warnings and few warnings in specific cnfigurations
2012-06-13 13:19:43 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Andrey Kamaev
8720b27d87
Fixed build with TBB for Android
2012-06-08 10:32:51 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
79df8db76f
Fixed recently introduced build problems on some platforms
2012-06-08 06:19:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Alexander Shishkov
bee982b492
update FFMPEG wrapper binaries
2012-06-07 17:25:39 +00:00
Alexander Shishkov
f5c7a73143
update FFMPEG wrapper binaries
2012-06-05 14:00:47 +00:00
Alexander Smorkalov
8c50f3e8ae
Native camera libs rebuilt for bug #1989 fix.
2012-05-29 13:11:08 +00:00
Andrey Kamaev
13a79c753f
Updated to TBB4.0 update 4 for Android build
2012-05-21 19:25:03 +00:00
Andrey Kamaev
def87eae19
Fixed MinGW build after r8358
2012-05-17 20:19:48 +00:00
Andrey Kamaev
3a1f85d4e8
Remerged the 2.4.0 branch
2012-05-02 20:20:14 +00:00
Vladislav Vinogradov
f4b4665940
added VideoReader_GPU
2012-04-18 11:18:25 +00:00
Vladislav Vinogradov
70909738f4
added support of different surface formats to VideoWriter_GPU
...
added key frame handling to ffmpeg wrappers
2012-04-17 11:08:08 +00:00
Vladislav Vinogradov
2bfaf540a1
added VideoWriter_GPU
2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexander Shishkov
bf00eba093
update FFMPEG wrapper binaries
2012-04-09 20:17:58 +00:00
Alexander Shishkov
bf250b6fed
update FFMPEG wrapper binaries
2012-04-09 15:39:02 +00:00
Alexander Shishkov
63a3211314
update FFMPEG wrapper binaries
2012-04-09 15:18:07 +00:00
Alexander Shishkov
302ececf6b
update FFMPEG wrapper binaries
2012-04-09 13:37:13 +00:00
Alexander Shishkov
445537fb53
update FFMPEG wrapper binaries
2012-03-31 15:28:51 +00:00
Andrey Kamaev
72f2523d0f
Fixed ~20 potential errors identified by the MS complier.
2012-03-31 11:09:16 +00:00
Alexander Shishkov
51fa895fca
update FFMPEG wrapper binaries
2012-03-30 14:31:20 +00:00
Alexander Smorkalov
e74be5a65d
Fix for issue #1201 Updated. Focus mode auto was replaced on continuous-video. Libraries were rebuilt.
2012-03-29 05:15:51 +00:00
Alexander Shishkov
98d7b10c16
update FFMPEG wrapper binaries
2012-03-26 13:51:56 +00:00
Vadim Pisarevsky
29077f11f8
got rid of "long double" in OpenCV; ticket #1515
2012-03-26 13:36:47 +00:00
Alexander Shishkov
5ebc183720
update FFMPEG wrapper binaries
2012-03-23 10:53:49 +00:00
Alexander Smorkalov
fa4977dff4
Issue #1201 : auto-focus problem was fixed. Binaries were rebuilt.
2012-03-21 06:52:18 +00:00
Alexander Shishkov
cf9a822aba
update FFMPEG wrapper binaries
2012-03-15 20:40:07 +00:00
Alexander Shishkov
cfe4317efa
update FFMPEG wrapper binaries
2012-03-15 20:31:35 +00:00
Alexander Shishkov
8fcd060dec
update FFMPEG wrapper binaries
2012-03-15 14:45:14 +00:00
Alexander Shishkov
6300215b94
update FFMPEG wrapper binaries
2012-03-15 14:28:29 +00:00
Alexander Shishkov
7b6af8f429
update FFMPEG wrapper
2012-03-15 14:17:12 +00:00
Alexander Shishkov
27ecc999cb
modified readme.txt ( #1609 )
2012-03-05 09:20:52 +00:00
Andrey Kamaev
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
2012-03-03 15:49:23 +00:00
Alexander Shishkov
06a6c5851c
updated libpng: from 1.4.3 to 1.5.9 #1609
2012-03-02 11:01:10 +00:00
Andrey Kamaev
30d5cdef94
Fixed HAVE_UNISTD_H redefinition warning
2012-03-01 11:41:10 +00:00
Andrey Kamaev
368181bf4e
Fixing windows build of libtiff
2012-03-01 09:15:19 +00:00
Andrey Kamaev
e8afcdba0a
More flexible tiff library configuration
2012-03-01 09:01:32 +00:00
Alexander Shishkov
bc4f63e5bd
updated libtiff: from 3.9.5 to 4.0.1 #1609
2012-02-29 15:01:28 +00:00
Andrey Kamaev
4b5d04f475
Fixed tbb hang in Android apps
2012-02-29 08:11:01 +00:00
Andrey Kamaev
c6445e2de1
Slightly improved build of TBB for Android
2012-02-27 06:19:25 +00:00
Andrey Kamaev
22d7e6b741
Scripts for building TBB for Android
2012-02-24 18:16:05 +00:00
Andrey Kamaev
8141a5026c
Refactored cmake for 3rdparty libs
2012-02-24 13:53:22 +00:00
Andrey Kamaev
a8f0c93379
Modified zlib search. Use system zlib on Android by default
2012-02-24 12:23:34 +00:00
Andrey Kamaev
d40721e5c0
Suppressed MSVC warnings in zlib
2012-02-22 20:22:29 +00:00
Andrey Kamaev
19ce8c7f12
#1609 zlib is updated to 1.2.6
2012-02-22 15:52:23 +00:00
Andrey Kamaev
9a88aea697
Eliminated all compiler warnings on Android
2012-02-21 14:07:44 +00:00
Andrey Kamaev
30191dbe95
Fixing ffmpeg dll copying on Windows
2012-02-20 13:43:06 +00:00
Andrey Kamaev
469cc42aee
Fixing ffmpeg dll copying on Windows
2012-02-20 13:12:13 +00:00
Vadim Pisarevsky
716a5d04ab
fixed a few problems detected by Xcode 4.2.1
2012-02-15 19:48:04 +00:00
Andrey Kamaev
a43c47d6cf
First version of native camera support for Android 3.x.x and 4.0.x
2012-01-18 14:33:39 +00:00
Vadim Pisarevsky
3bfd1aa58d
updated opencv_ffmpeg build instructions
2011-08-16 13:15:20 +00:00
Vadim Pisarevsky
f1e8b43c7a
updated opencv_ffmpeg binaries, headers and libs to ffmpeg 0.8.2
2011-08-16 12:27:15 +00:00
Vadim Pisarevsky
6942799669
fixed kmeans center initialization in the case of huge matrices (ticket #1291 ); fixed warinings in libtiff.
2011-08-11 22:27:18 +00:00
Vadim Pisarevsky
217f345e66
updated libtiff to 3.9.5 (ticket #1271 )
2011-08-03 07:51:40 +00:00
Andrey Morozov
d87a56a639
added support new ffmpeg (0.8.X)
2011-07-29 14:17:42 +00:00
Andrey Kamaev
ac7e16fdf6
Fixed camera output format handling
2011-07-25 12:32:33 +00:00
Andrey Kamaev
8ab16f66a8
Fixing native camera for Android
2011-07-25 11:16:32 +00:00
Vadim Pisarevsky
b33224f0b6
merged the latest fixes in 2.3 to trunk
2011-07-04 16:18:12 +00:00
Andrey Kamaev
b43ae03328
* Install path share/opencv is renamed to share/OpenCV.
...
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
2011-06-27 13:59:03 +00:00
Andrey Kamaev
c1940b4ec7
Modified install layout for Android
2011-06-24 15:40:27 +00:00
Vadim Pisarevsky
d4fbb2c4fb
added missing bdatypes.h
2011-06-23 11:57:27 +00:00
Andrey Kamaev
206aa50f86
Added Android native camera module
2011-06-16 18:00:41 +00:00
Alexander Shishkov
c5787c5262
added missing audevcod.h
2011-06-16 14:28:29 +00:00
Vadim Pisarevsky
1987de1d77
added missing errors.h
2011-06-16 13:21:22 +00:00
Vadim Pisarevsky
498451872b
another small correction to build cap_dshow.cpp in highgui
2011-06-16 10:11:43 +00:00
Vadim Pisarevsky
17b18de531
added missing evcode.h; made videoinput optional (ticket #1142 )
2011-06-16 09:51:34 +00:00
Vadim Pisarevsky
412e7a835f
videoInput is now integrated into highgui and built from sources
2011-06-15 22:59:41 +00:00
Vadim Pisarevsky
22970b8270
fixed multiple GCC warnings on Ubuntu 11.04
2011-06-14 12:03:34 +00:00
Alexander Shishkov
bce15cb6dd
added new version of ffmpeg binary for compilation on Mingw64/MSVC64
2011-06-14 08:06:55 +00:00
Anatoly Baksheev
8f4c7db3f6
~40 warnings under VS2008
...
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
2011-06-11 17:24:09 +00:00
Anatoly Baksheev
69f28ef65c
solution folder flag disabled by default
2011-05-17 09:40:06 +00:00
Anatoly Baksheev
c49dc37761
[+] added use_folders cmake feature if cmake version is greater then 2.8.0
...
[~] fixed warning in featuers2d under windows (can't generate assignment operator)
2011-05-11 13:37:20 +00:00
Vadim Pisarevsky
23a9b7bb9c
fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920
2011-04-30 19:29:26 +00:00
Vadim Pisarevsky
5f6beac5d5
fixed libpng build on Windows
2011-04-26 16:03:02 +00:00
Vadim Pisarevsky
417663c062
moved image codecs' headers to the respective subdirectories; allow the user to use system zlib.
2011-04-26 15:50:24 +00:00
Vadim Pisarevsky
6985540744
moved image codecs' headers to the respective subdirectories; allow the user to use system zlib.
2011-04-26 15:46:15 +00:00
Vadim Pisarevsky
4aaa2700f6
do not use Lapack anymore
2011-04-25 21:50:25 +00:00
Andrey Kamaev
68534d70f3
Merged android-experimental branch back to trunk.
2011-04-06 14:31:03 +00:00
Anatoly Baksheev
0747f2d863
1) NPP_staging as sources. Binaries removed.
...
2) NVidia tests for GPU
3) FD sample that uses NVidia's interface.
2011-02-04 15:15:25 +00:00
Anatoly Baksheev
cb63046dcf
gpu face detetcion:
...
1) fixed bug with error codes (enum NppStStatus) shift.
2) added some asserts
2011-01-17 11:32:38 +00:00
Anatoly Baksheev
1a94186195
First version of CascadeClassifier_GPU.
...
Only for VS2008 now.
Sample for it.
new NPP_staging for VS2008 only
2011-01-13 13:04:00 +00:00
Vadim Pisarevsky
97d9a672cc
moved gtest to modules; added some gtest-based tests
2010-12-28 16:24:23 +00:00
Anatoly Baksheev
9dd4a22a5e
temporary added NPP_staging, functionality from the library will be moved to NPP with next release.
2010-12-17 15:41:26 +00:00
Vadim Pisarevsky
9dfb15dbbd
some more fixes for the static library configuration
2010-12-05 02:10:59 +00:00
Vadim Pisarevsky
0de9c9fd3c
opencv_zlib renamed back to zlib; make static libs work on Windows
2010-12-05 01:19:36 +00:00
Vadim Pisarevsky
8b4cb1d99c
make OpenCVConfig.cmake usable in the case of static libs
2010-12-04 23:02:36 +00:00
Vadim Pisarevsky
3163cfb845
added 16-bit tiff support, enabled LZW codec in tiff (tickets #588 , #590 )
2010-11-21 21:50:45 +00:00
Vadim Pisarevsky
5f15cf6430
in the case of GCC always build jcdctmgr.c with "-O1" (ticket #519 )
2010-11-20 12:59:46 +00:00
Marius Muja
16b1f61c83
Updated FLANN to version 1.5
2010-10-12 19:47:50 +00:00
Ethan Rublee
a732082526
modding the 3rdparty CMakeLists.txt to allow for android compilation using cmake
...
Basically just adding lines at top of CMakeLists that alter behavior if ANDROID is set to
true.
2010-09-22 02:01:54 +00:00
Vadim Pisarevsky
93deaac645
added Google Test framework
2010-09-21 15:50:22 +00:00
Vadim Pisarevsky
fe8e4609f9
added Google Test framework
2010-09-21 15:49:56 +00:00
Vadim Pisarevsky
a09b5d1a23
flattened flann directory structure; patched zlib to build with Android NDK
2010-09-14 18:13:09 +00:00
Vadim Pisarevsky
39918a2755
eliminated freeze in SVD.
2010-09-14 15:13:10 +00:00
Vadim Pisarevsky
652d0c2a54
fixed accuracy problem in cv::invert() (Cholesky method)
2010-09-14 13:56:47 +00:00
Vadim Pisarevsky
2154a0ce63
fixed ffopencv build with Mingw
2010-09-02 14:01:04 +00:00
Vadim Pisarevsky
ba2b812886
removed slamch.c/dlamch.c -specific GCC options, since the current implementation is very simple and relies on IEEE754 standard, rather than the actual machine behavior.
2010-08-31 14:17:03 +00:00
Vadim Pisarevsky
bf94db5b16
fixed 2 bugs in the recently modified Lapack functions
2010-08-31 12:39:00 +00:00
Vadim Pisarevsky
e48a456d48
optimized lapack' SVD for noticeably better performance on small matrices
2010-08-30 16:37:22 +00:00
Vadim Pisarevsky
40273e6c4f
another stdint.h -> msc_stdint.h fix
2010-08-06 23:46:11 +00:00
Vadim Pisarevsky
37f47c9fa3
stdint.h -> msc_stdint.h
2010-08-06 11:07:03 +00:00
Vadim Pisarevsky
26c6b955a8
updated ffmpeg to 0.6.0
2010-08-05 17:24:41 +00:00
Vadim Pisarevsky
2f2f06b925
rewrote color conversion functions; added sRGB<->CIE Lab/Luv conversion; added RGB<->YUV conversion; improved [s]RGB->Lab conversion speed
2010-07-27 14:10:14 +00:00
Vadim Pisarevsky
992eace79a
fixed some warnings from xcode
2010-07-16 18:28:46 +00:00
Vadim Pisarevsky
641c2ba83e
repaired build on mac after libtiff update
2010-07-16 15:04:34 +00:00
Vadim Pisarevsky
f78a3b4cc1
updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings
2010-07-16 12:54:53 +00:00
Vadim Pisarevsky
576adb434d
removed embedded (obsolete) OpenEXR files; repaired OpenEXR bindings
2010-07-04 12:32:31 +00:00
Vadim Pisarevsky
b94e09bfeb
renamed cv::flann to cv::cvflann to avoid name conflicts
2010-05-21 20:37:05 +00:00
Vadim Pisarevsky
127d6649a1
"atomic bomb" commit. Reorganized OpenCV directory structure
2010-05-11 17:44:00 +00:00