platform/upstream/opencv.git
7 years agorespective changes added
sourin [Thu, 18 Aug 2016 11:54:43 +0000 (17:24 +0530)]
respective changes added

8 years agoMerge pull request #6771 from sovrasov:log_doc_fix
Andrey Pavlenko [Fri, 8 Jul 2016 15:20:42 +0000 (15:20 +0000)]
Merge pull request #6771 from sovrasov:log_doc_fix

8 years agoMerge pull request #6782 from LaurentBerger:I6780
Andrey Pavlenko [Fri, 8 Jul 2016 15:18:22 +0000 (15:18 +0000)]
Merge pull request #6782 from LaurentBerger:I6780

8 years agoMerge pull request #6775 from janstarzy:histo-ipp-fix
Andrey Pavlenko [Fri, 8 Jul 2016 15:15:17 +0000 (15:15 +0000)]
Merge pull request #6775 from janstarzy:histo-ipp-fix

8 years agoMerge pull request #6770 from ealbuz:master
Alexander Alekhin [Fri, 8 Jul 2016 09:49:08 +0000 (09:49 +0000)]
Merge pull request #6770 from ealbuz:master

8 years agoMerge pull request #6785 from alalek:android_native_level
Alexander Alekhin [Thu, 7 Jul 2016 15:48:01 +0000 (15:48 +0000)]
Merge pull request #6785 from alalek:android_native_level

8 years agoandroid: increase default native API level 8=>9
Alexander Alekhin [Thu, 7 Jul 2016 10:37:18 +0000 (13:37 +0300)]
android: increase default native API level 8=>9

8 years agoIssue 6780
LaurentBerger [Thu, 7 Jul 2016 07:29:41 +0000 (09:29 +0200)]
Issue 6780

8 years agofix for buffer-overflow in IPPCalcHistInvoker::operator()
Jan Starzynski [Wed, 6 Jul 2016 07:54:28 +0000 (09:54 +0200)]
fix for buffer-overflow in IPPCalcHistInvoker::operator()

8 years agoUpdate cv::log documentation
Vladislav Sovrasov [Tue, 5 Jul 2016 14:28:53 +0000 (17:28 +0300)]
Update cv::log documentation

8 years agoAdd Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
Elif Albuz [Tue, 5 Jul 2016 06:56:15 +0000 (23:56 -0700)]
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms

8 years agoAdd Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
Elif Albuz [Tue, 5 Jul 2016 06:45:07 +0000 (23:45 -0700)]
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms

8 years agoMerge pull request #6760 from alalek:issue_6653
Alexander Alekhin [Mon, 4 Jul 2016 14:03:05 +0000 (14:03 +0000)]
Merge pull request #6760 from alalek:issue_6653

8 years agoMerge pull request #6768 from tomoaki0705:fixEstimateAffine3DThreshold
Alexander Alekhin [Mon, 4 Jul 2016 12:17:16 +0000 (12:17 +0000)]
Merge pull request #6768 from tomoaki0705:fixEstimateAffine3DThreshold

8 years agocalib3d: compare error and threshold both in square
Tomoaki Teshima [Mon, 4 Jul 2016 10:34:47 +0000 (19:34 +0900)]
calib3d: compare error and threshold both in square
  * resolve #5183

8 years agoMerge pull request #6761 from alalek:fix_warnings
Alexander Alekhin [Mon, 4 Jul 2016 09:52:03 +0000 (09:52 +0000)]
Merge pull request #6761 from alalek:fix_warnings

8 years agobuild: fix compiler warnings (GCC 5.3.1)
Alexander Alekhin [Fri, 1 Jul 2016 17:17:16 +0000 (20:17 +0300)]
build: fix compiler warnings (GCC 5.3.1)

8 years agoMerge pull request #6745 from alalek:viz_samples
Alexander Alekhin [Fri, 1 Jul 2016 15:27:01 +0000 (15:27 +0000)]
Merge pull request #6745 from alalek:viz_samples

8 years agocvtColor: fix inplace processing
Alexander Alekhin [Fri, 1 Jul 2016 14:07:16 +0000 (17:07 +0300)]
cvtColor: fix inplace processing

8 years agoMerge pull request #6734 from PkLab:doc_videoio_enums
Andrey Pavlenko [Fri, 1 Jul 2016 13:24:05 +0000 (13:24 +0000)]
Merge pull request #6734 from PkLab:doc_videoio_enums

