platform/upstream/opencv.git
7 years agoMerge pull request #7462 from alalek:cpu_multi_target
Vadim Pisarevsky [Tue, 21 Mar 2017 19:51:32 +0000 (19:51 +0000)]
Merge pull request #7462 from alalek:cpu_multi_target

7 years agoMerge pull request #8424 from khnaba:expose-buffer-pool
Alexander Alekhin [Tue, 21 Mar 2017 12:43:15 +0000 (12:43 +0000)]
Merge pull request #8424 from khnaba:expose-buffer-pool

7 years agoMerge pull request #8401 from avartenkov:multichannel_warp
Alexander Alekhin [Tue, 21 Mar 2017 11:59:56 +0000 (11:59 +0000)]
Merge pull request #8401 from avartenkov:multichannel_warp

7 years agoMerge pull request #8416 from berak:patch-2
Alexander Alekhin [Tue, 21 Mar 2017 11:57:57 +0000 (11:57 +0000)]
Merge pull request #8416 from berak:patch-2

7 years agoExpose BufferPool class for external use also
Naba Kumar [Wed, 15 Mar 2017 13:22:32 +0000 (15:22 +0200)]
Expose BufferPool class for external use also

7 years agoMerge pull request #8393 from alalek:ocl_driver_version
Alexander Alekhin [Tue, 21 Mar 2017 10:44:52 +0000 (10:44 +0000)]
Merge pull request #8393 from alalek:ocl_driver_version

7 years agoMerge pull request #8422 from berak:fix_shapematchmodes
Alexander Alekhin [Tue, 21 Mar 2017 09:06:30 +0000 (09:06 +0000)]
Merge pull request #8422 from berak:fix_shapematchmodes

7 years agoFix multichannel warping with BORDER_CONSTANT
vartenkov [Thu, 16 Mar 2017 15:50:29 +0000 (18:50 +0300)]
Fix multichannel warping with BORDER_CONSTANT

Warping a matrix with more than 4 channels using BORDER_CONSTANT and
INTER_NEAREST, INTER_CUBIC or INTER_LANCZOS4 interpolation led to
undefined behaviour. This commit changes the behavior of these methods
to be similar to that of INTER_LINEAR. Changed the scope of some of the
variables to more local. Modified some tests to be able to detect the
error described.

7 years agoimgproc: move ShapeMatchModes enum from c to c++ header
berak [Mon, 20 Mar 2017 08:59:19 +0000 (09:59 +0100)]
imgproc: move ShapeMatchModes enum from c to c++ header

7 years agoremove unnessecary print statement
berak [Sun, 19 Mar 2017 09:12:50 +0000 (10:12 +0100)]
remove unnessecary print statement

#resolves: 7881

remove printf statement and associated variables from invMapPointSpherical() in undistort.cpp

7 years agoMerge pull request #8376 from mshabunin:reduce-dependencies
Alexander Alekhin [Wed, 15 Mar 2017 17:27:18 +0000 (17:27 +0000)]
Merge pull request #8376 from mshabunin:reduce-dependencies

7 years agoocl: dump OpenCL driver version in tests
Alexander Alekhin [Wed, 15 Mar 2017 15:23:30 +0000 (18:23 +0300)]
ocl: dump OpenCL driver version in tests

7 years agoReduce dependencies between modules
Maksim Shabunin [Mon, 13 Mar 2017 15:53:52 +0000 (18:53 +0300)]
Reduce dependencies between modules

7 years agoMerge pull request #8383 from csukuangfj/patch-10
Fangjun KUANG [Wed, 15 Mar 2017 11:12:59 +0000 (12:12 +0100)]
Merge pull request #8383 from csukuangfj/patch-10

* Improve documentation.

* Update imgproc.hpp

7 years agoMerge pull request #8367 from khnaba:cuda-calchist-with-mask
Naba Kumar [Wed, 15 Mar 2017 09:34:00 +0000 (11:34 +0200)]
Merge pull request #8367 from khnaba:cuda-calchist-with-mask

