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
Tomoaki Teshima
addb15383a
fix run time error
2016-06-16 18:14:53 +09:00
Alexander Alekhin
c3456c0754
Merge pull request #6685 from ioxp:dofDocu
2016-06-15 20:43:11 +00:00
Alexander Alekhin
68c63188eb
Merge pull request #6683 from alalek:cmake_hal
2016-06-15 17:18:56 +00:00
Philipp Hasper
45bd56e28a
rigidTransform: only four DoF
...
combinations of translation, rotation, and uniform scaling equals four degrees of freedom
2016-06-15 16:41:39 +02:00
Alexander Alekhin
f4ebc504d1
cmake: refactor HAL attaching process
2016-06-15 17:34:30 +03:00
Aleksandar Atanasov
0637ca21dc
Update houghlines.py
2016-06-13 09:00:42 +02:00
Aleksandar Atanasov
4fa86dad26
Update houghcircles.py
2016-06-13 09:00:29 +02:00
Aleksandar Atanasov
445349dd7d
Same fix as with the houghcircles
...
Moved second `imshow()` inside the if-statement to prevent error when no lines have been found and the function is called with an empty `cdst`.
2016-06-12 12:55:29 +02:00
Aleksandar Atanasov
c5bbc0353c
Added small fix when circles are not detected
...
I noticed that I missed the fact that `cimg` is used in the second `imshow()` call. Changed the scope of the second function call to be within the if-statement. Otherwise in cases where have not been detected the second `imshow()` will attempt to use `cimg` which will be empty leading to an error.
2016-06-12 12:54:16 +02:00
Philipp Nordhus
4a529cd641
Return reference on iterator indirection/subscript
2016-06-11 15:17:52 +02:00
Ankit Yadav
c62eda023d
Fix typo
2016-06-11 17:56:58 +05:30
Tomoaki Teshima
87d0c91dcf
fix warning of build
2016-06-09 18:24:00 +09:00
Aleksandar Atanasov
25e2e8aa3c
Removed trailing spaces at line 32
2016-06-09 07:18:47 +02:00
Tomoaki Teshima
d0a8390963
fix run time error on Mac
...
* integrate HW version and SW version to same function
2016-06-09 08:41:37 +09:00
Alexander Alekhin
e3844e0f26
Merge pull request #6649 from adamrankin:msmf_crash_fix
2016-06-08 16:30:55 +00:00
Adam Rankin
2577194c70
Correcting return type from videoDevice::findType to be int thus allowing detection of failed device init request
2016-06-07 15:18:40 -04:00
Alexander Alekhin
1b6e02793c
Merge pull request #6645 from tomoaki0705:fixTypoEigen
2016-06-07 13:51:30 +00:00
Tomoaki Teshima
fd76ed5c0f
fix to support wider compiler
...
* check compiler more strictly
* use gcc version of fp16 conversion if it's possible (gcc 4.7 and later)
* use current SW implementation in other cases
2016-06-07 18:32:47 +09:00
Tomoaki Teshima
6f6eebbcb9
fix warning
2016-06-07 18:31:18 +09:00
Vladislav Sovrasov
46fb46c54e
Add an extended version of CalibrateCamera function
2016-06-07 12:31:11 +03:00
Vladislav Sovrasov
055f5c7395
Change names of some internal functions
2016-06-07 10:58:12 +03:00
Tomoaki Teshima
d1c1c01761
fix typo
2016-06-07 14:53:04 +09:00
Tomoaki Teshima
fbfd3158a7
fix corner case when number is small
2016-06-07 08:59:28 +09:00
Tomoaki Teshima
15f8bc6f37
fix cmake
...
* enable fp16 feature correctly with gcc on x86/x86_64
2016-06-06 21:48:18 +09:00
Maksim Shabunin
532885c12b
Merge pull request #6607 from alalek:issue_6604
2016-06-06 09:20:58 +00:00