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
Suleyman TURKMEN
d2bad6febb
cv::TickMeter class addition
2016-06-23 19:06:57 +03:00
Vitaly Tuzov
eaec95dcf2
Update TBB
2016-06-23 11:48:48 +03:00
Alexander Alekhin
0ebe387cb2
Merge pull request #6713 from alalek:cmake_install_fix
2016-06-22 20:35:15 +00:00
Alexander Alekhin
f0dc7a25e7
Merge pull request #6712 from alalek:cmake_export_fix
2016-06-22 20:34:46 +00:00
Alexander Alekhin
f57e3ce5f3
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
...
CPack can't work with absolute paths.
2016-06-22 16:38:54 +03:00
Alexander Alekhin
09ce987552
cmake: fix export issue
...
opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)
2016-06-22 15:34:46 +03:00
Matthew Skolaut
f861d0d643
merge #ifs in highgui bindings
2016-06-21 17:16:16 -05:00
Alexander Alekhin
a76fd43599
Merge pull request #6709 from alalek:cmake_hal_fix
2016-06-21 19:27:02 +00:00
Julien Dubiel
33ab236ed3
Use CMAKE_LIBRARY_PATH_FLAG variable instead of -L.
2016-06-21 20:00:50 +02:00
Alexander Alekhin
09c2a8b7ad
cmake: fix HAL dependencies for core module
...
Linker dependencies are transitive for non-private
2016-06-21 19:50:32 +03:00
Alexander Alekhin
be38a524a8
Merge pull request #6705 from alalek:fix_hal_imgproc
2016-06-21 16:24:29 +00:00
Alexander Alekhin
61492ea0dc
Merge pull request #6708 from alalek:pr6477
2016-06-21 15:38:41 +00:00
Alexander Alekhin
96937bac74
Merge pull request #6581 from mshabunin:hal_mag
2016-06-21 13:16:17 +00:00
Alexander Alekhin
89cd74093e
Merge pull request #6704 from alalek:cmake_cmp0042
2016-06-21 10:46:08 +00:00
Matthew Skolaut
7284a77cd3
fix casting warning in python createButton binding
2016-06-20 21:07:24 -05:00
Matthew Skolaut
e8bfb48490
Merge branch 'master' of https://github.com/Itseez/opencv
...
Added python binding for createButton
2016-06-20 16:24:23 -05:00
Matthew Skolaut
9b959072a2
added python binding for createButton
2016-06-20 16:24:15 -05:00
Alexander Alekhin
2fb670cf09
hal: fix missing include "opencv2/imgproc/hal/interface.h"
2016-06-20 19:25:49 +03:00
Alexander Alekhin
f5306a0740
cmake: change CMP0042 policy value
2016-06-20 18:28:12 +03:00
Alexander Alekhin
4597b94099
Merge pull request #5980 from alalek:cmake_opencv_config
2016-06-20 15:27:43 +00:00
Alexander Alekhin
c6c651212c
cmake: refactoring of OpenCVConfig
...
- removed OpenCV_LIB_DIR* vars (they are broken and not required anymore)
- OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support
- removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE
- fix hard-coded relative paths for OpenCV_INSTALL_PATH
- removed OpenCV_TBB_ARCH
- switch OpenCVConfig.cmake into 2-level mode for Android SDK
2016-06-20 15:15:21 +03:00
Alexander Alekhin
7188e6e2ac
android: update build scripts
2016-06-20 15:15:21 +03:00
MYLS
29921d055d
change the parameter to CvMat and CvMatND
...
```cpp
cvWriteMat_Base64(::cv::FileStorage & fs, ::cv::String const & name,
::cv::Mat const & mat)
```
becomes:
```cpp
CV_EXPORTS void cvWriteMat_Base64(::CvFileStorage* fs, const char* name,
const ::CvMat* mat);
CV_EXPORTS void
cvWriteMatND_Base64(::CvFileStorage* fs, const char* name, const
::CvMatND* mat);
```
2016-06-20 16:59:58 +08:00
MYLS
9faa2a7fd0
solve warning for IOS
...
Two test are still needed:
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 02:44:39 +08:00
MYLS
958263d245
Solve warnings, and adjusted the test case.
2016-06-19 02:00:32 +08:00
MYLS
882e4221e7
fix errors from test.
...
Two other test are still needed.
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 00:45:51 +08:00
MYLS
d1b097f409
fix most coding style warnings and errors
2016-06-18 23:28:12 +08:00
MYLS
7b1f7c8d8e
Add Base64 support for FileStorage
...
1. Add Base64 support for reading and writing XML\YML file.
The two new functions for writing:
```cpp
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2. Change YML file header form `YAML:1.0` to `YAML 1.0`. (standard
format)
3. Add test for Base64 part.
2016-06-18 22:14:11 +08:00
MYLS
ecd827fc8e
Add Base64 support for FileStorage
...
[GSoC] FileStorage:
Add base64 support for reading and writting XML\YML file.
The two new functions:
```
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2016-06-18 21:40:29 +08:00
Alexander Alekhin
31952fbf1c
Merge pull request #6675 from pnordhus:matconstiterator_reference
2016-06-17 10:12:51 +00:00
Alexander Alekhin
bd9cc2dfc6
Merge pull request #6668 from yadavankit:master
2016-06-17 10:11:49 +00:00
Vadim Pisarevsky
547a2d29c3
Merge pull request #6535 from sovrasov:lapack-hal
2016-06-16 20:09:47 +00:00
Vadim Pisarevsky
4142e737b0
Merge pull request #6453 from sovrasov:extend_calibrateCamera
2016-06-16 18:28:49 +00:00
Alexander Alekhin
7fadf570b8
Merge pull request #6690 from alalek:cmake_fix_android_samples
2016-06-16 15:56:19 +00:00
Alexander Alekhin
777e1d38ba
cmake: fix JNI configuration problem for Android samples
...
Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
ld: fatal error: -soname: must take a non-empty argument
Linker command line sample contains this:
"-shared -Wl,-soname, -o"
2016-06-16 14:32:07 +03:00
