platform/upstream/opencv.git
7 years agoMerge pull request #8283 from ramele1907:master
Vadim Pisarevsky [Thu, 2 Mar 2017 05:54:06 +0000 (05:54 +0000)]
Merge pull request #8283 from ramele1907:master

7 years agoMerge pull request #8288 from Jejos:bugfix_medianBlur_accessviolation
Vadim Pisarevsky [Thu, 2 Mar 2017 05:53:09 +0000 (05:53 +0000)]
Merge pull request #8288 from Jejos:bugfix_medianBlur_accessviolation

7 years agoMerge pull request #8289 from vskarlsruhe:patch-4
Vadim Pisarevsky [Thu, 2 Mar 2017 05:52:05 +0000 (05:52 +0000)]
Merge pull request #8289 from vskarlsruhe:patch-4

7 years agoMerge pull request #8293 from alalek:update_rng_in_parallel_for
Vadim Pisarevsky [Thu, 2 Mar 2017 05:51:01 +0000 (05:51 +0000)]
Merge pull request #8293 from alalek:update_rng_in_parallel_for

7 years agoMerge pull request #8297 from csukuangfj:csukuangfj-patch
Vadim Pisarevsky [Thu, 2 Mar 2017 05:47:33 +0000 (05:47 +0000)]
Merge pull request #8297 from csukuangfj:csukuangfj-patch

7 years agoMerge pull request #8299 from sovrasov:fs_fix_kpts_dmatch_output
Vadim Pisarevsky [Thu, 2 Mar 2017 05:46:38 +0000 (05:46 +0000)]
Merge pull request #8299 from sovrasov:fs_fix_kpts_dmatch_output

7 years agoMerge pull request #8253 from adl1995:master
Adeel Ahmad [Wed, 1 Mar 2017 18:44:34 +0000 (23:44 +0500)]
Merge pull request #8253 from adl1995:master

* Update linux_install.markdown

Grammar improvements, fixed typos.

* Update tutorials.markdown

Improvements in grammar.

* Update table_of_content_calib3d.markdown

* Update camera_calibration_square_chess.markdown

Improvements in grammar. Added answer.

* Update tutorials.markdown

* Update erosion_dilatation.markdown

* Update table_of_content_imgproc.markdown

* Update warp_affine.markdown

* Update camera_calibration_square_chess.markdown

Removed extra space.

* Update gpu_basics_similarity.markdown

Grammatical improvements, fixed typos.

* Update trackbar.markdown

Improvement for better understanding.

7 years agoMerge pull request #8238 from PkLab:fix_doc_ellipse
Alexander Alekhin [Wed, 1 Mar 2017 14:31:06 +0000 (14:31 +0000)]
Merge pull request #8238 from PkLab:fix_doc_ellipse

7 years agoMerge pull request #8296 from ville-v:master
Alexander Alekhin [Wed, 1 Mar 2017 14:12:00 +0000 (14:12 +0000)]
Merge pull request #8296 from ville-v:master

7 years agoMerge pull request #8204 from terfendail:ovx_tlcontext
Alexander Alekhin [Wed, 1 Mar 2017 12:36:37 +0000 (12:36 +0000)]
Merge pull request #8204 from terfendail:ovx_tlcontext

7 years agoFix DMatch and Keypoint I/O in FileStorage
Vladislav Sovrasov [Wed, 1 Mar 2017 11:30:30 +0000 (14:30 +0300)]
Fix DMatch and Keypoint I/O in FileStorage

7 years agoFix typos.
Fangjun KUANG [Wed, 1 Mar 2017 10:13:46 +0000 (11:13 +0100)]
Fix typos.

7 years agoFix issue #8278: "CV_XADD compile errors with Embarcadero C++ Builder 10.1"
ville-v [Wed, 1 Mar 2017 06:47:49 +0000 (08:47 +0200)]
Fix issue #8278: "CV_XADD compile errors with Embarcadero C++ Builder 10.1"

7 years agoAdd files via upload
ville-v [Wed, 1 Mar 2017 06:42:14 +0000 (08:42 +0200)]
Add files via upload

