mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,954 Commits 6 Branches 126 Tags 3 GiB
f52cac9d47
Commit Graph

301 Commits

Author SHA1 Message Date
Alexander Smorkalov
08a0e1c91b TBB support for WinRT fixed. 
Development release of TBB with WinRT support added;
TBB.dll is placed in bin folder now.
 2013-06-25 03:35:54 -07:00
Alexander Smorkalov
e3577c2f58 Build with dev release of TBB enabled. 2013-06-24 02:45:21 -07:00
Roman Donchenko
029fce10c9 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
 2013-05-21 17:19:23 +04:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Kamaev
2665c39a0d Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
Alexander Smorkalov
8606ee4beb Front/Back camera semantic support added to Android VideoCapture back-end. 2013-04-24 10:56:16 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
AoD314
740941c8b8 update libwebp up to 0.3.0 2013-04-02 15:22:10 +04:00
Andrey Kamaev
ec15d6f383 Merge pull request #690 from berak:master 2013-03-22 19:35:17 +04:00
berak
d32af86e75 Update CMakeLists.txt 
exclude IlmImf/b44ExpLogTable.cpp from the build,

it's used originally to generate IlmImf/b44ExpLogTable.h, but not nessecary for the library.(probably only here for documentation

when included with static linking it introduces a problem with multiple definitions of main()
 2013-03-22 09:31:40 +01:00
Alexander Smorkalov
429cd85b46 More accurate guards for WinRT features in CMake. 2013-03-20 12:21:29 -07:00
Alexander Smorkalov
3d594c70ff Multiple Windows RT fixes 
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
 2013-03-19 17:46:01 -07:00
Andrey Kamaev
7e50d3e571 Fixed MSVC warnings 2013-03-13 11:34:04 +04:00
AoD314
fd44322b4f added CMakeLists.txt for build WebP 2013-03-07 19:31:02 +04:00
AoD314
e7cb317c7d added cpu-features for WebP 2013-03-07 19:07:43 +04:00
AoD314
500b7318be added WebP library 2013-03-07 19:07:31 +04:00
Andrey Kamaev
0b8a6da817 Merge branch '2.4' 2013-02-22 17:33:30 +04:00
OpenCV Buildbot
e6dd4e840d Update FFMPEG wrapper binaries 2013-02-22 16:56:01 +04:00
Andrey Kamaev
262fc929aa Merge branch '2.4' 2013-02-18 15:35:42 +04:00
OpenCV Buildbot
50d3e565c5 Update FFMPEG wrapper binaries 2013-02-14 18:39:24 +04:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Andrey Kamaev
4045e6e588 Update tbb to version 4.1 update 2 2013-02-08 18:45:24 +04:00
Alexander Smorkalov
192ee15520 Code review notes fixed; 
HardFP and SoftFP toolchains joined to one;
RPATH skiping added.
 2013-02-08 12:42:03 +04:00
Alexander Smorkalov
b81f0887f0 Carma board support fixed. 2013-02-06 14:47:42 +04:00
Alexander Smorkalov
4e243e1759 TBB build for arm linux fixed. Processors count detected correctly. 2013-02-06 14:43:57 +04:00
Alexander Smorkalov
3ed99b7700 Code review notes applied. 
Toolchain for arm hardfp added.
 2013-02-06 14:43:57 +04:00
Alexander Smorkalov
ffb9da14fb TBB build defines for Linux added. 2013-02-06 14:43:57 +04:00
Alexander Smorkalov
7882aba7af TBB download and build option enabled for non Android platfroms. 2013-02-06 14:43:57 +04:00
Andrey Kamaev
9e3570260b Update libjpeg to "Version 9 13-Jan-2013" 2013-01-14 11:07:49 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Andrey Kamaev
24af691843 Merge pull request #168 from asmorkalov:android_42_camera_fix 2012-11-21 14:50:53 +04:00
Alexander Smorkalov
aa4e6a8a83 Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed; 
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
 2012-11-21 11:37:29 +04:00
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