Alexandr Kondratev
7dcac647e5
highgui module: a bit readable onMouse flags mapping
2016-07-03 13:31:25 +03:00
MYLS
b3475cbf32
Merge remote-tracking branch 'refs/remotes/Itseez/master'
2016-07-03 14:57:18 +08:00
MYLS
393cd6242e
Merge remote-tracking branch 'refs/remotes/Itseez/master'
2016-07-03 14:17:47 +08:00
Dikay900
61390e407d
Rephrase parts of the templates and use comments
2016-07-02 17:33:06 +02:00
Michael Shtutman
3f2ab5d3b5
Fix bug #6682 (Can't change resolution for YUY2 camera with DShow)
2016-07-02 18:10:04 +03:00
Alexander Alekhin
3844ee780c
build: fix compiler warnings (GCC 5.3.1)
2016-07-01 20:17:16 +03:00
Alexander Alekhin
7dc5332a92
Merge pull request #6745 from alalek:viz_samples
2016-07-01 15:27:01 +00:00
Alexander Alekhin
8b05a4bf93
cvtColor: fix inplace processing
2016-07-01 17:09:12 +03:00
Andrey Pavlenko
330e4bb48a
Merge pull request #6734 from PkLab:doc_videoio_enums
2016-07-01 13:24:05 +00:00
Arthur Cinader
2b08f29543
Allow for an optional mask for MatchTemplate_Demo
2016-06-30 17:04:25 -07:00
Alexander Alekhin
ee4f409584
cmake: lapack optimized code requires cblas.h
2016-06-30 20:25:08 +03:00
Alexander Alekhin
b23527bf02
core: fix arguments types for cblas calls
2016-06-30 20:25:08 +03:00
Vadim Pisarevsky
7fea7e0629
Merge pull request #6697 from wiryls:FileStorageBase64
2016-06-30 17:17:03 +00:00
Andrey Pavlenko
e4cd24537e
Merge pull request #6740 from tomoaki0705:fixNeonCheckSmooth
2016-06-30 15:47:45 +00:00
Alexander Alekhin
8184535de1
samples: repair viz tutorial
2016-06-30 17:21:31 +03:00
Alexander Alekhin
5346870920
Merge pull request #6558 from lletourn:master
2016-06-30 13:44:16 +00:00
Alexander Alekhin
639c8fc6d6
Merge pull request #5870 from IshankGulati:VideoCapture-fix
2016-06-30 13:20:51 +00:00
Alexander Alekhin
b7735b3400
Merge pull request #6731 from jokereactive:viz_sample
2016-06-30 12:41:52 +00:00
Maksim Shabunin
4aa9b230b8
Merge pull request #6603 from debjan:patch-1
2016-06-30 11:35:22 +00:00
Alexander Alekhin
e98c1bfb53
Merge pull request #6747 from ludv1x:master
2016-06-30 08:02:19 +00:00
Alexandr Kondratev
81c69ecd16
highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to keep compatible with older systems
2016-06-29 23:01:57 +03:00
Vitaliy Lyudvichenko
930d96f684
Fixing of AutoBuffer::allocate(nsz) method
...
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
2016-06-29 19:50:51 +03:00
Alexander Alekhin
69bd6dad1f
Merge pull request #6029 from sturkmen72:patch-7
2016-06-29 11:55:09 +00:00
Alexander Alekhin
cb48183d02
Merge pull request #6711 from Dubrzr:vs_compile_cuda_fix
2016-06-29 11:03:47 +00:00
Alexander Alekhin
c7fc9dc42f
Merge pull request #6707 from tech2077:master
2016-06-29 11:00:49 +00:00
Tomoaki Teshima
78a5aacb22
make NEON more similart to SSE2
2016-06-29 12:11:10 +09:00
Alexander Alekhin
73e16dbc3f
cmake: update arm toolchain
2016-06-28 20:06:59 +03:00
Alexander Alekhin
bbc327aaed
Merge pull request #6736 from alalek:cmake_fix_install_path
2016-06-28 16:53:45 +00:00
PkLab.net
adcdab394b
Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums
...
# Resolved Conflicts:
# modules/videoio/include/opencv2/videoio.hpp
2016-06-28 16:40:30 +02:00
Alexander Alekhin
c5a8619493
cmake: fix install path
...
CMake doesn't work with empty paths ("") or paths which contains "./"
2016-06-28 13:29:00 +03:00
Alexander Alekhin
02edfc8df2
Merge pull request #6730 from sturkmen72:patch-16
2016-06-28 05:36:15 +00:00
Alexander Alekhin
6b511751f5
Merge pull request #6619 from Slonegg:openni2_ir_stream
2016-06-28 05:21:25 +00:00
PkLab.net
f274c592e4
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs
2016-06-27 19:17:51 +02:00
PkLab.net
6c3d8abe2c
Doxygen documentation for CAP_* enums (using current comments in code)
2016-06-27 19:09:23 +02:00
Dmitry Trifonov
f9e6741807
added support for OpenNI2 IR stream #4366
2016-06-27 10:04:59 -07:00
Alexander Alekhin
86b54a52f0
Merge pull request #6733 from simonhaenisch:simonhaenisch-improve-watershed.py-example
2016-06-27 16:44:24 +00:00
Simon Hänisch
6489d8a96f
update watershed.py: check if windows are still open
...
change the `while` loop to check if the two windows created by this example still exist, stop the program otherwise
2016-06-27 17:03:37 +02:00
Suleyman TURKMEN
e7ec580318
Update imgcodecs.hpp
2016-06-27 16:38:47 +03:00
Alexandr Kondratev
a4e9712006
Compilate switch-case with GTK_SCROLL_SMOOTH since GTK>=3.4
2016-06-27 13:34:41 +03:00
sarthak
43dca117b9
opencv viz bug
...
removed binary
update
2016-06-27 14:12:55 +05:30
Suleyman TURKMEN
11ca1c95f8
update cpp samples and tutorials
2016-06-26 20:55:00 +03:00
Suleyman TURKMEN
1b22783d46
Update grfmt_png.cpp
2016-06-26 20:03:03 +03:00
Alexandr Kondratev
fd78e2cc6c
highgui module: removed unused type_mouse_event mouse_wheel
2016-06-25 00:47:22 +03:00
Alexandr Kondratev
3cbd14d61a
pull highgui mouse wheel changes linux into master
2016-06-25 00:42:47 +03:00
Alexandr Kondratev
6020dacc11
highgui module: implemented QT and GTK mouse wheel callback support in linux
2016-06-25 00:18:07 +03:00
MYLS
df5a7c8ee9
build again for OpenCL.
...
I could not find the cause of the error:
```
C:\builds_ocv\precommit_opencl\opencv\modules\ts\src\ts_perf.cpp(361):
error: The difference between expect_max and actual_max is
8445966.0000002384, which exceeds eps, where
expect_max evaluates to 0.9999997615814209,
actual_max evaluates to 8445967, and
eps evaluates to 1.0000000000000001e-005.
Argument "dst0" has unexpected maximal value
```
Hope this is a false alarm.
2016-06-25 02:24:33 +08:00
MYLS
677d4d20ce
fixed an error in the test...
2016-06-25 00:37:13 +08:00
MYLS
959002fb96
solve warnings and errors in test.
2016-06-24 23:41:40 +08:00
MYLS
7c92ee2e6e
Split cvWriteRawData_Base64 into three functions
...
The three new functions:
```cpp
void cvStartWriteRawData_Base64(::CvFileStorage * fs, const char* name,
int len, const char* dt);
void cvWriteRawData_Base64(::CvFileStorage *
fs, const void* _data, int len);
void
cvEndWriteRawData_Base64(::CvFileStorage * fs);
```
Test is also updated. (And it's remarkable that there is a bug in
`cvWriteReadData`.)
2016-06-24 22:27:42 +08:00
Alexander Alekhin
0e436c3fe9
Merge pull request #6721 from alalek:tbb_update
2016-06-24 12:54:55 +00:00