Fix issue #8280: "fastmath.h related compile errors with Embarcadero C++ Builder 10.1"

7 years agocore: parallel_for_(): update RNG state of the main thread
Alexander Alekhin [Tue, 28 Feb 2017 15:21:44 +0000 (18:21 +0300)]
core: parallel_for_(): update RNG state of the main thread

7 years agocore(test): add regression test for RNG in parallel_for_()
Alexander Alekhin [Tue, 28 Feb 2017 15:01:41 +0000 (18:01 +0300)]
core(test): add regression test for RNG in parallel_for_()

7 years agocore: parallel_for_(): propagate RNG state from the main thread
Alexander Alekhin [Tue, 28 Feb 2017 14:27:26 +0000 (17:27 +0300)]
core: parallel_for_(): propagate RNG state from the main thread

7 years agoMerge pull request #8249 from vskarlsruhe:patch-1
Alexander Alekhin [Tue, 28 Feb 2017 14:25:50 +0000 (14:25 +0000)]
Merge pull request #8249 from vskarlsruhe:patch-1

7 years agoMerge pull request #8292 from sovrasov:backport_8267
Alexander Alekhin [Tue, 28 Feb 2017 11:56:25 +0000 (11:56 +0000)]
Merge pull request #8292 from sovrasov:backport_8267

7 years agoSolve issue #8264
umbraclet16 [Sat, 25 Feb 2017 08:16:23 +0000 (16:16 +0800)]
Solve issue #8264

Fix bug in camera_calibration.cpp that the program tries to
parse input of type VIDEO_FILE as IMAGE_LIST which causes the
program to crash.

7 years agoCode cleanup, removed cv:: because using namespace cv is already used.
vskarlsruhe [Tue, 28 Feb 2017 09:03:09 +0000 (10:03 +0100)]
Code cleanup, removed cv:: because using namespace cv is already used.

7 years agofix medianBlur accessviolation
Jejos [Tue, 28 Feb 2017 07:31:28 +0000 (08:31 +0100)]
fix medianBlur accessviolation

medianBlur called with "empty" source and ksize >= 7 crashes application with accessviolation. With this extra assert this is avoided and the application may normally catch the thrown exception.

7 years agoMerge pull request #8231 from paroj:pytype
Maksim Shabunin [Mon, 27 Feb 2017 11:17:01 +0000 (11:17 +0000)]
Merge pull request #8231 from paroj:pytype

7 years agoMerge pull request #8250 from tomoaki0705:fixNonAsciiChar
Alexander Alekhin [Fri, 24 Feb 2017 11:19:00 +0000 (11:19 +0000)]
Merge pull request #8250 from tomoaki0705:fixNonAsciiChar

7 years agoMerge pull request #8244 from sovrasov:adjust_roi_fix
Alexander Alekhin [Fri, 24 Feb 2017 11:18:35 +0000 (11:18 +0000)]
Merge pull request #8244 from sovrasov:adjust_roi_fix

7 years agoMerge pull request #8239 from tomoaki0705:buildUniversalIntrinsicBlend
Alexander Alekhin [Fri, 24 Feb 2017 11:17:51 +0000 (11:17 +0000)]
Merge pull request #8239 from tomoaki0705:buildUniversalIntrinsicBlend

7 years agoMerge pull request #8235 from berak:fix_dshow_leak
Alexander Alekhin [Fri, 24 Feb 2017 11:11:19 +0000 (11:11 +0000)]
Merge pull request #8235 from berak:fix_dshow_leak

7 years agoMerge pull request #8064 from terfendail:sgbm_bigbuffer
Vadim Pisarevsky [Thu, 23 Feb 2017 20:11:26 +0000 (20:11 +0000)]
Merge pull request #8064 from terfendail:sgbm_bigbuffer

7 years agoremove non ASCII character from comment
Tomoaki Teshima [Thu, 23 Feb 2017 16:31:32 +0000 (01:31 +0900)]
remove non ASCII character from comment