8 years agoMerge pull request #6697 from wiryls:FileStorageBase64
Vadim Pisarevsky [Thu, 30 Jun 2016 17:17:03 +0000 (17:17 +0000)]
Merge pull request #6697 from wiryls:FileStorageBase64

8 years agoMerge pull request #6740 from tomoaki0705:fixNeonCheckSmooth
Andrey Pavlenko [Thu, 30 Jun 2016 15:47:45 +0000 (15:47 +0000)]
Merge pull request #6740 from tomoaki0705:fixNeonCheckSmooth

8 years agosamples: repair viz tutorial
Alexander Alekhin [Wed, 29 Jun 2016 13:35:48 +0000 (16:35 +0300)]
samples: repair viz tutorial

8 years agoMerge pull request #6558 from lletourn:master
Alexander Alekhin [Thu, 30 Jun 2016 13:44:16 +0000 (13:44 +0000)]
Merge pull request #6558 from lletourn:master

8 years agoMerge pull request #5870 from IshankGulati:VideoCapture-fix
Alexander Alekhin [Thu, 30 Jun 2016 13:20:51 +0000 (13:20 +0000)]
Merge pull request #5870 from IshankGulati:VideoCapture-fix

8 years agoMerge pull request #6731 from jokereactive:viz_sample
Alexander Alekhin [Thu, 30 Jun 2016 12:41:52 +0000 (12:41 +0000)]
Merge pull request #6731 from jokereactive:viz_sample

8 years agoMerge pull request #6603 from debjan:patch-1
Maksim Shabunin [Thu, 30 Jun 2016 11:35:22 +0000 (11:35 +0000)]
Merge pull request #6603 from debjan:patch-1

8 years agoMerge pull request #6747 from ludv1x:master
Alexander Alekhin [Thu, 30 Jun 2016 08:02:19 +0000 (08:02 +0000)]
Merge pull request #6747 from ludv1x:master

8 years agoFixing of AutoBuffer::allocate(nsz) method
Vitaliy Lyudvichenko [Wed, 29 Jun 2016 16:50:51 +0000 (19:50 +0300)]
Fixing of AutoBuffer::allocate(nsz) method

AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.

8 years agoMerge pull request #6029 from sturkmen72:patch-7
Alexander Alekhin [Wed, 29 Jun 2016 11:55:08 +0000 (11:55 +0000)]
Merge pull request #6029 from sturkmen72:patch-7

8 years agoMerge pull request #6711 from Dubrzr:vs_compile_cuda_fix
Alexander Alekhin [Wed, 29 Jun 2016 11:03:47 +0000 (11:03 +0000)]
Merge pull request #6711 from Dubrzr:vs_compile_cuda_fix

8 years agoMerge pull request #6707 from tech2077:master
Alexander Alekhin [Wed, 29 Jun 2016 11:00:49 +0000 (11:00 +0000)]
Merge pull request #6707 from tech2077:master

8 years agomake NEON more similart to SSE2
Tomoaki Teshima [Wed, 29 Jun 2016 02:17:14 +0000 (11:17 +0900)]
make NEON more similart to SSE2

8 years agoMerge pull request #6736 from alalek:cmake_fix_install_path
Alexander Alekhin [Tue, 28 Jun 2016 16:53:45 +0000 (16:53 +0000)]
Merge pull request #6736 from alalek:cmake_fix_install_path

8 years agoMerge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums
PkLab.net [Tue, 28 Jun 2016 14:40:30 +0000 (16:40 +0200)]
Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums

# Resolved Conflicts:
# modules/videoio/include/opencv2/videoio.hpp

8 years agocmake: fix install path
Alexander Alekhin [Tue, 28 Jun 2016 10:27:25 +0000 (13:27 +0300)]
cmake: fix install path

CMake doesn't work with empty paths ("") or paths which contains "./"

8 years agoMerge pull request #6730 from sturkmen72:patch-16
Alexander Alekhin [Tue, 28 Jun 2016 05:36:15 +0000 (05:36 +0000)]
Merge pull request #6730 from sturkmen72:patch-16

8 years agoMerge pull request #6619 from Slonegg:openni2_ir_stream
Alexander Alekhin [Tue, 28 Jun 2016 05:21:25 +0000 (05:21 +0000)]
Merge pull request #6619 from Slonegg:openni2_ir_stream

8 years agoUse copydoc for the list of valid property identifier in VideoCapture and VideoWriter...
PkLab.net [Mon, 27 Jun 2016 17:17:51 +0000 (19:17 +0200)]
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs

8 years agoDoxygen documentation for CAP_* enums (using current comments in code)
PkLab.net [Mon, 27 Jun 2016 17:09:23 +0000 (19:09 +0200)]
Doxygen documentation for CAP_* enums (using current comments in code)

8 years agoadded support for OpenNI2 IR stream #4366
Dmitry Trifonov [Mon, 27 Jun 2016 17:04:59 +0000 (10:04 -0700)]
added support for OpenNI2 IR stream #4366

8 years agoMerge pull request #6733 from simonhaenisch:simonhaenisch-improve-watershed.py-example
Alexander Alekhin [Mon, 27 Jun 2016 16:44:24 +0000 (16:44 +0000)]
Merge pull request #6733 from simonhaenisch:simonhaenisch-improve-watershed.py-example

8 years agoupdate watershed.py: check if windows are still open
Simon Hänisch [Mon, 27 Jun 2016 15:03:37 +0000 (17:03 +0200)]
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

8 years agoUpdate imgcodecs.hpp
Suleyman TURKMEN [Mon, 27 Jun 2016 13:38:47 +0000 (16:38 +0300)]
Update imgcodecs.hpp

8 years agoopencv viz bug
sarthak [Mon, 27 Jun 2016 08:01:06 +0000 (13:31 +0530)]
opencv viz bug

removed binary

update

8 years agoupdate cpp samples and tutorials
Suleyman TURKMEN [Mon, 15 Feb 2016 13:37:29 +0000 (15:37 +0200)]
update cpp samples and tutorials

8 years agoUpdate grfmt_png.cpp
Suleyman TURKMEN [Sun, 26 Jun 2016 13:39:19 +0000 (16:39 +0300)]
Update grfmt_png.cpp

8 years agobuild again for OpenCL.
MYLS [Fri, 24 Jun 2016 18:24:33 +0000 (02:24 +0800)]
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.

8 years agofixed an error in the test...
MYLS [Fri, 24 Jun 2016 16:37:13 +0000 (00:37 +0800)]
fixed an error in the test...

8 years agosolve warnings and errors in test.
MYLS [Fri, 24 Jun 2016 15:41:40 +0000 (23:41 +0800)]
solve warnings and errors in test.

