Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Andrey Kamaev
a3e31a69df
Merge pull request #684 from vhdirk:gstreamer-1.x
2013-03-25 17:01:43 +04:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
Andrey Kamaev
2afad8b575
Turn on OpenCL by default
2013-03-21 17:56:57 +04:00
Dirk Van Haerenborgh
4f3453dbbf
bomb commit of gstreamer videocapture and videowriter
2013-03-21 10:22:56 +01:00
Andrey Kamaev
fb76095378
Merge pull request #610 from AoD314:webp2
2013-03-11 21:13:36 +04:00
AoD314
63d9ee9523
This code is based on https://github.com/prasannatsm/opencv code.
...
- added webp (lossy and lossless without alpha channel)
- added tests
2013-03-11 11:51:38 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Andrey Kamaev
facab40745
Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown
2013-03-01 19:44:17 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Vladislav Vinogradov
78c924baad
removed obsolete CARMA toolchain and CMake variable
2013-02-14 16:27:17 +04:00
Andrey Kamaev
c7df17e77b
Detect and report parallel framework used
2013-02-13 15:09:30 +04:00
Andrey Kamaev
0b20faf3d2
Use git describe to get source control version
2013-02-13 14:50:32 +04:00
Andrey Kamaev
9e4792af1f
Add separate status section for java
2013-02-13 14:36:56 +04:00
Andrey Kamaev
82313b3f6c
Add OpenCL section to status report
2013-02-13 14:27:12 +04:00
Andrey Kamaev
247df9f3fc
Detect version of clang compiler
2013-02-13 14:11:56 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Andrey Pavlenko
b337d84adf
configure desktop Java install, making JNI library name correct, and making it fat when possible
2013-02-11 16:28:19 +04:00
Alexander Smorkalov
7882aba7af
TBB download and build option enabled for non Android platfroms.
2013-02-06 14:43:57 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
3dbb98e454
Merge pull request #357 from taka-no-me:build_opencv_apps
2013-01-29 19:25:52 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
daead680cd
Add option to control build of applications (feature #2568 )
2013-01-29 16:38:59 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
b445f4b01d
Find OpenCL in AMD APP SDK
2013-01-25 14:15:26 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Andrey Kamaev
3cb84ed17c
Fix dependencies inference for auto-disabled targets
...
Sometimes information about dependencies causing disabling were loosed and it
was not possible to correctly display these dependencies in status report
2013-01-14 18:58:24 +04:00
marina.kolpakova
e53d57664d
fix precompiled headers usage in gpu module
2012-12-30 16:58:41 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
marina.kolpakova
3882bbbf35
improve carma build
...
- exclude system paths from library search paths
- remove hardcoded paths to compiler
- enable compiling with 3d-parties
- enable build as shared libraries
2012-12-24 14:54:57 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
d6d1d20816
Show STL type in CMake status report
2012-12-22 22:52:27 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Vladislav Vinogradov
2f1ca1b6b3
fixed build for CARMA:
...
* added CMake toolchain file
* added WITH_NVCUVID flag
2012-12-21 13:45:50 +04:00
Alexander Smorkalov
1555922228
OpenCV for Android SDK installation improved;
...
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
2012-12-19 17:28:46 +04:00
Andrey Kamaev
ae5649d3f7
Drop unsupported imageio from grfmt
2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
2012-12-03 09:55:53 +04:00
Alexander Smorkalov
5b148083fe
Libinfo build fix;
...
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-20 17:39:45 +04:00
Andrey Kamaev
0938358002
Merge pull requests #136 , #142 , #150 , #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
2012-11-13 19:47:16 +04:00
Alexander Smorkalov
dda2eb0f76
Libinfo build fix;
...
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-12 12:57:09 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Andrey Kamaev
4a2f626d85
Remove "-rc" suffix from version
2012-11-02 14:27:34 +04:00