7 years agoUpdate AddingImages.cpp
vskarlsruhe [Thu, 23 Feb 2017 10:43:30 +0000 (11:43 +0100)]
Update AddingImages.cpp

If-condition was always true (alpha = 0.5 is set in Line 19).
Now the user input is checked to be between 0 and 1.
This is correct in the tutorial code for OpenCV 2.4.

7 years agoChange image e small fix to cv::ellipse() Doc
PkLab.net [Tue, 21 Feb 2017 19:02:30 +0000 (20:02 +0100)]
Change image e small fix to cv::ellipse() Doc

7 years agosuppress warnings
Tomoaki Teshima [Thu, 23 Feb 2017 00:11:12 +0000 (09:11 +0900)]
suppress warnings
 - brush up the implementation

7 years agoMerge pull request #8234 from alalek:issue_8121
Alexander Alekhin [Wed, 22 Feb 2017 16:21:00 +0000 (16:21 +0000)]
Merge pull request #8234 from alalek:issue_8121

7 years agoMerge pull request #8243 from sovrasov:hal_round_to_cvround
Maksim Shabunin [Wed, 22 Feb 2017 15:52:10 +0000 (15:52 +0000)]
Merge pull request #8243 from sovrasov:hal_round_to_cvround

7 years agoMerge pull request #8240 from hewj03:issue_1012_contrib
Maksim Shabunin [Wed, 22 Feb 2017 15:51:07 +0000 (15:51 +0000)]
Merge pull request #8240 from hewj03:issue_1012_contrib

7 years agohal: replace round() with cvRound()
Vladislav Sovrasov [Tue, 21 Feb 2017 14:40:53 +0000 (17:40 +0300)]
hal: replace round() with cvRound()

7 years agocore: fix adjustROI behavior on indexes overflow
Vladislav Sovrasov [Wed, 22 Feb 2017 11:00:22 +0000 (14:00 +0300)]
core: fix adjustROI behavior on indexes overflow

7 years agofix multiband_blend.cu build error in issue opencv_contrib#1012
Wenju He [Wed, 22 Feb 2017 00:44:10 +0000 (08:44 +0800)]
fix multiband_blend.cu build error in issue opencv_contrib#1012

7 years agoChange the value of bit/pixel from channels to 8*channels because videos encoded
ionut [Tue, 21 Feb 2017 17:15:40 +0000 (19:15 +0200)]
Change the value of bit/pixel from channels to 8*channels because videos encoded
by cap_mjpeg_encoder.cpp don't play on windows media player.
Issue number #8113

7 years agocmake: disable pkg-config for Apple frameworks
Alexander Alekhin [Tue, 21 Feb 2017 16:23:37 +0000 (19:23 +0300)]
cmake: disable pkg-config for Apple frameworks

7 years agofix leaking handle in cap_dshow.cpp
berak [Tue, 21 Feb 2017 13:27:12 +0000 (14:27 +0100)]
fix leaking handle in cap_dshow.cpp

7 years agoOpenVX calls updated to use single common OpenVX context per thread
Vitaly Tuzov [Tue, 14 Feb 2017 10:32:17 +0000 (13:32 +0300)]
OpenVX calls updated to use single common OpenVX context per thread

7 years agocore(TLS): add cleanup() method
Alexander Alekhin [Wed, 15 Feb 2017 17:20:38 +0000 (20:20 +0300)]
core(TLS): add cleanup() method

7 years agocmake: append '-framework UIKit' for videoio/imgcodecs module
Alexander Alekhin [Tue, 21 Feb 2017 09:52:06 +0000 (12:52 +0300)]
cmake: append '-framework UIKit' for videoio/imgcodecs module

7 years agoios framework: don't disable opencv_world in dynamic framework
Alexander Alekhin [Tue, 21 Feb 2017 09:50:40 +0000 (12:50 +0300)]
ios framework: don't disable opencv_world in dynamic framework

7 years agoios framework: refactor code (no functional changes)
Alexander Alekhin [Tue, 21 Feb 2017 09:50:09 +0000 (12:50 +0300)]
ios framework: refactor code (no functional changes)