8 years agoSplit `cvWriteRawData_Base64` into three functions
MYLS [Fri, 24 Jun 2016 14:27:42 +0000 (22:27 +0800)]
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`.)

8 years agoMerge pull request #6721 from alalek:tbb_update
Alexander Alekhin [Fri, 24 Jun 2016 12:54:55 +0000 (12:54 +0000)]
Merge pull request #6721 from alalek:tbb_update

8 years agoUpdate TBB
Vitaly Tuzov [Wed, 22 Jun 2016 16:20:24 +0000 (19:20 +0300)]
Update TBB

8 years agoMerge pull request #6713 from alalek:cmake_install_fix
Alexander Alekhin [Wed, 22 Jun 2016 20:35:14 +0000 (20:35 +0000)]
Merge pull request #6713 from alalek:cmake_install_fix

8 years agoMerge pull request #6712 from alalek:cmake_export_fix
Alexander Alekhin [Wed, 22 Jun 2016 20:34:46 +0000 (20:34 +0000)]
Merge pull request #6712 from alalek:cmake_export_fix

8 years agocmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
Alexander Alekhin [Wed, 22 Jun 2016 13:12:52 +0000 (16:12 +0300)]
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX

CPack can't work with absolute paths.

8 years agocmake: fix export issue
Alexander Alekhin [Tue, 21 Jun 2016 19:32:30 +0000 (22:32 +0300)]
cmake: fix export issue

opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)

8 years agomerge #ifs in highgui bindings
Matthew Skolaut [Tue, 21 Jun 2016 22:16:16 +0000 (17:16 -0500)]
merge #ifs in highgui bindings

8 years agoMerge pull request #6709 from alalek:cmake_hal_fix
Alexander Alekhin [Tue, 21 Jun 2016 19:27:02 +0000 (19:27 +0000)]
Merge pull request #6709 from alalek:cmake_hal_fix

8 years agoUse CMAKE_LIBRARY_PATH_FLAG variable instead of -L.
Julien Dubiel [Tue, 21 Jun 2016 18:00:50 +0000 (20:00 +0200)]
Use CMAKE_LIBRARY_PATH_FLAG variable instead of -L.

8 years agocmake: fix HAL dependencies for core module
Alexander Alekhin [Tue, 21 Jun 2016 16:50:32 +0000 (19:50 +0300)]
cmake: fix HAL dependencies for core module

Linker dependencies are transitive for non-private

8 years agoMerge pull request #6705 from alalek:fix_hal_imgproc
Alexander Alekhin [Tue, 21 Jun 2016 16:24:29 +0000 (16:24 +0000)]
Merge pull request #6705 from alalek:fix_hal_imgproc

8 years agoMerge pull request #6708 from alalek:pr6477
Alexander Alekhin [Tue, 21 Jun 2016 15:38:41 +0000 (15:38 +0000)]
Merge pull request #6708 from alalek:pr6477

8 years agoMerge pull request #6581 from mshabunin:hal_mag
Alexander Alekhin [Tue, 21 Jun 2016 13:16:17 +0000 (13:16 +0000)]
Merge pull request #6581 from mshabunin:hal_mag

8 years agoMerge pull request #6704 from alalek:cmake_cmp0042
Alexander Alekhin [Tue, 21 Jun 2016 10:46:08 +0000 (10:46 +0000)]
Merge pull request #6704 from alalek:cmake_cmp0042

8 years agofix casting warning in python createButton binding
Matthew Skolaut [Tue, 21 Jun 2016 02:07:24 +0000 (21:07 -0500)]
fix casting warning in python createButton binding

8 years agoMerge branch 'master' of https://github.com/Itseez/opencv
Matthew Skolaut [Mon, 20 Jun 2016 21:24:23 +0000 (16:24 -0500)]
Merge branch 'master' of https://github.com/Itseez/opencv
Added python binding for createButton

8 years agoadded python binding for createButton
Matthew Skolaut [Mon, 20 Jun 2016 21:24:15 +0000 (16:24 -0500)]
added python binding for createButton

8 years agohal: fix missing include "opencv2/imgproc/hal/interface.h"
Alexander Alekhin [Mon, 20 Jun 2016 16:25:49 +0000 (19:25 +0300)]
hal: fix missing include "opencv2/imgproc/hal/interface.h"

8 years agocmake: change CMP0042 policy value
Alexander Alekhin [Mon, 20 Jun 2016 14:19:13 +0000 (17:19 +0300)]
cmake: change CMP0042 policy value

8 years agoMerge pull request #5980 from alalek:cmake_opencv_config
Alexander Alekhin [Mon, 20 Jun 2016 15:27:43 +0000 (15:27 +0000)]
Merge pull request #5980 from alalek:cmake_opencv_config

8 years agocmake: refactoring of OpenCVConfig
Alexander Alekhin [Mon, 11 Jan 2016 14:54:14 +0000 (17:54 +0300)]
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

8 years agoandroid: update build scripts
Alexander Alekhin [Mon, 18 Jan 2016 11:11:02 +0000 (14:11 +0300)]
android: update build scripts

8 years agochange the parameter to `CvMat` and `CvMatND`
MYLS [Mon, 20 Jun 2016 08:59:58 +0000 (16:59 +0800)]
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);
```

8 years agosolve warning for IOS
MYLS [Sat, 18 Jun 2016 18:44:39 +0000 (02:44 +0800)]
solve warning for IOS

Two test are still needed:

1. Verify the Base64 data.
2. Read an old YML file for compatibility test.

8 years agoSolve warnings, and adjusted the test case.
MYLS [Sat, 18 Jun 2016 18:00:32 +0000 (02:00 +0800)]
Solve warnings, and adjusted the test case.

8 years agofix errors from test.
MYLS [Sat, 18 Jun 2016 16:45:51 +0000 (00:45 +0800)]
fix errors from test.

Two other test are still needed.

1. Verify the Base64 data.
2. Read an old YML file for compatibility test.

8 years agofix most coding style warnings and errors
MYLS [Sat, 18 Jun 2016 15:28:12 +0000 (23:28 +0800)]
fix most coding style warnings and errors

8 years agoAdd Base64 support for FileStorage
MYLS [Sat, 18 Jun 2016 14:13:49 +0000 (22:13 +0800)]
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.

