platform/upstream/opencv.git
7 years agoMerge pull request #8754 from berak:fix_py_hog_svm_tut
Alexander Alekhin [Mon, 22 May 2017 13:41:10 +0000 (13:41 +0000)]
Merge pull request #8754 from berak:fix_py_hog_svm_tut

7 years agoUpdate broken downloads link in documentation (#8764)
Drew Hintz [Mon, 22 May 2017 09:37:58 +0000 (11:37 +0200)]
Update broken downloads link in documentation (#8764)

* Update broken downloads link

* Update broken downloads link

* Update broken downloads link

7 years agofix py_svm_opencv sample
berak [Sat, 20 May 2017 05:52:50 +0000 (07:52 +0200)]
fix py_svm_opencv sample

7 years agoMerge pull request #8399 from woodychow:filter_avx2
Vadim Pisarevsky [Wed, 17 May 2017 15:06:24 +0000 (15:06 +0000)]
Merge pull request #8399 from woodychow:filter_avx2

7 years agoMerge pull request #8708 from terfendail:agast_fix
Vadim Pisarevsky [Wed, 17 May 2017 15:03:41 +0000 (15:03 +0000)]
Merge pull request #8708 from terfendail:agast_fix

7 years agoMerge pull request #8712 from grundman:patch-5
Vadim Pisarevsky [Wed, 17 May 2017 15:02:45 +0000 (15:02 +0000)]
Merge pull request #8712 from grundman:patch-5

7 years agoMerge pull request #8697 from sovrasov:cvt_col_bgra_bgra_fix
Vadim Pisarevsky [Wed, 17 May 2017 14:11:51 +0000 (14:11 +0000)]
Merge pull request #8697 from sovrasov:cvt_col_bgra_bgra_fix

7 years agoMerge pull request #8739 from terfendail:perf_accumulate_fix
Vadim Pisarevsky [Wed, 17 May 2017 14:07:56 +0000 (14:07 +0000)]
Merge pull request #8739 from terfendail:perf_accumulate_fix

7 years agoFix for accumulate performance test in case of multiple iterations
Vitaly Tuzov [Tue, 16 May 2017 15:22:45 +0000 (18:22 +0300)]
Fix for accumulate performance test in case of multiple iterations

7 years agoMerging master to filter_avx2, and resolving conflicts
Woody Chow [Tue, 16 May 2017 06:34:11 +0000 (15:34 +0900)]
Merging master to filter_avx2, and resolving conflicts

7 years agoimgproc: fix BGRA2BGRA conversion
Vladislav Sovrasov [Fri, 5 May 2017 11:41:46 +0000 (14:41 +0300)]
imgproc: fix BGRA2BGRA conversion

7 years agoMerge pull request #8727 from anupamsobti:master
Alexander Alekhin [Sat, 13 May 2017 16:08:38 +0000 (16:08 +0000)]
Merge pull request #8727 from anupamsobti:master

7 years agoMerge pull request #8711 from ArkadiuszRaj:aravis_autoexposure_correction
Arek [Fri, 12 May 2017 20:46:46 +0000 (22:46 +0200)]
Merge pull request #8711 from ArkadiuszRaj:aravis_autoexposure_correction

Aravis: Use of std::fabs, added support for 16-bit mono files and exposure compensation (#8711)

* Use of std::fabs, added support for 16-bit mono files

* Correction in priority2 stage &  adding exposure compensation

7 years agoMerge pull request #8596 from nnorwitz:nnorwitz
Alexander Alekhin [Fri, 12 May 2017 19:48:28 +0000 (19:48 +0000)]
Merge pull request #8596 from nnorwitz:nnorwitz

7 years agoFix for issue #8615. Added cudawarping to optional modules and removed opencv_cudafilters
Anupam Sobti [Fri, 12 May 2017 16:25:35 +0000 (21:55 +0530)]
Fix for issue #8615. Added cudawarping to optional modules and removed opencv_cudafilters

7 years agoMerge pull request #8724 from saskatchewancatch:i8723
Maksim Shabunin [Fri, 12 May 2017 15:44:22 +0000 (15:44 +0000)]
Merge pull request #8724 from saskatchewancatch:i8723

7 years agoissue 8723: Changed doc for cv::imwrite to reflect correct default flag used for...
saskatchewancatch [Fri, 12 May 2017 06:01:38 +0000 (00:01 -0600)]
issue 8723: Changed doc for cv::imwrite to reflect correct default flag used for png compression strategy.

7 years agoExtending template_matching tutorial with Java (#8043)
Cartucho [Thu, 11 May 2017 21:42:04 +0000 (22:42 +0100)]
Extending template_matching tutorial with Java (#8043)

* Extending template_matching tutorial with Java

* adding mask to java version of the tutorial

* adding the python toggle and code

* updating table of content

* adding py and java to table of content

* adding mask to python

* going back to markdown with duplicated text

* non duplicated text

7 years agoMerge pull request #8710 from ioxp:master
Alexander Alekhin [Thu, 11 May 2017 18:24:16 +0000 (18:24 +0000)]
Merge pull request #8710 from ioxp:master

7 years agoMerge pull request #8715 from berak:fix_digits_py
Maksim Shabunin [Thu, 11 May 2017 12:46:41 +0000 (12:46 +0000)]
Merge pull request #8715 from berak:fix_digits_py

7 years agopy_samples: fix digits.py
berak [Thu, 11 May 2017 06:34:21 +0000 (08:34 +0200)]
py_samples: fix digits.py

7 years agoUpdate cap_mjpeg_encoder.cpp
Matthias Grundmann [Wed, 10 May 2017 20:29:02 +0000 (13:29 -0700)]
Update cap_mjpeg_encoder.cpp

Avoid shifting by 32bits; undefined behavior according to c - standard

7 years agoFixed exp32f() compilation on MSVC
Philipp Hasper [Wed, 10 May 2017 16:25:39 +0000 (18:25 +0200)]
Fixed exp32f() compilation on MSVC

7 years agoFixed out of bound reading in makeAgastOffsets
Vitaly Tuzov [Wed, 10 May 2017 13:21:22 +0000 (16:21 +0300)]
Fixed out of bound reading in makeAgastOffsets

7 years agoMerge pull request #8609 from LukeZheZhu:pyrlk_err_ocl_fix
Vadim Pisarevsky [Thu, 4 May 2017 16:12:13 +0000 (16:12 +0000)]
Merge pull request #8609 from LukeZheZhu:pyrlk_err_ocl_fix

7 years agoFix OpenCL's wrong output of calcOpticalFlowPyrLK function's output vector of err...
LukeZhu [Wed, 19 Apr 2017 07:49:42 +0000 (15:49 +0800)]
Fix OpenCL's wrong output of calcOpticalFlowPyrLK function's output vector of err. Improve err's precison of the calcOpticalFlowPyrLK OpenCL function and add the relative test.

7 years agoMerge pull request #8391 from woodychow:warpAffine_avx2
Vadim Pisarevsky [Wed, 3 May 2017 15:09:54 +0000 (15:09 +0000)]
Merge pull request #8391 from woodychow:warpAffine_avx2

7 years agoMerge pull request #8397 from woodychow:initUndistortRectifyMap_avx2
Vadim Pisarevsky [Wed, 3 May 2017 14:50:22 +0000 (14:50 +0000)]
Merge pull request #8397 from woodychow:initUndistortRectifyMap_avx2

7 years agoMerge pull request #8398 from woodychow:normL2Sqr_avx2
Vadim Pisarevsky [Wed, 3 May 2017 14:49:56 +0000 (14:49 +0000)]
Merge pull request #8398 from woodychow:normL2Sqr_avx2

7 years agoDon't blow out the stack. Use a smaller buffer and prevent buffer overruns with...
nnorwitz [Mon, 17 Apr 2017 05:21:35 +0000 (22:21 -0700)]
Don't blow out the stack.  Use a smaller buffer and prevent buffer overruns with snprintf.

7 years agoMerge pull request #7894 from alalek:ocl_program
Vadim Pisarevsky [Wed, 3 May 2017 13:48:57 +0000 (13:48 +0000)]
Merge pull request #7894 from alalek:ocl_program

7 years agoMerge pull request #8359 from csukuangfj:patch-fix-error-code-documentation
Vadim Pisarevsky [Wed, 3 May 2017 13:48:28 +0000 (13:48 +0000)]
Merge pull request #8359 from csukuangfj:patch-fix-error-code-documentation

7 years agoMerge pull request #8660 from 4ekmah:making_sgbm_parallel
Vadim Pisarevsky [Wed, 3 May 2017 13:47:36 +0000 (13:47 +0000)]
Merge pull request #8660 from 4ekmah:making_sgbm_parallel

7 years agoMerge pull request #8602 from alalek:ffmpeg_update
Vadim Pisarevsky [Wed, 3 May 2017 13:01:55 +0000 (13:01 +0000)]
Merge pull request #8602 from alalek:ffmpeg_update

7 years agoMerge pull request #8271 from ziggy90127:avfoundation-bugfix1
Vadim Pisarevsky [Wed, 3 May 2017 12:59:44 +0000 (12:59 +0000)]
Merge pull request #8271 from ziggy90127:avfoundation-bugfix1

7 years agoUpdate canny_detector.markdown (#8684)
vskarlsruhe [Wed, 3 May 2017 12:46:34 +0000 (14:46 +0200)]
Update canny_detector.markdown (#8684)

7 years agoMerge pull request #8432 from csukuangfj:issue-8411
Vadim Pisarevsky [Wed, 3 May 2017 12:39:55 +0000 (12:39 +0000)]
Merge pull request #8432 from csukuangfj:issue-8411

7 years agoMerge pull request #8653 from alalek:android_fixes
Maksim Shabunin [Wed, 3 May 2017 12:20:19 +0000 (12:20 +0000)]
Merge pull request #8653 from alalek:android_fixes

7 years agoMerge pull request #8557 from grundman:patch-3
Vadim Pisarevsky [Wed, 3 May 2017 12:12:59 +0000 (12:12 +0000)]
Merge pull request #8557 from grundman:patch-3

7 years agoMerge pull request #8582 from alalek:cmake_disable_insource_builds
Vadim Pisarevsky [Wed, 3 May 2017 11:53:32 +0000 (11:53 +0000)]
Merge pull request #8582 from alalek:cmake_disable_insource_builds

7 years agoMerge pull request #8580 from terfendail:ovx_newperftest
Vadim Pisarevsky [Wed, 3 May 2017 11:01:01 +0000 (11:01 +0000)]
Merge pull request #8580 from terfendail:ovx_newperftest

7 years agoMerge pull request #8598 from sovrasov:java_wrap_prt_arg
Vadim Pisarevsky [Wed, 3 May 2017 10:53:58 +0000 (10:53 +0000)]
Merge pull request #8598 from sovrasov:java_wrap_prt_arg

7 years agoMerge pull request #8676 from jveitchmichaelis:jveitchmichaelis-sgbm-create
Vadim Pisarevsky [Wed, 3 May 2017 10:28:39 +0000 (10:28 +0000)]
Merge pull request #8676 from jveitchmichaelis:jveitchmichaelis-sgbm-create

7 years agoMerge pull request #8688 from ysolovyov:num-jobs-fix
Vadim Pisarevsky [Wed, 3 May 2017 10:25:54 +0000 (10:25 +0000)]
Merge pull request #8688 from ysolovyov:num-jobs-fix

7 years agoMerge pull request #8686 from sovrasov:port_affine3_fix
Maksim Shabunin [Wed, 3 May 2017 10:20:16 +0000 (10:20 +0000)]
Merge pull request #8686 from sovrasov:port_affine3_fix

7 years agoMerge pull request #8649 from saskatchewancatch:8647
Maksim Shabunin [Wed, 3 May 2017 09:19:29 +0000 (09:19 +0000)]
Merge pull request #8649 from saskatchewancatch:8647

7 years agoFix buildcmd
Yuriy Solovyov [Tue, 2 May 2017 15:59:37 +0000 (18:59 +0300)]
Fix buildcmd

7 years agoUse all available cpu cores in iOS/OSX build procedure
Yuriy Solovyov [Tue, 2 May 2017 15:48:54 +0000 (18:48 +0300)]
Use all available cpu cores in iOS/OSX build procedure

7 years agocreate homogeneous affine matrix when constructing from 4x3 cv::Mat
André Mewes [Thu, 13 Apr 2017 12:39:10 +0000 (14:39 +0200)]
create homogeneous affine matrix when constructing from 4x3 cv::Mat

7 years agojava: allow to wrap functions which take cv::Ptr
Vladislav Sovrasov [Tue, 18 Apr 2017 08:28:26 +0000 (11:28 +0300)]
java: allow to wrap functions which take cv::Ptr

7 years agoIssue 8647: Updated doc for cv::matchTemplate to reflect current support for methods...
saskatchewancatch [Wed, 26 Apr 2017 03:54:37 +0000 (21:54 -0600)]
Issue 8647: Updated doc for cv::matchTemplate to reflect current support for methods when mast template is supplied.

7 years agoAdd default parameters for SGBM::create
jveitchmichaelis [Sat, 29 Apr 2017 19:38:06 +0000 (20:38 +0100)]
Add default parameters for SGBM::create

Added default parameters for minDisparity, numDisparities and blockSize. This fixes a bug where SGBM::load would not compile.

7 years agoMerge pull request #8671 from tomoaki0705:fixBuildVS2012sprintf
Alexander Alekhin [Sat, 29 Apr 2017 15:13:15 +0000 (15:13 +0000)]
Merge pull request #8671 from tomoaki0705:fixBuildVS2012sprintf

7 years agoMerge pull request #8675 from ninadpchaudhari:patch-1
Alexander Alekhin [Sat, 29 Apr 2017 15:12:46 +0000 (18:12 +0300)]
Merge pull request #8675 from ninadpchaudhari:patch-1

Spell correction

7 years agoSpell correction
Ninad P.Chaudhari [Sat, 29 Apr 2017 14:33:47 +0000 (20:03 +0530)]
Spell correction

Corrected the spelling which was used in explanation for parameters.

7 years agoMerge pull request #8665 from louiehelm:master
Alexander Alekhin [Fri, 28 Apr 2017 05:10:50 +0000 (05:10 +0000)]
Merge pull request #8665 from louiehelm:master

7 years agoFix Farneback GPU Sample in GCC6
Louie Helm [Thu, 27 Apr 2017 23:28:36 +0000 (16:28 -0700)]
Fix Farneback GPU Sample in GCC6

7 years agoMerge pull request #8654 from paroj:py_vector_ptr
Alexander Alekhin [Thu, 27 Apr 2017 18:23:42 +0000 (18:23 +0000)]
Merge pull request #8654 from paroj:py_vector_ptr

7 years agoMerge pull request #8664 from alalek:fix_build_with_tbb
Alexander Alekhin [Thu, 27 Apr 2017 16:29:46 +0000 (16:29 +0000)]
Merge pull request #8664 from alalek:fix_build_with_tbb

7 years agoMerge pull request #8663 from rib:wip/rib/android-build-fix
Alexander Alekhin [Thu, 27 Apr 2017 15:36:26 +0000 (15:36 +0000)]
Merge pull request #8663 from rib:wip/rib/android-build-fix

7 years agocmake: dispatcher: add handling of include dirs
Alexander Alekhin [Thu, 27 Apr 2017 15:06:04 +0000 (18:06 +0300)]
cmake: dispatcher: add handling of include dirs

from linked targets of base modules

7 years agoMerge pull request #8656 from alalek:fix_cpu_detection
Alexander Alekhin [Thu, 27 Apr 2017 14:14:56 +0000 (14:14 +0000)]
Merge pull request #8656 from alalek:fix_cpu_detection

7 years agocore: avoid clash with _N define from ctype.h in headers
Robert Bragg [Thu, 27 Apr 2017 13:32:06 +0000 (14:32 +0100)]
core: avoid clash with _N define from ctype.h in headers

This updates the public headers to use _Nm instead of _N in templates
since _N is defined by the widely used ctype.h.

7 years agoTest data correction.
Pyotr Chekmaryov [Thu, 27 Apr 2017 10:05:55 +0000 (10:05 +0000)]
Test data correction.

7 years agoExtended set of existing performance test to OpenVX HAL suitable execution modes
Vitaly Tuzov [Fri, 14 Apr 2017 10:35:07 +0000 (13:35 +0300)]
Extended set of existing performance test to OpenVX HAL suitable execution modes

7 years agopython: move Ptr specializations above generic_vec to allow vector_Ptr_T
Pavel Rojtberg [Wed, 26 Apr 2017 12:22:14 +0000 (14:22 +0200)]
python: move Ptr specializations above generic_vec to allow vector_Ptr_T

7 years agocmake: fix POPCNT & SSE4.2 detection code
Alexander Alekhin [Wed, 26 Apr 2017 15:54:08 +0000 (18:54 +0300)]
cmake: fix POPCNT & SSE4.2 detection code

7 years agoMerge pull request #8655 from alalek:fix_bug_persistence_raw_io
Alexander Alekhin [Wed, 26 Apr 2017 15:57:00 +0000 (15:57 +0000)]
Merge pull request #8655 from alalek:fix_bug_persistence_raw_io

7 years agoMerge pull request #8588 from kylefleming:mac-deployment-target
Alexander Alekhin [Wed, 26 Apr 2017 15:27:35 +0000 (15:27 +0000)]
Merge pull request #8588 from kylefleming:mac-deployment-target

7 years agocore: fix persistence bug in RAW I/O code
Alexander Alekhin [Wed, 26 Apr 2017 14:19:26 +0000 (17:19 +0300)]
core: fix persistence bug in RAW I/O code

- persistence.cpp code expects special sizeof value for passed structures
- this assumption is lead to memory corruption problems
- fixed/workarounded test to prevent memory corruption on Linux 32-bit systems

7 years agoMerge pull request #8640 from alalek:doc_mathjax
Alexander Alekhin [Wed, 26 Apr 2017 11:29:29 +0000 (11:29 +0000)]
Merge pull request #8640 from alalek:doc_mathjax

7 years agoandroid: build fixes
Alexander Alekhin [Wed, 26 Apr 2017 10:58:35 +0000 (13:58 +0300)]
android: build fixes

- eliminate CMake 3.5+ warnings
- removed usage of dropped "OPENCV_CAMERA_MODULES" variable
- partial support for Android NDK 11+

7 years agoMerge pull request #8629 from lupustr3:pvlasov/icv2017u2_update2
Alexander Alekhin [Wed, 26 Apr 2017 10:45:37 +0000 (10:45 +0000)]
Merge pull request #8629 from lupustr3:pvlasov/icv2017u2_update2

7 years agoMerge pull request #8648 from alalek:cmake_fix_ippiw
Alexander Alekhin [Wed, 26 Apr 2017 10:13:52 +0000 (10:13 +0000)]
Merge pull request #8648 from alalek:cmake_fix_ippiw

7 years agocmake: update handling of IPPICV/IPPIW
Alexander Alekhin [Tue, 25 Apr 2017 13:48:50 +0000 (16:48 +0300)]
cmake: update handling of IPPICV/IPPIW

7 years agoMemory repaired + Cleanup.
Pyotr Chekmaryov [Tue, 25 Apr 2017 21:00:31 +0000 (21:00 +0000)]
Memory repaired + Cleanup.

7 years agoMerge pull request #8558 from grundman:patch-4
Alexander Alekhin [Tue, 25 Apr 2017 16:03:02 +0000 (16:03 +0000)]
Merge pull request #8558 from grundman:patch-4

7 years agoUpdate for IPP for OpenCV 2017u2 integration;
Pavel Vlasov [Fri, 21 Apr 2017 11:52:45 +0000 (14:52 +0300)]
Update for IPP for OpenCV 2017u2 integration;

Updated integrations for:
cv::split
cv::merge
cv::insertChannel
cv::extractChannel
cv::Mat::convertTo - now with scaled conversions support
cv::LUT - disabled due to performance issues
Mat::copyTo
Mat::setTo
cv::flip
cv::copyMakeBorder - currently disabled
cv::polarToCart
cv::pow - ipp pow function was removed due to performance issues
cv::hal::magnitude32f/64f - disabled for <= SSE42, poor performance
cv::countNonZero
cv::minMaxIdx
cv::norm
cv::canny - new integration. Disabled for threaded;
cv::cornerHarris
cv::boxFilter
cv::bilateralFilter
cv::integral

7 years agoMerge pull request #8620 from saskatchewancatch:8457
Alexander Alekhin [Tue, 25 Apr 2017 12:22:51 +0000 (12:22 +0000)]
Merge pull request #8620 from saskatchewancatch:8457

7 years agoUpdated comments for cv::ellipse and cv::ellipse2Poly to clarify some behaviour that...
saskatchewancatch [Thu, 20 Apr 2017 06:14:18 +0000 (00:14 -0600)]
Updated comments for cv::ellipse and cv::ellipse2Poly to clarify some behaviour that has confused some users.

Amend: Delete trailing whitespace to make doc tests happy

7 years agoMerge pull request #8603 from alalek:fix_test_name
Alexander Alekhin [Tue, 25 Apr 2017 10:36:03 +0000 (10:36 +0000)]
Merge pull request #8603 from alalek:fix_test_name

7 years agoMerge pull request #8646 from saskatchewancatch:i8632
Alexander Alekhin [Tue, 25 Apr 2017 10:33:17 +0000 (10:33 +0000)]
Merge pull request #8646 from saskatchewancatch:i8632

7 years agoMerge pull request #8645 from brian-armstrong-discord:bugfix_inmemory_exif
Alexander Alekhin [Tue, 25 Apr 2017 10:32:00 +0000 (10:32 +0000)]
Merge pull request #8645 from brian-armstrong-discord:bugfix_inmemory_exif

7 years agoMerge pull request #8639 from berak:fix_webp_grayscale
Alexander Alekhin [Tue, 25 Apr 2017 10:29:58 +0000 (10:29 +0000)]
Merge pull request #8639 from berak:fix_webp_grayscale

7 years agoMerge pull request #8616 from vpisarev:dnn4
Vadim Pisarevsky [Tue, 25 Apr 2017 06:32:16 +0000 (06:32 +0000)]
Merge pull request #8616 from vpisarev:dnn4

7 years ago8632: Corrected cv::seamlessClone doc to reflect actual name of flag used in code
saskatchewancatch [Tue, 25 Apr 2017 03:01:38 +0000 (21:01 -0600)]
8632: Corrected cv::seamlessClone doc to reflect actual name of flag used in code

7 years agofix ByteStreamBuffer
Brian Armstrong [Tue, 25 Apr 2017 01:03:59 +0000 (18:03 -0700)]
fix ByteStreamBuffer

7 years agodoc: change MathJax URL
Alexander Alekhin [Mon, 24 Apr 2017 13:56:33 +0000 (16:56 +0300)]
doc: change MathJax URL

https://www.mathjax.org/cdn-shutting-down/#alternative-cdn-providers

7 years agoimgcodecs: fix webp IMREAD_GRAYSCALE loading
berak [Mon, 24 Apr 2017 09:53:50 +0000 (11:53 +0200)]
imgcodecs: fix webp IMREAD_GRAYSCALE loading

7 years agoMerge pull request #8618 from pwuertz:umat-pyopencl
Alexander Alekhin [Sun, 23 Apr 2017 13:49:24 +0000 (13:49 +0000)]
Merge pull request #8618 from pwuertz:umat-pyopencl

7 years agoMerge pull request #8635 from daB0bby:patch-1
Alexander Alekhin [Sun, 23 Apr 2017 13:47:02 +0000 (13:47 +0000)]
Merge pull request #8635 from daB0bby:patch-1

7 years agoFixes typo
daB0bby [Sat, 22 Apr 2017 10:32:18 +0000 (12:32 +0200)]
Fixes typo

7 years agoAdd docstring for UMat::handle
Peter Würtz [Fri, 21 Apr 2017 10:21:54 +0000 (12:21 +0200)]
Add docstring for UMat::handle

7 years agoExpose UMat OpenCL handles and buffer information to python
Peter Würtz [Wed, 19 Apr 2017 18:41:48 +0000 (20:41 +0200)]
Expose UMat OpenCL handles and buffer information to python

7 years agoVertical passes added and we have working parralel version.
Pyotr Chekmaryov [Sat, 22 Apr 2017 00:00:08 +0000 (00:00 +0000)]
Vertical passes added and we have working parralel version.

7 years agoMerge pull request #8612 from sovrasov:roi_selector
Alexander Alekhin [Fri, 21 Apr 2017 17:20:28 +0000 (17:20 +0000)]
Merge pull request #8612 from sovrasov:roi_selector

7 years agofix test error on VS2012
Tomoaki Teshima [Fri, 21 Apr 2017 14:07:46 +0000 (23:07 +0900)]
fix test error on VS2012

7 years agoMerge pull request #8593 from devnexen:test_fixes
Alexander Alekhin [Fri, 21 Apr 2017 12:41:10 +0000 (12:41 +0000)]
Merge pull request #8593 from devnexen:test_fixes

7 years agoMerge pull request #8575 from lupustr3:pvlasov/icv2017u2_initial_update
Alexander Alekhin [Fri, 21 Apr 2017 10:55:29 +0000 (10:55 +0000)]
Merge pull request #8575 from lupustr3:pvlasov/icv2017u2_initial_update

7 years agoMerge pull request #8627 from alessandro-gentilini:patch-1
Alexander Alekhin [Fri, 21 Apr 2017 10:43:34 +0000 (10:43 +0000)]
Merge pull request #8627 from alessandro-gentilini:patch-1