Implement cv::cuda::calcHist with mask support (#8367)

* Implement cuda::calcHist with mask

* Fix documentation build warning

* Have their own step sizes for src and mask. Fix review comment.

7 years agoMerge pull request #8388 from ottogin:calib3d
Maksim Shabunin [Wed, 15 Mar 2017 04:33:33 +0000 (04:33 +0000)]
Merge pull request #8388 from ottogin:calib3d

7 years agoCallib3d 4channel image detection
Artem Lukoyanov [Tue, 14 Mar 2017 23:54:15 +0000 (02:54 +0300)]
Callib3d 4channel image detection

3.2 version doesn't support 4 channel color image
detections, unlike 3.1. Now, we don't call
CV_Error() if 4 channel image is given.

resolve #8326

7 years agoMerge pull request #8345 from ChristofKaufmann:pch_gcc6_workaround
Alexander Alekhin [Tue, 14 Mar 2017 14:09:22 +0000 (14:09 +0000)]
Merge pull request #8345 from ChristofKaufmann:pch_gcc6_workaround

7 years agoMerge pull request #8370 from csukuangfj:patch-7
Alexander Alekhin [Tue, 14 Mar 2017 13:32:35 +0000 (13:32 +0000)]
Merge pull request #8370 from csukuangfj:patch-7

7 years agoMerge pull request #8371 from csukuangfj:patch-8
Alexander Alekhin [Tue, 14 Mar 2017 13:23:02 +0000 (13:23 +0000)]
Merge pull request #8371 from csukuangfj:patch-8

7 years agoMerge pull request #8375 from Sahloul:fixes/matx/init
Alexander Alekhin [Tue, 14 Mar 2017 13:22:26 +0000 (13:22 +0000)]
Merge pull request #8375 from Sahloul:fixes/matx/init

7 years agoMerge pull request #8380 from csukuangfj:patch-9
Alexander Alekhin [Tue, 14 Mar 2017 13:20:52 +0000 (13:20 +0000)]
Merge pull request #8380 from csukuangfj:patch-9

7 years agoMerge pull request #8378 from kudeh:master
Kene Udeh [Tue, 14 Mar 2017 13:21:28 +0000 (10:21 -0300)]
Merge pull request #8378 from kudeh:master

Fix grammar error in py_features_meaning.markdown (#8378)

7 years agoMerge pull request #8379 from hailong-wang:patch-1
Alexander Alekhin [Tue, 14 Mar 2017 10:12:32 +0000 (10:12 +0000)]
Merge pull request #8379 from hailong-wang:patch-1

7 years agoFixes the constructor of 1x14, 2x7, 7x2 or 14x1 matrix
Hamdi Sahloul [Mon, 13 Mar 2017 18:01:22 +0000 (03:01 +0900)]
Fixes the constructor of 1x14, 2x7, 7x2 or 14x1 matrix

7 years agoFix an error in the documentation.
Fangjun KUANG [Tue, 14 Mar 2017 08:57:37 +0000 (09:57 +0100)]
Fix an error in the documentation.

7 years agoFix the bug of Mat_<>::opeartor []
hailong-wang [Tue, 14 Mar 2017 05:02:59 +0000 (13:02 +0800)]
Fix the bug of Mat_<>::opeartor []

`template<typename _Tp> inline const _Tp* Mat_<_Tp>::operator [](int y) const` does not support 3d matrix since it checks rows.

This operator[] shall check size.p[0] instead.

7 years agofix typos.
Fangjun KUANG [Mon, 13 Mar 2017 12:51:22 +0000 (13:51 +0100)]
fix typos.

7 years agoImpove the documentation for Mat::diag
Fangjun KUANG [Mon, 13 Mar 2017 11:46:50 +0000 (12:46 +0100)]
Impove the documentation for Mat::diag

7 years agoMerge pull request #8368 from csukuangfj:patch-5
Alexander Alekhin [Mon, 13 Mar 2017 10:15:30 +0000 (10:15 +0000)]
Merge pull request #8368 from csukuangfj:patch-5

7 years agoMerge pull request #8356 from csukuangfj:patch-1
Alexander Alekhin [Mon, 13 Mar 2017 09:59:16 +0000 (09:59 +0000)]
Merge pull request #8356 from csukuangfj:patch-1

7 years agoMerge pull request #8365 from csukuangfj:patch-3
Alexander Alekhin [Mon, 13 Mar 2017 09:51:20 +0000 (09:51 +0000)]
Merge pull request #8365 from csukuangfj:patch-3

7 years agoFix typos in the documentation for cv::Mat.
Fangjun KUANG [Mon, 13 Mar 2017 09:20:41 +0000 (10:20 +0100)]
Fix typos in the documentation for cv::Mat.

7 years agofix an error while setting kernel argument for a 3-D matrix.
KUANG, Fangjun [Sun, 12 Mar 2017 17:29:49 +0000 (18:29 +0100)]
fix an error while setting kernel argument for a 3-D matrix.

7 years agoMerge pull request #8346 from Sahloul:fixes/python_wrapper/flann
Alexander Alekhin [Fri, 10 Mar 2017 20:01:54 +0000 (20:01 +0000)]
Merge pull request #8346 from Sahloul:fixes/python_wrapper/flann

7 years agoUpdate documentation for cv::accumulate.
Fangjun KUANG [Fri, 10 Mar 2017 16:53:12 +0000 (17:53 +0100)]
Update documentation for cv::accumulate.

Make it more clear for the type of input argument.

7 years agoMerge pull request #8245 from oulenz:patch-1
Vadim Pisarevsky [Fri, 10 Mar 2017 14:30:09 +0000 (14:30 +0000)]
Merge pull request #8245 from oulenz:patch-1

7 years agoAccept default argument of FLANN index parameters
Hamdi Sahloul [Fri, 10 Mar 2017 13:09:31 +0000 (22:09 +0900)]
Accept default argument of FLANN index parameters

7 years agocmake: Avoid adding default path as system directory for GCC 6.x
Christof Kaufmann [Thu, 9 Mar 2017 15:13:46 +0000 (16:13 +0100)]
cmake: Avoid adding default path as system directory for GCC 6.x

This is a completion for PR #7390 and fixes #6517 and #815.

7 years agoMerge pull request #8335 from kuanyili:typo-patch
Alexander Alekhin [Thu, 9 Mar 2017 10:43:00 +0000 (10:43 +0000)]
Merge pull request #8335 from kuanyili:typo-patch

7 years agoMerge pull request #8308 from sovrasov:fs_dmatch_kpts_update
Alexander Alekhin [Tue, 7 Mar 2017 19:28:34 +0000 (19:28 +0000)]
Merge pull request #8308 from sovrasov:fs_dmatch_kpts_update

7 years agoFix typos
Kuan-Yi Li [Tue, 7 Mar 2017 15:40:53 +0000 (23:40 +0800)]
Fix typos

7 years agoMerge pull request #8332 from sovrasov:qt_no_dbg_output_in_release
Vadim Pisarevsky [Tue, 7 Mar 2017 14:39:44 +0000 (14:39 +0000)]
Merge pull request #8332 from sovrasov:qt_no_dbg_output_in_release

7 years agoMerge pull request #8333 from sovrasov:ml_svm_params_scope_fix
Vadim Pisarevsky [Tue, 7 Mar 2017 14:38:10 +0000 (14:38 +0000)]
Merge pull request #8333 from sovrasov:ml_svm_params_scope_fix

7 years agoml: remove useless namespace identifiers in SVM
Vladislav Sovrasov [Tue, 7 Mar 2017 13:02:19 +0000 (16:02 +0300)]
ml: remove useless namespace identifiers in SVM

7 years agoQT: disable debug output in Release mode
Vladislav Sovrasov [Tue, 7 Mar 2017 12:41:07 +0000 (15:41 +0300)]
QT: disable debug output in Release mode

7 years agoMerge pull request #8313 from alalek:ocl_fix_cvtcolor
Alexander Alekhin [Tue, 7 Mar 2017 11:29:01 +0000 (11:29 +0000)]
Merge pull request #8313 from alalek:ocl_fix_cvtcolor

7 years agoMerge pull request #8323 from csukuangfj:csukuangfj-patch-8
Alexander Alekhin [Tue, 7 Mar 2017 11:24:18 +0000 (11:24 +0000)]
Merge pull request #8323 from csukuangfj:csukuangfj-patch-8

7 years agoMerge pull request #8324 from sturkmen72:update_objectDetection_cpp
Alexander Alekhin [Tue, 7 Mar 2017 09:39:02 +0000 (09:39 +0000)]
Merge pull request #8324 from sturkmen72:update_objectDetection_cpp

7 years agoMerge pull request #8294 from alalek:fix_stitching_failure
Alexander Alekhin [Mon, 6 Mar 2017 14:55:23 +0000 (14:55 +0000)]
Merge pull request #8294 from alalek:fix_stitching_failure

7 years agoMerge pull request #8111 from utibenkei:saliency-module-java
Alexander Alekhin [Mon, 6 Mar 2017 14:39:22 +0000 (14:39 +0000)]
Merge pull request #8111 from utibenkei:saliency-module-java

7 years agoMerge pull request #8321 from sergboec:patch-1
Alexander Alekhin [Mon, 6 Mar 2017 14:23:13 +0000 (14:23 +0000)]
Merge pull request #8321 from sergboec:patch-1

7 years agoUpdate objectDetection.cpp
Suleyman TURKMEN [Thu, 19 Jan 2017 09:17:53 +0000 (11:17 +0200)]
Update objectDetection.cpp

7 years agoUpdate comments for cv::InputArray.
Fangjun KUANG [Mon, 6 Mar 2017 13:45:30 +0000 (14:45 +0100)]
Update comments for cv::InputArray.

7 years agoUpdated OpenCVFindMKL.cmake
Sergey [Mon, 6 Mar 2017 12:28:05 +0000 (15:28 +0300)]
Updated OpenCVFindMKL.cmake

Current version of search for MLKROOT environment variable is wrong and should be corrected to (DEFINED ENV{MKLROOT})

7 years agoMerge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1
Alexander Alekhin [Mon, 6 Mar 2017 10:22:29 +0000 (10:22 +0000)]
Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1

7 years agoMerge pull request #8279 from sovrasov:calib3d_new_recover_pose
Alexander Alekhin [Mon, 6 Mar 2017 10:20:43 +0000 (10:20 +0000)]
Merge pull request #8279 from sovrasov:calib3d_new_recover_pose

7 years agoMerge pull request #8316 from xuning0:xuning0-patch-1
Alexander Alekhin [Mon, 6 Mar 2017 10:17:51 +0000 (10:17 +0000)]
Merge pull request #8316 from xuning0:xuning0-patch-1

7 years agoFix the description of ROI
xuning0 [Sun, 5 Mar 2017 14:47:49 +0000 (22:47 +0800)]
Fix the description of ROI

7 years agoMerge pull request #8298 from delftrobotics-forks:circles-grid-parameters
Alexander Alekhin [Sun, 5 Mar 2017 10:17:51 +0000 (10:17 +0000)]
Merge pull request #8298 from delftrobotics-forks:circles-grid-parameters

7 years agoMerge pull request #8310 from PhilLab:patch-1
Alexander Alekhin [Sun, 5 Mar 2017 09:46:43 +0000 (09:46 +0000)]
Merge pull request #8310 from PhilLab:patch-1

7 years agoocl: don't use vload4 for 3 channel images
Alexander Alekhin [Fri, 3 Mar 2017 16:36:38 +0000 (19:36 +0300)]
ocl: don't use vload4 for 3 channel images

7 years agoCameraBridgeViewBase synchronizes on a final field
Philipp Hasper [Fri, 3 Mar 2017 15:07:10 +0000 (16:07 +0100)]
CameraBridgeViewBase synchronizes on a final field

Synchronizing against non-final fields is advised against.

7 years agoMerge pull request #8168 from jmgomezpoveda:issue_8166
Jose Gómez [Fri, 3 Mar 2017 13:44:11 +0000 (13:44 +0000)]
Merge pull request #8168 from jmgomezpoveda:issue_8166

* Use the YV12 format in the Android emulator to avoid image issues

* Removed trailing spaces

* Added exception in else case

* Removed tab

7 years agocore: add single DMatch/Keypoint I/O
Vladislav Sovrasov [Fri, 3 Mar 2017 10:58:55 +0000 (13:58 +0300)]
core: add single DMatch/Keypoint I/O

7 years agocore: DMatch I/O tests
Alexander Alekhin [Tue, 28 Feb 2017 16:34:26 +0000 (19:34 +0300)]
core: DMatch I/O tests

7 years agoMerge pull request #8207 from StevenPuttemans:fix_timing_traincascade
Alexander Alekhin [Fri, 3 Mar 2017 10:14:18 +0000 (10:14 +0000)]
Merge pull request #8207 from StevenPuttemans:fix_timing_traincascade

7 years agofix timing of traincascade
StevenPuttemans [Fri, 3 Mar 2017 09:06:35 +0000 (10:06 +0100)]
fix timing of traincascade

7 years agoMerge pull request #8306 from chacha21:portability
Alexander Alekhin [Fri, 3 Mar 2017 04:46:05 +0000 (04:46 +0000)]
Merge pull request #8306 from chacha21:portability

7 years agoFix compilation when USE_ZLIB is false
chacha21 [Thu, 2 Mar 2017 15:58:51 +0000 (16:58 +0100)]
Fix compilation when USE_ZLIB is false

create a dummy gzFile type

7 years agoget rid of warning C4800 under VS2010
chacha21 [Thu, 2 Mar 2017 15:56:20 +0000 (16:56 +0100)]
get rid of warning C4800 under VS2010

the "std::basic_ios::operator bool" differs between C++98 and C++11. The
"double not" syntax is portable and covers both cases with equivalent
meaning

7 years agoMerge pull request #8282 from vskarlsruhe:patch-3
Vadim Pisarevsky [Thu, 2 Mar 2017 11:18:26 +0000 (11:18 +0000)]
Merge pull request #8282 from vskarlsruhe:patch-3

7 years agoMerge pull request #8217 from terfendail:ovx_halheader
Vadim Pisarevsky [Thu, 2 Mar 2017 11:17:53 +0000 (11:17 +0000)]
Merge pull request #8217 from terfendail:ovx_halheader

7 years agoMerge pull request #7996 from mshabunin:hal-filter-revert
Vadim Pisarevsky [Thu, 2 Mar 2017 11:12:08 +0000 (11:12 +0000)]
Merge pull request #7996 from mshabunin:hal-filter-revert

7 years agoMerge pull request #8116 from mrquorr:master
Vadim Pisarevsky [Thu, 2 Mar 2017 11:07:23 +0000 (11:07 +0000)]
Merge pull request #8116 from mrquorr:master

7 years agostitching(perf): workaround test failures
Alexander Alekhin [Wed, 1 Mar 2017 11:28:23 +0000 (14:28 +0300)]
stitching(perf): workaround test failures

force other RNG seed

7 years agoflann: use OpenCV theRNG()
Alexander Alekhin [Tue, 28 Feb 2017 15:50:56 +0000 (18:50 +0300)]
flann: use OpenCV theRNG()

std::rand() has no thread-safe guarantee.

7 years agostitching: force "stable" RNG
Alexander Alekhin [Tue, 28 Feb 2017 15:50:09 +0000 (18:50 +0300)]
stitching: force "stable" RNG

7 years agoExpose CirclesGridFinderParameters in findCirclesGrid.
Hans Gaiser [Wed, 1 Mar 2017 10:52:25 +0000 (11:52 +0100)]
Expose CirclesGridFinderParameters in findCirclesGrid.

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 agofinished for one sample
mrquorr [Wed, 1 Feb 2017 05:31:10 +0000 (23:31 -0600)]
finished for one sample

Finished with several samples support, need regression testing

Gave a more relevant name to function (getVotes)

Finished implicit implementation

Removed printf, finished regresion testing

Fixed conversion warning

Finished test for Rtrees

Fixed documentation

Initialized variable

Added doxygen documentation

Added parameter name

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.