8 years agoAdd Base64 support for FileStorage
MYLS [Sat, 18 Jun 2016 13:40:29 +0000 (21:40 +0800)]
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);
```

8 years agoMerge pull request #6675 from pnordhus:matconstiterator_reference
Alexander Alekhin [Fri, 17 Jun 2016 10:12:51 +0000 (10:12 +0000)]
Merge pull request #6675 from pnordhus:matconstiterator_reference

8 years agoMerge pull request #6668 from yadavankit:master
Alexander Alekhin [Fri, 17 Jun 2016 10:11:49 +0000 (10:11 +0000)]
Merge pull request #6668 from yadavankit:master

8 years agoMerge pull request #6535 from sovrasov:lapack-hal
Vadim Pisarevsky [Thu, 16 Jun 2016 20:09:47 +0000 (20:09 +0000)]
Merge pull request #6535 from sovrasov:lapack-hal

8 years agoMerge pull request #6453 from sovrasov:extend_calibrateCamera
Vadim Pisarevsky [Thu, 16 Jun 2016 18:28:49 +0000 (18:28 +0000)]
Merge pull request #6453 from sovrasov:extend_calibrateCamera

8 years agoMerge pull request #6690 from alalek:cmake_fix_android_samples
Alexander Alekhin [Thu, 16 Jun 2016 15:56:19 +0000 (15:56 +0000)]
Merge pull request #6690 from alalek:cmake_fix_android_samples

8 years agocmake: fix JNI configuration problem for Android samples
Alexander Alekhin [Thu, 16 Jun 2016 11:29:36 +0000 (14:29 +0300)]
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"

8 years agoMerge pull request #6685 from ioxp:dofDocu
Alexander Alekhin [Wed, 15 Jun 2016 20:43:11 +0000 (20:43 +0000)]
Merge pull request #6685 from ioxp:dofDocu

8 years agoMerge pull request #6683 from alalek:cmake_hal
Alexander Alekhin [Wed, 15 Jun 2016 17:18:56 +0000 (17:18 +0000)]
Merge pull request #6683 from alalek:cmake_hal

8 years agorigidTransform: only four DoF
Philipp Hasper [Wed, 15 Jun 2016 14:41:39 +0000 (16:41 +0200)]
rigidTransform: only four DoF

combinations of translation, rotation, and uniform scaling equals four degrees of freedom

8 years agocmake: refactor HAL attaching process
Alexander Alekhin [Wed, 15 Jun 2016 12:51:19 +0000 (15:51 +0300)]
cmake: refactor HAL attaching process

8 years agoReturn reference on iterator indirection/subscript
Philipp Nordhus [Sat, 11 Jun 2016 13:17:52 +0000 (15:17 +0200)]
Return reference on iterator indirection/subscript

8 years agoFix typo
Ankit Yadav [Sat, 11 Jun 2016 12:26:58 +0000 (17:56 +0530)]
Fix typo

8 years agoMerge pull request #6649 from adamrankin:msmf_crash_fix
Alexander Alekhin [Wed, 8 Jun 2016 16:30:55 +0000 (16:30 +0000)]
Merge pull request #6649 from adamrankin:msmf_crash_fix

8 years agoCorrecting return type from videoDevice::findType to be int thus allowing detection...
Adam Rankin [Tue, 7 Jun 2016 19:14:27 +0000 (15:14 -0400)]
Correcting return type from videoDevice::findType to be int thus allowing detection of failed device init request

8 years agoMerge pull request #6645 from tomoaki0705:fixTypoEigen
Alexander Alekhin [Tue, 7 Jun 2016 13:51:30 +0000 (13:51 +0000)]
Merge pull request #6645 from tomoaki0705:fixTypoEigen

8 years agoAdd an extended version of CalibrateCamera function
Vladislav Sovrasov [Tue, 7 Jun 2016 09:31:11 +0000 (12:31 +0300)]
Add an extended version of CalibrateCamera function

8 years agoChange names of some internal functions
Vladislav Sovrasov [Tue, 7 Jun 2016 07:58:12 +0000 (10:58 +0300)]
Change names of some internal functions

8 years agofix typo
Tomoaki Teshima [Tue, 7 Jun 2016 05:53:04 +0000 (14:53 +0900)]
fix typo

8 years agoMerge pull request #6607 from alalek:issue_6604
Maksim Shabunin [Mon, 6 Jun 2016 09:20:57 +0000 (09:20 +0000)]
Merge pull request #6607 from alalek:issue_6604

8 years agoMerge pull request #6628 from sovrasov:hal_samples_update
Maksim Shabunin [Mon, 6 Jun 2016 09:18:26 +0000 (09:18 +0000)]
Merge pull request #6628 from sovrasov:hal_samples_update