cuda-geek
e4f55a7ec0
Merge pull request #629 from cuda-geek:globbing
2013-03-12 15:57:56 +04:00
cuda-geek
009158e1f8
Merge pull request #621 from cuda-geek:twister
2013-03-12 13:11:50 +04:00
yao
084385cf38
Fix a bug in ocl::Erode/Dilate, simplify the host logic
2013-03-12 16:45:43 +08:00
peng xiao
3a565e001e
Remove unnecessary HAVE_OPENCL macro block.
2013-03-12 09:10:15 +08:00
yao
f8985bb7fc
fix warnings on Linux
2013-03-12 08:55:50 +08:00
Andrey Kamaev
1d3219747a
Merge pull request #633 from jet47:gpu-debayer-gray
2013-03-11 21:15:00 +04:00
Andrey Kamaev
632211eb27
Merge pull request #630 from asmorkalov:android_view_stretch
2013-03-11 21:14:43 +04:00
Andrey Kamaev
fb04f3a58d
Merge pull request #622 from moshekaplan:python2_cleanups
2013-03-11 21:14:20 +04:00
Andrey Kamaev
fb76095378
Merge pull request #610 from AoD314:webp2
2013-03-11 21:13:36 +04:00
Ilya Lavrenov
8b510ad8dc
sse2 hog
2013-03-11 20:21:48 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Andrey Kamaev
980fc93b4d
Fix clang + ccache build warnings
2013-03-11 18:41:22 +04:00
Andrey Kamaev
d1a148b06f
Merge pull request #635 from taka-no-me:c++11
2013-03-11 17:35:46 +04:00
Andrey Kamaev
9b8c871874
Merge pull request #634 from taka-no-me:c++11-master
2013-03-11 17:15:09 +04:00
Andrey Kamaev
2a06fd98c0
Fix build errors with c++11
2013-03-11 16:03:48 +04:00
AoD314
9680176fa9
added docs
2013-03-11 15:47:21 +04:00
Vladislav Vinogradov
4ddf634c30
gpu : implement Bayer* -> Gray color conversion
2013-03-11 15:41:50 +04:00
Andrey Kamaev
ec8637a990
Fix build errors
2013-03-11 14:52:22 +04:00
peng xiao
34998b6034
Add ocl::SURF accurate test.
...
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9
remove the OpenCL define
2013-03-11 17:21:31 +08:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
AoD314
eb012a5993
added tests for WebP
2013-03-11 11:51:46 +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
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
cuda_geek
61094d350b
add dlobbing for Windows
2013-03-09 23:21:17 +04:00
marina.kolpakova
a486aafe7c
add dlobbing under *nix
2013-03-09 21:10:45 +04:00
marina.kolpakova
12fe6ff734
add Mersenne Twister random number generator
2013-03-09 19:18:37 +04:00
yao
7f0d6d42f0
fix mismatch on NV OCL and some AMD GPUs
2013-03-08 10:30:01 +08: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
13f402a554
Merge pull request #620 from apavlenko:java_tutorial_fix
2013-03-06 15:47:09 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
de3767df0a
minor formatting
2013-03-06 12:59:38 +04:00
Moshe Kaplan
bd042d9cc3
Fixed shebangs, added error checking
2013-03-06 01:41:02 -05:00
Andrey Pavlenko
aaefd31844
more formatting
2013-03-05 19:03:36 +04:00
Andrey Pavlenko
23fb570cbd
updating JNI lib location for Unix; formatting update
2013-03-05 18:42:14 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
6569a58518
Merge pull request #592 from vpisarev:c2cpp_calib3d_ptsetreg
2013-03-05 17:39:53 +04:00
Andrey Kamaev
816adcfdac
Merge pull request #605 from vpisarev:c2cpp_calib3d_stereo
2013-03-05 15:26:51 +04:00
Andrey Kamaev
bbac4bc4cf
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
2013-03-05 15:26:16 +04:00
cuda-geek
b9ab5939a4
Merge pull request #607 from cuda-geek:auto-compile-cuda
2013-03-05 13:50:29 +04:00
cuda-geek
fcde059ca4
Merge pull request #618 from caotto:master
2013-03-05 13:12:39 +04:00
marina.kolpakova
39ecd94010
forbid recursive globbing for OpenCV modules sources
2013-03-05 11:34:46 +04:00
cuda-geek
c0ba0c9099
Merge pull request #596 from ArtanisCV:master
2013-03-05 08:57:58 +04:00
cuda-geek
7e9f1c33d0
Merge pull request #617 from moshekaplan:master
2013-03-05 08:56:58 +04:00
Charles Otto
c02f94392b
Add version checks to previous modifications to ffmpeg_cap_impl.hpp
...
Add version checks around uses of AVCodecID and av_opt_set, since these aren't
defined for older versions of ffmpeg.
2013-03-04 22:14:52 -05:00
Charles Otto
52137ceed0
Allow encoding with libx264 via ffmpeg to work
...
Add a call to avcodec_get_context_defaults3, this sets per-codec default values
and in the case of libx264 will stop VideoWriter::open (with fourcc=x264) from
failing due to libx264 complaining about broken ffmpeg default settings.
Set some additional libx264 encoder parameters.
2013-03-04 19:29:05 -05:00
Vadim Pisarevsky
f303de12d8
mask.create() re-converted to new style
2013-03-05 00:03:37 +04:00
Vadim Pisarevsky
0c61a8887e
reverting changes in Homography kernel function. For some reason GCC on Linux does not like it.
2013-03-05 00:00:21 +04:00