7 years agopython: type of initial_button_state must match format string
Pavel Rojtberg [Mon, 20 Feb 2017 17:02:35 +0000 (18:02 +0100)]
python: type of initial_button_state must match format string

7 years agoFix typos in the documentation (#8226)
Fangjun KUANG [Tue, 21 Feb 2017 09:48:15 +0000 (10:48 +0100)]
Fix typos in the documentation (#8226)

* fix typos.

* Fix typos.

* Fix typos.

* Fix typos.

* Fix typos.

7 years agoMerge pull request #8228 from csukuangfj:csukuangfj-patch
Vadim Pisarevsky [Tue, 21 Feb 2017 09:46:09 +0000 (09:46 +0000)]
Merge pull request #8228 from csukuangfj:csukuangfj-patch

7 years agoMerge pull request #8233 from Sahloul:features/python_matx
Vadim Pisarevsky [Tue, 21 Feb 2017 09:43:26 +0000 (09:43 +0000)]
Merge pull request #8233 from Sahloul:features/python_matx

7 years agocv::Matx python wrapper
Hamdi Sahloul [Tue, 21 Feb 2017 02:29:28 +0000 (11:29 +0900)]
cv::Matx python wrapper

7 years agoAdd support to print `cv::UMat`.
Fangjun KUANG [Mon, 20 Feb 2017 15:22:46 +0000 (16:22 +0100)]
Add support to print `cv::UMat`.

Now a user can use `std::cout` to print an object of `cv::UMat` just like `cv::Mat`.

7 years agooptimize blend using universal intrinsic
Tomoaki Teshima [Mon, 20 Feb 2017 10:09:26 +0000 (19:09 +0900)]
optimize blend using universal intrinsic
 - add more channels/depth performance test for blend

7 years agoMerge pull request #8221 from csukuangfj:csukuangfj-path-2
Alexander Alekhin [Sun, 19 Feb 2017 10:15:59 +0000 (10:15 +0000)]
Merge pull request #8221 from csukuangfj:csukuangfj-path-2

7 years agoMerge pull request #8220 from LaurentBerger:Issue5035
LaurentBerger [Sun, 19 Feb 2017 10:15:58 +0000 (11:15 +0100)]
Merge pull request #8220 from LaurentBerger:Issue5035

7 years agoFix an error in the demo code for cv::Mat::forEach
Fangjun KUANG [Sat, 18 Feb 2017 09:14:29 +0000 (10:14 +0100)]
Fix an error in the demo code for cv::Mat::forEach

7 years agoMerge pull request #8178 from tomoaki0705:addBayer2RGBA
Vadim Pisarevsky [Thu, 16 Feb 2017 15:01:49 +0000 (15:01 +0000)]
Merge pull request #8178 from tomoaki0705:addBayer2RGBA

7 years agoMerge pull request #8187 from hewj03:improve-MultiBandBlender-cuda
Vadim Pisarevsky [Thu, 16 Feb 2017 15:00:58 +0000 (15:00 +0000)]
Merge pull request #8187 from hewj03:improve-MultiBandBlender-cuda

7 years agoFix the documentation for Mat::diag(int). (#8199)
Fangjun KUANG [Thu, 16 Feb 2017 15:00:32 +0000 (16:00 +0100)]
Fix the documentation for Mat::diag(int). (#8199)

* Fix the documentation for Mat::diag(int).

Fix issue #8181

* Fix the documentation for Mat::diag(int).

Fix issue #8181.

* Add support for printing out cv::Complex.

* Remove extra spaces.

* cv::Complex is submitted as a new pull request.

7 years agoMerge pull request #8203 from alalek:ocl_kernelarg_validate
Vadim Pisarevsky [Thu, 16 Feb 2017 14:58:25 +0000 (14:58 +0000)]
Merge pull request #8203 from alalek:ocl_kernelarg_validate

7 years agoMerge pull request #8214 from jinay1991:patch-1
Alexander Alekhin [Thu, 16 Feb 2017 11:08:59 +0000 (11:08 +0000)]
Merge pull request #8214 from jinay1991:patch-1

7 years agoUpdate ocl.cpp function Device::OpenCLVersion()
Jinay Patel [Thu, 16 Feb 2017 09:50:57 +0000 (15:20 +0530)]
Update ocl.cpp function Device::OpenCLVersion()

Instead of CL_DEVICE_EXTENSIONS in Querying OpenCLVersion, it should be CL_DEVICE_VERSION flag which needs to be passed to the function.

7 years agoMerge pull request #8211 from csukuangfj:csukuangfj-patch-3
Alexander Alekhin [Thu, 16 Feb 2017 08:57:44 +0000 (08:57 +0000)]
Merge pull request #8211 from csukuangfj:csukuangfj-patch-3

7 years agoMerge pull request #8210 from alalek:fix_mkl_link
Alexander Alekhin [Thu, 16 Feb 2017 08:56:02 +0000 (08:56 +0000)]
Merge pull request #8210 from alalek:fix_mkl_link

7 years agoMerge pull request #8131 from atinfinity:170205-add_dense_flow_sample
Vadim Pisarevsky [Wed, 15 Feb 2017 20:22:57 +0000 (20:22 +0000)]
Merge pull request #8131 from atinfinity:170205-add_dense_flow_sample

7 years agoMerge pull request #8153 from Sejsel:patch-1
Vadim Pisarevsky [Wed, 15 Feb 2017 20:17:39 +0000 (20:17 +0000)]
Merge pull request #8153 from Sejsel:patch-1

7 years agoMerge pull request #8208 from csukuangfj:complex_support
Fangjun KUANG [Wed, 15 Feb 2017 18:50:14 +0000 (19:50 +0100)]
Merge pull request #8208 from csukuangfj:complex_support

Add support for printing out cv::Complex. (#8208)

* Add support for printing out cv::Complex.

* Conform to the format of std::complex.

* Remove extra spaces.

* Remove extra spaces.

7 years agoMerge pull request #8209 from csukuangfj:csukuangfj-patch-2
Alexander Alekhin [Wed, 15 Feb 2017 18:48:01 +0000 (18:48 +0000)]
Merge pull request #8209 from csukuangfj:csukuangfj-patch-2

7 years agoChange the argument type to cl_platform_info.
Fangjun KUANG [Wed, 15 Feb 2017 15:44:40 +0000 (16:44 +0100)]
Change the argument type to cl_platform_info.

Although both `cl_platform_info` and `cl_device_info` are defined as macro `cl_uint`, it needs to use `cl_platform_info` to get
the platform information.

7 years agoMerge pull request #8206 from paroj:cast
Alexander Alekhin [Wed, 15 Feb 2017 15:35:16 +0000 (15:35 +0000)]
Merge pull request #8206 from paroj:cast

7 years agocmake: fix order of MKL libraries, don't pass additional libraries as modules
Alexander Alekhin [Wed, 15 Feb 2017 14:12:28 +0000 (17:12 +0300)]
cmake: fix order of MKL libraries, don't pass additional libraries as modules

7 years agoFix typos.
Fangjun KUANG [Wed, 15 Feb 2017 13:52:00 +0000 (14:52 +0100)]
Fix typos.

7 years agoadd missing casts to _Tp as determinant() always returns double
Pavel Rojtberg [Wed, 15 Feb 2017 11:18:35 +0000 (12:18 +0100)]
add missing casts to _Tp as determinant() always returns double

7 years agoocl: validate arguments in KernelArgs constructor
Alexander Alekhin [Tue, 14 Feb 2017 11:58:52 +0000 (14:58 +0300)]
ocl: validate arguments in KernelArgs constructor

- don't use undefined flag=0. It should be CONSTANT instead.
- don't allow 'UMat* m=NULL' argument (except LOCAL/CONSTANT flags).
  This case is not handled well to provide NULL __global pointers.
  It is better to use '-D' macro defines instead (at least for performance)

7 years agoMerge pull request #8160 from ilijapuaca:master
Alexander Alekhin [Tue, 14 Feb 2017 13:03:09 +0000 (13:03 +0000)]
Merge pull request #8160 from ilijapuaca:master

7 years agoMerge pull request #8186 from Kronopath:patch-1
Alexander Alekhin [Mon, 13 Feb 2017 10:59:59 +0000 (10:59 +0000)]
Merge pull request #8186 from Kronopath:patch-1

7 years agoMerge pull request #8176 from alalek:cmake_cleanup_msvc_checks
Alexander Alekhin [Mon, 13 Feb 2017 10:59:30 +0000 (10:59 +0000)]
Merge pull request #8176 from alalek:cmake_cleanup_msvc_checks

7 years agoMerge pull request #8175 from alalek:cmake_cleanup_defines
Alexander Alekhin [Mon, 13 Feb 2017 10:59:09 +0000 (10:59 +0000)]
Merge pull request #8175 from alalek:cmake_cleanup_defines

7 years agoMerge pull request #8197 from csukuangfj/csukuangfj-patch-1
Fangjun KUANG [Mon, 13 Feb 2017 10:58:44 +0000 (11:58 +0100)]
Merge pull request #8197 from csukuangfj/csukuangfj-patch-1

Fix typos in the documentation for AutoBuffer. (#8197)

* Allocate 1000 floats to match the documentation

Fix the documentation of `AutoBuffer`. By default, the following code
```.cpp
cv::AutoBuffer<float> m;
````
allocates only 264 floats. But the comment in the demonstration code says it allocates 1000 floats, which is
not correct.

* fix typo in the comment.

7 years agorefactoring
atinfinity [Sun, 12 Feb 2017 15:53:35 +0000 (00:53 +0900)]
refactoring

7 years agorefactoring
atinfinity [Sun, 12 Feb 2017 15:35:52 +0000 (00:35 +0900)]
refactoring

7 years agofixed indent
atinfinity [Sun, 12 Feb 2017 15:26:48 +0000 (00:26 +0900)]
fixed indent

7 years agoadded option to specify flow type
atinfinity [Sun, 12 Feb 2017 14:33:57 +0000 (23:33 +0900)]
added option to specify flow type

7 years agoadd accuracy test CUDA_MultiBandBlender
Wenju He [Sun, 12 Feb 2017 09:16:49 +0000 (17:16 +0800)]
add accuracy test CUDA_MultiBandBlender

7 years agoimprove MultiBandBlender cuda, add normalizeUsingWeight and addSrcWeight kernels
Wenju He [Sun, 12 Feb 2017 09:08:05 +0000 (17:08 +0800)]
improve MultiBandBlender cuda, add normalizeUsingWeight and addSrcWeight kernels

7 years agoWork around CMake bug that mangles install dir
Gabriel B. Nunes [Sun, 12 Feb 2017 01:40:37 +0000 (20:40 -0500)]
Work around CMake bug that mangles install dir

CMake has a long-standing bug/feature (see [here](https://cmake.org/pipermail/cmake/2015-March/060204.html) and reply [here](https://cmake.org/pipermail/cmake/2015-March/060209.html)) which can mangle certain path variables by attempting to make them into relative paths if you try to set them with CACHE PATH.

Say you have your OpenCV download at `/path/on/my/computer/to/opencv/`. What actually happens is that if you try to set this variable by invoking CMAKE with `-DCMAKE_INSTALL_PREFIX=/my/desired/install/path`, what you end up is *not* `/usr/local/` and *not* `my/desired/install/path`, but instead, this monstrosity: `/path/on/my/computer/to/opencv/src/OpenCV-build//my/desired/install/path`.

That is, CMake attempts, for some reason, to turn the path that you passed into a path relative to `${CMAKE_BINARY_DIR}`. See the links I posted above: this is a known (and apparently unfixable) issue with CMake.

In OpenCV's case, among other potential issues, this leads to broken paths in `opencv_tests_config.hpp`, which can break the build or cause bizarre behaviour.

The fix for this issue, as stated in my links above, is to test that the variable hasn't been set yet with an `if(NOT DEFINED ...)` before attempting to set it. This is what I've implemented here. I admit I don't know enough about OpenCV's internals to know whether you *really* need to force the install to be in `/usr/local`, but as it stands right now you get *neither* a clean `/usr/local` path *nor* a customized `/my/desired/install/path`, but a broken mess. This change at least allows the user to customize their install directory.

In the meantime, there's a workaround for this, by explicitly defining the variable as a path with `-DCMAKE_INSTALL_PREFIX:PATH=my/desired/install/path`. But if this change can save anyone else the hours of headaches that I had today, I'll be happy.

7 years agoMerge pull request #8165 from AdeelH:master
Alexander Alekhin [Sat, 11 Feb 2017 11:02:10 +0000 (11:02 +0000)]
Merge pull request #8165 from AdeelH:master

7 years agoadd enum Bayer**2BGRA
Tomoaki Teshima [Fri, 10 Feb 2017 15:20:57 +0000 (00:20 +0900)]
add enum Bayer**2BGRA
 - let it possible to reach Bayer2BGRA conversion

7 years agocmake: cleanup MSVC checks
Alexander Alekhin [Fri, 10 Feb 2017 12:28:50 +0000 (15:28 +0300)]
cmake: cleanup MSVC checks

7 years agocmake: cleanup unused defines
Alexander Alekhin [Fri, 10 Feb 2017 12:18:29 +0000 (15:18 +0300)]
cmake: cleanup unused defines

7 years agoMerge pull request #8150 from cclauss/patch-1
cclauss [Fri, 10 Feb 2017 12:12:11 +0000 (13:12 +0100)]
Merge pull request #8150 from cclauss/patch-1

cv2.findContours() no longer modifies source image (#8150)

* cv2.findContours() no longer modifies source image

Since OpenCV 3.2, cv2.findContours() no longer modifies the source image but returns a modified image as the first of three return parameters.  ??? Do I have that correct ???

Also fixed up the code blocks to be valid markdown.

* ```python --> @code{.py}

Enables syntax highlighting in docs.

7 years agoUpdated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp
Ilija Puaca [Thu, 9 Feb 2017 10:45:12 +0000 (11:45 +0100)]
Updated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp

7 years agoMerge pull request #8159 from alalek:fix_8158
Alexander Alekhin [Thu, 9 Feb 2017 15:52:38 +0000 (15:52 +0000)]
Merge pull request #8159 from alalek:fix_8158

7 years agoupdate fix for #8105 (compiling with mingw32)
Adeel [Thu, 9 Feb 2017 15:11:00 +0000 (20:11 +0500)]
update fix for #8105 (compiling with mingw32)

taken from https://github.com/google/googletest/pull/856

7 years agocore: fix String::end() implementation
Alexander Alekhin [Thu, 9 Feb 2017 10:23:35 +0000 (13:23 +0300)]
core: fix String::end() implementation

7 years agoFixed two typos in the Filter2D tutorial
Jiří Sejkora [Thu, 9 Feb 2017 01:07:06 +0000 (02:07 +0100)]
Fixed two typos in the Filter2D tutorial

7 years agoMerge pull request #8134 from chrizandr:doc_typo
Vadim Pisarevsky [Wed, 8 Feb 2017 13:57:36 +0000 (13:57 +0000)]
Merge pull request #8134 from chrizandr:doc_typo

7 years agoMerge pull request #7904 from paroj:initmapfc2
Vadim Pisarevsky [Wed, 8 Feb 2017 13:30:15 +0000 (13:30 +0000)]
Merge pull request #7904 from paroj:initmapfc2

7 years agoMerge pull request #7910 from StevenPuttemans:add_visapp2017_contribution
Vadim Pisarevsky [Wed, 8 Feb 2017 13:29:31 +0000 (13:29 +0000)]
Merge pull request #7910 from StevenPuttemans:add_visapp2017_contribution

7 years agoMerge pull request #8140 from StevenPuttemans:fix_gdal_driver_4channel_16bit
Alexander Alekhin [Wed, 8 Feb 2017 11:29:34 +0000 (11:29 +0000)]
Merge pull request #8140 from StevenPuttemans:fix_gdal_driver_4channel_16bit