Alexander Alekhin
60f3ca458a
3rdparty: remove jinja2 source code
...
It used for Matlab binding only
2017-06-11 05:18:15 +03:00
Maksim Shabunin
a426a65b41
TBB: fix build on ARM
2017-06-05 16:36:14 +03:00
Vadim Pisarevsky
ee257ffe9e
Merge pull request #8455 from terfendail:ovxhal_skipsmall
2017-05-26 12:10:18 +00:00
Ryuhei Mori
bb3a416320
Fix cpu features detection on android
2017-05-19 21:19:13 +08:00
Vadim Pisarevsky
5950431e73
Merge pull request #8602 from alalek:ffmpeg_update
2017-05-03 13:01:55 +00:00
Pavel Vlasov
11c2ffaf1c
Update for IPP for OpenCV 2017u2 integration;
...
Updated integrations for:
cv::split
cv::merge
cv::insertChannel
cv::extractChannel
cv::Mat::convertTo - now with scaled conversions support
cv::LUT - disabled due to performance issues
Mat::copyTo
Mat::setTo
cv::flip
cv::copyMakeBorder - currently disabled
cv::polarToCart
cv::pow - ipp pow function was removed due to performance issues
cv::hal::magnitude32f/64f - disabled for <= SSE42, poor performance
cv::countNonZero
cv::minMaxIdx
cv::norm
cv::canny - new integration. Disabled for threaded;
cv::cornerHarris
cv::boxFilter
cv::bilateralFilter
cv::integral
2017-04-25 15:53:12 +03:00
Alexander Alekhin
f1c8094f5f
Merge pull request #8575 from lupustr3:pvlasov/icv2017u2_initial_update
2017-04-21 10:55:29 +00:00
Pavel Vlasov
35c7216846
IPP for OpenCV 2017u2 initial enabling patch;
2017-04-20 20:26:30 +03:00
Alexander Alekhin
a8a1838615
update FFmpeg Windows wrapper
...
ffmpeg 3.2.1 -> 3.3
libvpx 1.6.0 -> 1.6.1
2017-04-18 22:12:34 +03:00
Vitaly Tuzov
9dc36a1ece
Tuned restrictions for Canny, Warp, FAST, Accumulate and Convolution OpenVX HAL calls on small images
2017-04-14 13:20:25 +03:00
Vitaly Tuzov
d873fe66ab
Fixed size estimation for copyFrom/To vector in vx_matrix and vx_convolution wrappers
2017-04-13 17:45:42 +03:00
Vitaly Tuzov
4c0d833dec
Disabled vxuConvolution call for sepFilter evaluation
2017-04-11 15:57:20 +03:00
Vitaly Tuzov
0f1a56da7c
Changed restrictions for OpenVX HAL calls on small images
2017-04-09 01:17:57 +03:00
Vitaly Tuzov
bf62dca45a
Extended restrictions for OpenVX HAL calls on small images
2017-04-06 18:17:34 +03:00
Vitaly Tuzov
bf5b7843e8
Extended set of OpenVX HAL calls disabled for small images
2017-04-06 18:17:32 +03:00
Vitaly Tuzov
62fab57c3e
Tune OpenVX HAL usability checks to distinguish multiplication and color conversion kernels
2017-04-06 18:17:30 +03:00
Vitaly Tuzov
9620cb550d
Calls to OpenVX HAL disabled for images less than FullHD
2017-04-06 18:17:28 +03:00
Alexander Alekhin
a7de4aca6a
cmake: update ocv_download
...
- more aggressive cache for files under CMAKE_BINARY_CACHE
* don't re-read files MD5
* don't repack archives
- add support for ENV{OPENCV_DOWNLOAD_PATH}
- added ID parameter as project/group identifier
- non-flat .cache directory (based on ID)
- download message prefix based on ID
- more detailed logging via ocv_download_log() macro
- force .gitignore file for .cache folder (with '*' pattern)
2017-03-30 19:36:33 +00:00
Maksim Shabunin
e72d353b45
Download cache
2017-03-24 16:19:56 +03:00
Vitaly Tuzov
c5eb3dfecb
Restricted OpenVX HAL separable filter implementation to 3x3 kernel size
2017-03-23 20:23:56 +03:00
Vitaly Tuzov
5ebf066dd5
Updated OpenVX detector and wrappers to handle Reference attribute names change
2017-03-22 16:50:38 +03:00
Vadim Pisarevsky
d00561d396
Merge pull request #8217 from terfendail:ovx_halheader
2017-03-02 11:17:54 +00:00
Vitaly Tuzov
61404dd2ac
imgproc HAL header inclusion moved
2017-02-27 10:56:33 +03:00
Vitaly Tuzov
9a4b5a4545
OpenVX calls updated to use single common OpenVX context per thread
2017-02-21 16:08:23 +03:00
Alexander Alekhin
1304ad1e12
Merge pull request #8160 from ilijapuaca:master
2017-02-14 13:03:09 +00:00
Alexander Alekhin
28f9ce4e33
cmake: cleanup MSVC checks
2017-02-10 15:29:12 +03:00
Ilija Puaca
1b842c4762
Updated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp
2017-02-09 23:35:27 +01:00
Vitaly Tuzov
b6561ce57d
Fixed addressing structure population for integral image output
2017-02-03 13:54:22 +03:00
Vitaly Tuzov
be7d060ea4
Merge pull request #7802 from terfendail:ovxhal_wrappers_migration
...
* OpenVX HAL updated to use generic OpenVX wrappers
* vxErr class from OpenVX HAL replaced with ivx::WrapperError
* reduced usage of vxImage class from OpenVX HAL replaced with ivx::Image
* vxImage class rewritten as ivx::Image subclass that calls swapHandle prior release
* Fix OpenVX HAL build
* Fix for review comments
2016-12-21 15:19:06 +02:00
apavlenko
2312131e27
moving HAL-related CMakeLists.txt to 'hal' sub-dir
2016-12-19 17:30:19 +03:00
apavlenko
bbfbdd9da1
moving hal to a separate folder
2016-12-19 17:30:19 +03:00
Alexander Alekhin
c9237a6f48
cmake: unpack IPPICV into binary directory
2016-12-16 18:43:54 +03:00
Alexander Alekhin
9c7088d95f
Merge pull request #7851 from terfendail:ovx_imagespace
2016-12-16 10:37:04 +00:00
Alexander Alekhin
a615d79f2d
Merge pull request #7768 from terfendail:ovx_remap
2016-12-16 10:33:58 +00:00
Rostislav Vasilikhin
45d3286168
wrappers for vx_pyramid added
2016-12-15 15:00:26 +03:00
Alexander Alekhin
5592142511
Merge pull request #7831 from terfendail:ovx_array_update
2016-12-14 14:08:47 +00:00
Vitaly Tuzov
f8b4d28745
Added OpenVX based processing to remap
2016-12-14 16:53:04 +03:00
Vitaly Tuzov
138f0cbf3c
Added wrapper for IMAGE_SPACE attribute setter
2016-12-14 15:40:50 +03:00
Vitaly Tuzov
2c89b39eee
Added OpenVX based processing to calcHist
2016-12-13 18:33:02 +03:00
Vitaly Tuzov
c447e5f615
Added vxTruncateArray wrapper to ivx::Array
2016-12-09 17:48:06 +03:00
apavlenko
1e2ddc30b1
Canny via OpenVX, Node wrapper extended (query/set attribute), some naming fixes
2016-12-09 14:53:06 +03:00
Alexander Alekhin
5cc2d7ad7c
Merge pull request #7771 from alalek:ffmpeg_update
2016-12-08 15:22:00 +00:00
Rostislav Vasilikhin
cb46946d34
Merge pull request #7782 from savuor:fix/ivx_types
...
Several fixes for OpenVX wrappers (#7782 )
* Several fixes added to ivx.hpp:
* `#include <VX/vxu.h>`
* `vx_keypoint_t` support added
* type check fixed
* fixed Node::create() for >6 args in c++98
* fixed Array::copyFrom() if array is empty
* type check changed; Array::addItem methods changed
2016-12-06 18:08:33 +02:00
Vadim Pisarevsky
b87cee8b9a
Merge pull request #7454 from terfendail:ovxhal_integral
2016-12-02 15:25:02 +00:00
Vadim Pisarevsky
537db2d53f
Merge pull request #7598 from terfendail:ovx_lut
2016-12-02 15:22:06 +00:00
Alexander Alekhin
39ca6a0137
ffmpeg: update Windows binaries
...
Versions:
- ffmpeg 3.2.1 (was 3.1.3)
- openh264 1.6.0 (was 1.5.0)
- libvpx 1.6.0 (was 1.5.0)
2016-12-02 15:47:15 +03:00
Vitaly Tuzov
ced81f72bc
Added OpenVX based processing to LUT
2016-12-02 14:36:47 +03:00
Alexander Alekhin
49194023b5
ffmpeg: remove compatibility glue code
2016-12-02 14:18:40 +03:00
mshabunin
2e8b9b1891
Fixed TBB build on Android armeabi
2016-12-02 12:24:42 +03:00
Alexander Alekhin
3ae1990727
Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup
2016-12-01 20:24:05 +00:00
Vadim Pisarevsky
b0d2217c65
Merge pull request #7515 from terfendail:ovxhal_graytobgr
2016-12-01 17:56:51 +00:00
Vadim Pisarevsky
e623e710be
Merge pull request #7597 from terfendail:ovx_threshold
2016-12-01 17:53:38 +00:00
Vadim Pisarevsky
ddc5155a85
Merge pull request #7677 from terfendail:ovx_minmaxloc
2016-12-01 17:42:18 +00:00
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
2016-12-01 19:33:27 +03:00
Vadim Pisarevsky
817a17b218
Merge pull request #7767 from mshabunin:icl-support
2016-12-01 16:30:42 +00:00
Maksim Shabunin
19959cbfc9
Fixed Intel C++ 17 build in VS2015
2016-12-01 18:02:50 +03:00
mshabunin
695c518384
Updated TBB search script and code checks
2016-12-01 16:58:38 +03:00
Vitaly Tuzov
179a6e0cca
OpenVX wrappers linkage fix
2016-11-30 11:25:45 +03:00
Vitaly Tuzov
78b80b6abd
Added wrappers for OpenVX context attributes and setter for convolution scale attribute ( #7732 )
2016-11-29 09:34:46 -07:00
Vitaly Tuzov
0cd3788624
Added OpenVX based processing to threshold
2016-11-29 15:35:52 +03:00
Vitaly Tuzov
e9cc0f6a4c
Added OpenVX based processing to minMaxLoc
2016-11-29 15:33:48 +03:00
Vitaly Tuzov
ff2747dff5
Added wrappers for OpenVX context attributes and setter for convolution scale attribute
2016-11-28 13:02:36 +03:00
Vitaly Tuzov
8098e5b045
Added OpenVX based implementation for Gray2BGR conversion HAL API
2016-11-25 20:59:20 +03:00
apavlenko
f5f91ed7f6
eliminating conflict with ivx.hpp
2016-11-24 18:48:51 +03:00
Vitaly Tuzov
12e0bc0fe7
Added wrappers for vx_matrix and vx_convolution ( #7651 )
2016-11-24 15:02:12 +03:00
apavlenko
1c9262dce4
hiding silly warnings
2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin
fa8add8686
compilation fixed for C++98
2016-11-22 16:49:46 +03:00
Andrey Pavlenko
bfecea489e
warnings in ivx.hpp fixed
...
* fixing 1.0.1
* fixing build without c++11
* hiding warnings
2016-11-22 16:49:46 +03:00
Andrey Pavlenko
289d879d48
build fixes for openvx-1.0.1 and c++03
...
* fixing 1.0.1
* fixing build without c++11
2016-11-22 16:49:46 +03:00
apavlenko
e8d2aad978
sugar for single plane images
2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin
9032a7ab81
minor fixes in samples and ivx.hpp
2016-11-22 16:49:46 +03:00
Vadim Pisarevsky
81fc6b3fde
Merge pull request #7621 from terfendail:ovxhal_resizefix
2016-11-22 13:39:20 +00:00
Alexander Alekhin
30cdcfa554
warnings
2016-11-18 14:08:53 +03:00
Vitaly Tuzov
e6f2729c7a
Replaced magic constant in large image handling check
2016-11-16 17:55:04 +03:00
Andrey Pavlenko
1f1dc42534
Merge pull request #7681 from apavlenko:ivx-docs
...
OpenVX C++ wrappers docs (#7681 )
* adding wrapper headers to the project to see them in IDE project explorer
* readme
* doxygen: toplevel brief-s
* more doxygen
* more doxygen
2016-11-16 17:05:08 +03:00
Alexander Alekhin
ad888c80cf
Merge pull request #7643 from alalek:libpng_aarch64
2016-11-14 13:38:44 +00:00
Vitaly Tuzov
9eac0f0575
Completely disabled OpenVX based implementation of resize HAL API
2016-11-10 20:55:28 +03:00
Vitaly Tuzov
88ea9f5dd7
Fix for OpenVX based implementation of resize HAL API
2016-11-10 20:55:27 +03:00
Vitaly Tuzov
850d12ae69
Completely disabled OpenVX based implementation of warp HAL API
2016-11-10 20:55:26 +03:00
Vitaly Tuzov
cd1b324e5e
Fix for OpenVX based implementation of wrapAffine HAL API
2016-11-10 20:55:26 +03:00
Vitaly Tuzov
ca1ce5fa5c
Fix for large image handling in OpenVX based implementation of HAL API
2016-11-10 20:55:25 +03:00
Vadim Pisarevsky
67c404632a
Merge pull request #7556 from terfendail:ovxhal_101compl
2016-11-10 15:56:01 +00:00
Alexander Alekhin
a50bc7d824
cmake: fix libpng for AARCH64
2016-11-10 17:50:52 +03:00
Andrey Pavlenko
bdf661538d
Merge pull request #7550 from apavlenko:ivx
...
C++ wrappers over OpenVX 1.x API (#7550 )
* initial commit
* fixing missing swap(refcount) bug
* removing dead code
* fixinf identation
* splitting c++98 and external refcount definitions
* fixing formatToMatType
* using vector instead of initializer_list for consistency with c++98 API
* IVX_HIDE_INFO_WARNINGS
* just in case a compiler doesn't do this
* removing copy functionality from ImagePatch, Image can be used for that
* stricter type checks
2016-11-10 14:43:08 +03:00
Vitaly Tuzov
26899bb345
OpenVX 1.0.1 compliance update
2016-11-10 14:04:02 +03:00
Tomoaki Teshima
2a91453ef1
brush up divSaturate of carotene
...
* use rounding to nearest same as divSaturateQ
2016-10-23 08:51:25 +09:00
Tomoaki Teshima
971a7c88dc
let the performance test pass on ARM
...
* use round-to-neaerest in div of carotene
2016-10-20 10:44:34 +09:00
Vitaly Tuzov
058f93d9e8
OpenVX based implementation for integral image HAL API.
2016-10-17 11:47:59 +03:00
Maksim Shabunin
18bd47c9b9
Merge pull request #7367 from terfendail:ovxhal_imgprocfix
2016-10-14 09:49:28 +00:00
mshabunin
81938af5d0
Added support for OpenVX 1.0, updated cmake part, minor fixes
2016-10-04 15:31:54 +03:00
Vitaly Tuzov
72066a5111
Fix for OpenVX-based implementation of HAL multiplication API
2016-10-04 15:31:22 +03:00
Vitaly Tuzov
ba23dec78a
Fix for OpenVX implementation of color conversion HAL API
2016-09-29 19:24:45 +03:00
Alexander Alekhin
6970469299
Merge pull request #7347 from tomoaki0705:fixClang3rdparty
2016-09-28 12:10:40 +00:00
Tomoaki Teshima
c0216c518f
let the build available using clang
...
* add if section for clang
2016-09-28 09:06:45 +09:00
Vitaly Tuzov
25b014691f
Fix for OpenVX implementation of morphology HAL API
2016-09-27 19:05:35 +03:00
Vitaly Tuzov
91002393a5
Remove redundant constant definitions
2016-09-26 17:13:18 +03:00
Vadim Pisarevsky
473dba1189
Merge pull request #7208 from terfendail:openvx_hal_impl
2016-09-13 10:15:12 +00:00
Vadim Pisarevsky
c1024b112e
Merge pull request #7259 from alalek:issue_7232
2016-09-09 12:08:40 +00:00
Vitaly Tuzov
311a232a09
Added color conversion HAL API functions implemented as immediate mode OpenVX calls.
2016-09-08 20:40:51 +03:00
Alexander Alekhin
186f6977bc
ffmpeg: update Windows binaries (ffmpeg 3.1.3)
2016-09-08 19:54:02 +03:00
Vitaly Tuzov
14fd22e664
Added morphology and channel merge HAL API functions implemented as immediate mode OpenVX calls.
2016-09-08 19:47:03 +03:00
Alexander Alekhin
d402bac69d
cmake: fix libpng build on MSVS2012
2016-09-08 19:41:11 +03:00
Vitaly Tuzov
fb3140ceef
Fixed compilation. Changed value returned by functions called with unsuported parameters.
2016-09-08 18:55:27 +03:00
Vitaly Tuzov
5ec47299e2
Fixed warpings, added border mode support to warps and filter. Added morphology HAL API functions implemented as immediate mode OpenVX calls.
2016-09-08 18:55:26 +03:00
Vitaly Tuzov
c9229f7543
Resize, Warp and Filter HAL API functions are implemented as immediate mode OpenVX calls
2016-09-08 18:55:25 +03:00
Vitaly Tuzov
4170c97984
Several HAL API functions are implemented as immediate mode OpenVX calls
2016-09-08 18:55:25 +03:00
Maksim Shabunin
c16f96cb5b
Merge pull request #7221 from terfendail:sepfilter_vec_kernel
2016-09-06 20:41:28 +00:00
Alexander Alekhin
d102ea96c0
Merge pull request #7210 from mshabunin:fix-warnings
2016-09-02 12:50:45 +00:00
Vitaly Tuzov
f773f45d90
Updated HAL interface for separable filters to address that both kernels are vectors.
2016-09-02 14:42:01 +03:00
Maksim Shabunin
1ac1e5be08
Merge pull request #7174 from guycook:android-libcpp
2016-09-02 09:54:52 +00:00
Matthew Cook
e06a9e9009
Fix android libc++ build
2016-09-02 10:25:46 +12:00
Maksim Shabunin
dc704d77ac
Fixed several GCC 5.x warnings
2016-09-01 15:44:01 +03:00
Vadim Pisarevsky
2b6da67e17
Merge pull request #7093 from mshabunin:openvx_hal
2016-08-26 11:22:52 +00:00
Maksim Shabunin
ae3dfa80db
OpenVX HAL
2016-08-25 16:08:45 +03:00
kurenai
b0a3b42287
Update libpng to 1.6.24
...
Enable SSE optimization
2016-08-25 10:28:20 +08:00
Vadim Pisarevsky
6b09ada5d4
Merge pull request #6899 from alalek:ffmpeg_update
2016-07-21 07:31:11 +00:00
kurenai
2dec662ebf
Fix error when compiling with clang
2016-07-19 18:05:07 +08:00
Alexander Alekhin
99b0845cd5
ffmpeg windows wrapper 2.7.1=>3.1.1, openh264 1.4.0=>1.5.0, vpx 1.5.0
2016-07-15 16:31:57 +03:00
Alexander Alekhin
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
Alexander Alekhin
9ed1474340
Merge pull request #6790 from terfendail:linearresize_accuracy
2016-07-11 10:02:06 +00:00
Vitaly Tuzov
04c7d03188
Improved Carotene library linear resize evaluation precision and enabled it as HAL implementation.
2016-07-08 14:47:30 +03:00
Vitaly Tuzov
e3f5bbd217
Removed unnecessary check for Android API level and unused flags.
2016-07-08 13:31:26 +03:00
Elif Albuz
8f91529edf
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
2016-07-04 23:56:15 -07:00
Vitaly Tuzov
eaec95dcf2
Update TBB
2016-06-23 11:48:48 +03:00
Maksim Shabunin
ba3b1de93f
Updates for XCode 7.3
2016-04-17 20:21:29 +03:00
KeySecure
e6ac2ca3c9
make Xcode 7.2 happy.
2016-01-13 20:19:19 +08:00
Alexander Alekhin
c2a86a6a84
NEON flags fix
2015-12-11 12:06:24 +03:00
Alexander Alekhin
dbc0aa6c7b
libpng: re-apply patch
2015-12-11 12:06:24 +03:00
Alexander Alekhin
0831bd3990
libpng: update 1.6.19 - November 12, 2015
2015-12-11 12:06:24 +03:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d998578f9c#3236 : 5947519#3190
fix blobdetector
PR #3562 (part): 82bd82e#3604 (part): 091c7a3#3792 : afdf319#3893 : 122b9f8#5490 : ec5244a#5491 : 0d5b739#5574
PR #5202
2015-12-08 10:24:54 +03:00
Alexander Alekhin
84f9578fbb
ippicv: update 20151201 (9.0.1)
2015-12-02 11:10:05 +03:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Alexander Alekhin
750162acb3
move IPPICV binaries to GitHub opencv_3rdparty repository
2015-09-25 16:50:50 +03:00
Dikay900
274b361ca3
proposed change by psyill
2015-09-12 12:19:44 +02:00
Ashley Stacey
d8d78b4a98
Fix pdb file generation on Windows for CMake versions after 3.1.0.
...
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
2015-08-17 10:28:22 +10:00
Maksim Shabunin
ef16650f5c
Android SDK build Initial
2015-08-12 11:31:35 +03:00
Maksim Shabunin
14d7b38613
Fixing GCC 4.9 warnings
2015-07-22 16:12:31 +03:00
Alexander Alekhin
56ad207d37
update ffmpeg wrapper binaries
...
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.
FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
2015-07-03 19:13:15 +03:00
Alexander Alekhin
ca8312b0b3
remove legacy intermediate unused files
2015-07-01 16:46:54 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
2015-06-09 15:53:08 +03:00
Maksim Shabunin
7ee79b73f6
AndroidMgr: fixed package build
2015-06-03 19:01:48 +03:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
2015-04-07 16:44:26 +03:00
Ashod Nakashian
54ab3137d5
Simplified temp filename generation.
2015-04-03 21:01:44 -04:00
Ashod Nakashian
6fd2fdc2e6
Jasper unit-tests and removed a superfluous assertion.
2015-04-03 21:01:43 -04:00
Ashod Nakashian
03ea24f298
Fix for decoding large Jp2 images on Windows.
...
On Windows, the tmpnam function returns a temp filename in the current directory, which has a prepended backslash '\\'.
This subsequently fails the open function.
This patch creates a proper temp filename in the temp folder and makes unlike work by opening the file as short-lived.
2015-04-03 21:01:42 -04:00
Maxim Kostin
412a2aa4ab
Added support for 'imgcodecs' module:
...
- Resolved GET_ENV and input type incompatibility
- Made libjpeg compile for WINRT. So does imgcodecs module.
- Updated .gitignore (log, tlog)
2015-03-31 16:31:37 +03:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Ilya Lavrenov
c5a80193a8
aarch64 support
2015-02-26 19:43:32 +03:00
Alexander Smorkalov
0f263e125b
Full AARCH64 support with NEON and new CUDA toolkit.
2014-12-28 11:51:33 +03:00
Alexander Smorkalov
82bd82e2f8
TBB updated to 4.3u2. Fix for aarch64 support.
2014-12-28 11:49:25 +03:00
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
Andrey Kamaev
9582c33eab
Fix build for Android arm64-v8a
2014-12-09 12:06:56 +03:00
Alexander Alekhin
5d213582f7
update IPPICV package
2014-11-05 13:26:23 +03:00
Maksim Shabunin
09fb7512ed
Fixed iOS framework compilation warnings
2014-10-27 15:28:21 +03:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Alexander Smorkalov
77294855d7
Android native camera rebuilt after sources update.
2014-07-30 14:52:01 +04:00
Vadim Pisarevsky
9a58b1a3a0
Merge pull request #2925 from BloodAxe:osx-framework-script
2014-07-19 18:04:15 +00:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Ievgen Khvedchenia
92ead5fab3
Fix cmake to build OpenCV framework on OSX
2014-07-01 22:31:57 +03:00
Alexander Alekhin
0f7fbe4458
icv: enable public IPPICV packages
2014-05-23 13:43:31 +04:00
Alexander Alekhin
6f798b1ba7
icv: android x86 build
2014-05-13 18:28:13 +04:00
Alexander Alekhin
5658ba0002
icv: update package
2014-04-29 15:35:27 +04:00
Alexander Alekhin
047d285b7d
ICV: added package downloader
2014-04-11 14:19:18 +04:00
Roman Donchenko
e055b68ceb
Merge pull request #2403 from hbristow:issue-3451
2014-03-28 12:13:14 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Alexander Smorkalov
0dba5bdc4a
Multiple fixes in camera.
...
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
2014-03-21 17:26:05 +04:00
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
2014-03-21 14:16:03 +04:00
Hilton Bristow
72d5609a36
Merged upstream master
2014-03-04 11:14:03 +10:00
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Stuart Cunningham
1454843b81
Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro
2014-02-14 16:16:17 +11:00
Stuart Cunningham
55b9c0374c
Fix cmake detection of build platform endianness
...
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
2014-02-13 22:59:30 +11:00
Stuart Cunningham
8bbce0a2a2
Fix reading of 16-bit TIFF images on big endian host.
...
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().
Added test where both big and little endian TIFF files are read using imread().
Fixed build of 3rdparty libtiff on big endian hosts.
Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
2014-02-12 21:21:06 +11:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Roman Donchenko
e45fd939c2
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
2014-01-20 15:10:19 +04:00
Dinar Valeev
711f07a34c
Use __vector instead of vector as suggests Eigen
...
This fixes build on PowerPC where Eigen unsets vector, bool and pixel
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
2014-01-16 21:53:49 +01:00
ahb
49dfa5a17f
Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
...
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83
The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
Adjust all other occurrences of "defined(linux)" as well.
2014-01-13 16:09:42 +01:00
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
2013-12-30 16:48:45 +04:00
Hilton Bristow
7cad2c6788
fixed relative imports in Jinja for python3
2013-12-29 17:10:52 +10:00
Andrey Pavlenko
734bf8babd
removing legacy stuff
2013-12-26 15:49:12 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Roman Donchenko
d8a4d3a2eb
Merge pull request #1921 from SpecLad:defined-msc-ver
2013-12-04 15:46:56 +04:00
Roman Donchenko
11c7053b0f
Fixed a -Wundef warning in cl_platform.h.
...
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee
2013-12-04 12:39:20 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
2013-12-03 16:08:57 +04:00
Alexander Smorkalov
a13db7c8fa
Android native camera destruction fixed for Android 4.4.
2013-11-29 10:38:26 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Alexander Alekhin
fbc91c5ee9
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
2013-11-22 18:24:20 +04:00
Roman Donchenko
4746a710bb
Merge pull request #1820 from asmorkalov:android_native_camera_44
2013-11-19 12:47:48 +04:00
Alexander Smorkalov
26d3a1a036
Prebuilt libnative_camera_xxx updated.
2013-11-18 18:19:38 +04:00
Alexander Karsakov
83cefcb92a
FFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options: --enable-w32threads --disable-iconv --cpu=i686 (workaroud for http://trac.ffmpeg.org/ticket/2363 )
2013-11-18 13:56:02 +04:00
Roman Donchenko
d3af86c0ea
Added the missing setting of HAVE_FFMPEG to true on Windows.
...
While the FFmpeg video IO backend gets compiled even without it,
the tests (for both FFmpeg and video IO) don't. This should fix
that.
2013-10-25 14:22:07 +04:00
Roman Donchenko
7e1ded0ebd
Merge pull request #1664 from SpecLad:merge-2.4
2013-10-24 17:27:30 +04:00
Roman Donchenko
66beb44286
Applied a change from 555c505b to 3rdparty/tbb/CMakeLists.txt.
...
Odd that it wasn't merged automatically...
2013-10-23 14:56:37 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Jose-Luis Blanco-Claraco
27b02921f3
Added patch file for fixing VS2013 in 3rd party lib OpenEXR
2013-10-21 21:41:27 +02:00
Jose-Luis Blanco-Claraco
52a904e17b
Fixed MSVC 2013 build errors and workaround for an internal compiler crash.
2013-10-20 17:28:45 +02:00
Alexander Alekhin
9d380ecc08
added Khronos OpenCL 1.2 header files
2013-10-18 15:44:55 +04:00
Roman Donchenko
5e24376ad7
Updated ffmpeg_vesion.cmake after #1516 .
2013-10-18 12:23:56 +04:00
Roman Donchenko
9c7ba848bb
Merge pull request #1516 from akarsakov:new_ffmpeg_build
2013-10-17 15:41:18 +04:00
Alexander Karsakov
cee308312a
Updated build of ffmpeg library (v 2.0.2). Builded with mingw (gcc 4.6.1) with
...
folowing additional options: --enable-w32threads, --arch=i686 (for 32-bit
library, workaround for http://trac.ffmpeg.org/ticket/2363 )
2013-10-17 12:29:00 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
2013-10-04 16:36:44 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Vladislav Vinogradov
d1f3a62832
fix for bug #3291 :
...
add INSTALL command for TBB target
2013-09-27 14:45:08 +04:00
Alexander Smorkalov
c550e452f9
Merge pull request #1384 from hbristow:matlab_public
2013-09-19 10:25:02 +04:00
hbristow
86b7e3d15d
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
2013-09-15 17:36:13 +10:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Alexander Smorkalov
3036ec4b89
LibTIFF Win32 API back-end disabled for Windows RT.
2013-08-28 07:31:46 -07:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
2013-08-22 18:17:19 +04:00
Roman Donchenko
797beef383
Updated zlib to 1.2.8.
2013-08-22 17:59:27 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
0d8cb2e319
Disabled whitespace checking for 3rdparty.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Roman Donchenko
abf372d759
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
2013-08-19 15:00:36 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Roman Donchenko
afc6f79038
Inlined the getMD5 macro, which no longer saves us anything.
2013-08-12 15:38:58 +04:00
Alexander Smorkalov
fff91eef0b
Native camera libraries updated.
...
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
2013-08-09 17:43:21 +04:00
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
2013-08-08 12:03:41 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Alexander Smorkalov
908039c658
Warning suppresion for TBB on WinRT added.
2013-07-24 09:21:30 +04:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
Alexander Smorkalov
a64eccd2cd
Debug build for WindowsRT with TBB fixed.
...
Debug library name prefix changed no "_debug" to fit pragmas in TBB
headers.
2013-07-17 05:21:26 -07:00
Roman Donchenko
1590a1a538
Merge pull request #1068 from AoD314:webp2
2013-07-15 11:45:28 +04:00
andrey.morozov
7d5185e8f1
updated webp to version 0.3.1
2013-07-13 14:09:44 +04:00
Roman Donchenko
eb8d9730cb
Removed unused NEW_FFMPEG macro.
2013-07-11 12:55:34 +04:00
Roman Donchenko
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
Alexander Smorkalov
c2e6668414
Bug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed.
...
Downgrade TBB to 4.1u2 for all platforms, except WinRT.
2013-07-04 18:52:52 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Alexander Smorkalov
070a77ae0d
TBB updated to version 4.1 update 4.
2013-06-27 15:47:23 +04:00
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
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
