Nils Plath
ee55e4595c
- Fixed compile error that appeared with Clang 5.1 on Mac 10.8.5:
...
modules/videoio/src/cap_gstreamer.cpp:577:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4lsrc ! "COLOR_ELEM" ! appsink";
^
modules/videoio/src/cap_gstreamer.cpp:585:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4l2src ! "COLOR_ELEM" ! appsink";
2015-03-08 00:23:38 +01:00
Vadim Pisarevsky
361eb633f6
Merge pull request #3795 from samyak-268:sqr-filter-doc
2015-03-06 10:22:56 +00:00
Vadim Pisarevsky
fd7a76fe5d
Merge pull request #3796 from enpe:master
2015-03-06 10:21:57 +00:00
Vadim Pisarevsky
092f599aac
Merge pull request #3797 from Dmitry-Me:reduceVariableScope6
2015-03-06 10:20:45 +00:00
Vadim Pisarevsky
a65dbc5dcd
Merge pull request #3793 from sanuj:master
2015-03-06 10:20:16 +00:00
Vadim Pisarevsky
8c69266cbf
Merge pull request #3786 from jviney:fix_background_subtractor_knn_width_step
2015-03-06 10:17:43 +00:00
Dmitry-Me
2fb4178f7c
Reduce variable scope
2015-03-06 10:17:37 +03:00
Nils Plath
32d56c6b43
Fixed: wrong conversion of float-based Mat input inside the AKAZE.
2015-03-05 23:55:07 +01:00
Samyak Datta
20efcff166
Added doxygen comments for sqrBoxFilter() method
2015-03-06 03:50:51 +05:30
Alexander Alekhin
4e87deae28
Merge pull request #3790 from StevenPuttemans:fix_cmakelist_annotation_master
2015-03-05 16:01:39 +00:00
sanuj
1f53b65511
Fix documentation in python binding tutorial
2015-03-05 20:00:19 +05:30
StevenPuttemans
217f628915
update cmakelists for annotation tool
2015-03-05 14:46:52 +01:00
Vadim Pisarevsky
2baf1a3c9f
Merge pull request #3788 from berak:fix_features2d_tut
2015-03-05 12:22:50 +00:00
Vadim Pisarevsky
aa113c5a85
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
2015-03-05 12:19:02 +00:00
berak
b7f2a4da69
fix features2d tutorials
2015-03-05 10:26:45 +01:00
Dmitry-Me
d164d51380
Fix potential null pointer dereference
2015-03-05 10:31:51 +03:00
Vadim Pisarevsky
f9b8ce1d25
Merge pull request #3784 from ilya-lavrenov:nvidia_android
2015-03-05 06:43:03 +00:00
Jonathan Viney
4f24dc0959
Fix KNN background subtraction not honoring width step.
2015-03-05 12:46:07 +13:00
Vadim Pisarevsky
0b99f6bcd6
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
2015-03-04 13:53:41 +00:00
Ilya Lavrenov
cf4c79ebdd
disabled some kernels for Android && NVidia
2015-03-04 14:46:49 +03:00
Vadim Pisarevsky
e4bc592c46
Merge pull request #3583 from oresths:tbb_canny
2015-03-04 10:49:27 +00:00
Vadim Pisarevsky
ebac739a35
Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation
2015-03-04 10:45:25 +00:00
Dmitry-Me
f8c454733b
Remove dangerous string manipulation, merge declaration with assignment
2015-03-04 10:35:06 +03:00
Vadim Pisarevsky
4bb496409c
Merge pull request #3779 from Dmitry-Me:uniformComputationOfVariableSize
2015-03-03 18:51:56 +00:00
Vadim Pisarevsky
c9ea878d10
Merge pull request #3722 from berak:py_houghlines_sample
2015-03-03 18:16:25 +00:00
Vadim Pisarevsky
4701b22e14
Merge pull request #3607 from soyersoyer:yuyv_pixfmt
2015-03-03 18:15:50 +00:00
Vadim Pisarevsky
dcff28b778
Merge pull request #3717 from Dmitry-Me:removeUnneededIndirections
2015-03-03 16:15:25 +00:00
Dmitry-Me
c587bae997
Uniform computation of variable size
2015-03-03 16:11:07 +03:00
Vadim Pisarevsky
62b8895814
Merge pull request #3654 from StevenPuttemans:add_annotation_master
2015-03-03 12:53:07 +00:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Vadim Pisarevsky
d3b74cdcb2
Merge pull request #3773 from ilya-lavrenov:warning
2015-03-03 12:33:17 +00:00
Vadim Pisarevsky
f38339c089
Merge pull request #3775 from Dmitry-Me:reduceVariableScope5
2015-03-03 12:29:18 +00:00
Ilya Lavrenov
26eebb3ee3
increased EPS for cvtColor for NVIDIA
2015-03-03 15:26:51 +03:00
Dmitry-Me
1b7066fc95
Reduce variable scope, only compute values that are used later
2015-03-03 11:04:22 +03:00
Vadim Pisarevsky
7c7a63bebc
Merge pull request #3772 from Dmitry-Me:reduceVariableScope4
2015-03-02 19:52:18 +00:00
Vadim Pisarevsky
aa506c6521
Merge pull request #3759 from mshabunin:wrap-all
2015-03-02 19:51:42 +00:00
Maxim Kostin
ad1149ff12
Enabled property sheets for WinRT related samples
2015-03-02 22:26:46 +03:00
Maxim Kostin
530c8dc0c0
Fixing 'doc' buildbot job: removing trailing whitespaces and tab indents
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
22a30af353
Fixing buildbot job:
...
- explicitly turning OCL off since WinRT does not support it
- fixing macro definitions in core/ocl.cpp
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
213a6bc5c4
Adding Widows Phone 8 sample apps
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
59d6a281cd
Added WinRT Universal Apps samples
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:44 +03:00
Maxim Kostin
5810845777
Added and updated WinRT samples
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:44 +03:00
Maxim Kostin
86ebf4a2d8
Added build script to automate generating, building and installing OCV for WinRT, WindowsPhone 8, WindowsPhone 8.1. Added readme and .bat script wrapper. Added standalone script to build and install pre-generated projects.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:44 +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
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Ilya Lavrenov
ffc453ebfd
fixed [-Wsign-compare] warning
2015-03-02 16:41:06 +03:00
Dmitry-Me
4e582b131b
Reduce veriables scope, move declaration to first use
2015-03-02 16:27:48 +03:00
Vadim Pisarevsky
5850a9b8c3
Merge pull request #3744 from es0m:remotes/upstream/2.4.10.x-prep
2015-03-02 11:38:25 +00:00
Vadim Pisarevsky
22ad72d08e
Merge pull request #3690 from theodr:moprh_lines_detection_tut
2015-03-02 11:36:15 +00:00