platform/upstream/opencv.git
7 years agoMerge pull request #8942 from zwsu:master
Alexander Alekhin [Tue, 20 Jun 2017 10:57:17 +0000 (10:57 +0000)]
Merge pull request #8942 from zwsu:master

7 years agoMerge pull request #8883 from abratchik:DNN.java.wrappers.fix
Maksim Shabunin [Tue, 20 Jun 2017 09:05:53 +0000 (09:05 +0000)]
Merge pull request #8883 from abratchik:DNN.java.wrappers.fix

7 years agoFixed gray window for gpu stereo BP and CSBP
Zhiwei Su [Mon, 19 Jun 2017 12:30:28 +0000 (20:30 +0800)]
Fixed gray window for gpu stereo BP and CSBP

compute() for BP and CSBP output 32-bit floating-point mat, and in cv::imshow() 32-bit floating-point is recognized as [0,1] and maped to [0,255], that causes gray window for BP and CSBP.

7 years agoMerge pull request #8920 from sovrasov:video_vriter_ext
Maksim Shabunin [Mon, 19 Jun 2017 10:52:34 +0000 (10:52 +0000)]
Merge pull request #8920 from sovrasov:video_vriter_ext

7 years agovideo: add one more constructor for VideoWriter
Vladislav Sovrasov [Wed, 14 Jun 2017 14:09:32 +0000 (17:09 +0300)]
video: add one more constructor for VideoWriter

7 years agoRefactor OpenCV Java Wrapping
abratchik [Sat, 10 Jun 2017 05:57:10 +0000 (09:57 +0400)]
Refactor OpenCV Java Wrapping

7 years agoMerge pull request #8925 from savuor:fix/softfloat_comments
Alexander Alekhin [Thu, 15 Jun 2017 16:12:30 +0000 (16:12 +0000)]
Merge pull request #8925 from savuor:fix/softfloat_comments

7 years agoMerge pull request #8924 from tomoaki0705:fixWarningResize
Alexander Alekhin [Thu, 15 Jun 2017 16:11:18 +0000 (16:11 +0000)]
Merge pull request #8924 from tomoaki0705:fixWarningResize

7 years agoMerge pull request #8922 from tomoaki0705:fixWarningJetsonTK1
Alexander Alekhin [Thu, 15 Jun 2017 16:09:35 +0000 (16:09 +0000)]
Merge pull request #8922 from tomoaki0705:fixWarningJetsonTK1

7 years agofloat constant replaced by int hex representations
Rostislav Vasilikhin [Thu, 15 Jun 2017 12:10:41 +0000 (15:10 +0300)]
float constant replaced by int hex representations

7 years agosuppress warning
Tomoaki Teshima [Thu, 15 Jun 2017 09:59:48 +0000 (18:59 +0900)]
suppress warning
 - check if compiler is Intel compiler
 - remove not referenced variables

7 years agosuppress warning on Jetson TK1
Tomoaki Teshima [Thu, 15 Jun 2017 09:28:13 +0000 (18:28 +0900)]
suppress warning on Jetson TK1

7 years agoMerge pull request #8915 from sovrasov:deniose_add_assert
Alexander Alekhin [Wed, 14 Jun 2017 19:17:28 +0000 (19:17 +0000)]
Merge pull request #8915 from sovrasov:deniose_add_assert

7 years agoMerge pull request #8912 from alalek:fix_cxx11_mac_flann
Alexander Alekhin [Wed, 14 Jun 2017 19:15:21 +0000 (19:15 +0000)]
Merge pull request #8912 from alalek:fix_cxx11_mac_flann

7 years agoMerge pull request #8832 from terfendail:perf_accumulate_fix
Alexander Alekhin [Wed, 14 Jun 2017 18:49:09 +0000 (18:49 +0000)]
Merge pull request #8832 from terfendail:perf_accumulate_fix

7 years agolicence updated
Rostislav Vasilikhin [Wed, 14 Jun 2017 18:20:10 +0000 (21:20 +0300)]
licence updated

7 years agoremoved MSVC warning suppression
Rostislav Vasilikhin [Wed, 14 Jun 2017 18:00:06 +0000 (21:00 +0300)]
removed MSVC warning suppression

7 years agoMerge pull request #8911 from alalek:fix_vsum4
Alexander Alekhin [Wed, 14 Jun 2017 12:00:58 +0000 (12:00 +0000)]
Merge pull request #8911 from alalek:fix_vsum4

7 years agophoto: add assertion on empty image in denoising
Vladislav Sovrasov [Wed, 14 Jun 2017 10:57:07 +0000 (13:57 +0300)]
photo: add assertion on empty image in denoising

7 years agobuild: fix v_reduce_sum4 (requires SSE3)
Alexander Alekhin [Tue, 13 Jun 2017 22:24:46 +0000 (22:24 +0000)]
build: fix v_reduce_sum4 (requires SSE3)

7 years agoMerge pull request #8890 from alalek:remove_3rdparty_jinja2_sources
Vadim Pisarevsky [Wed, 14 Jun 2017 07:30:14 +0000 (07:30 +0000)]
Merge pull request #8890 from alalek:remove_3rdparty_jinja2_sources

7 years agoMerge pull request #8899 from tomoaki0705:fixSuppressWarningsUnreachable
Alexander Alekhin [Wed, 14 Jun 2017 01:07:47 +0000 (01:07 +0000)]
Merge pull request #8899 from tomoaki0705:fixSuppressWarningsUnreachable

7 years agoflann: add normal assignment operator for cvflann::any
Alexander Alekhin [Mon, 17 Apr 2017 22:59:12 +0000 (01:59 +0300)]
flann: add normal assignment operator for cvflann::any

7 years agoMerge pull request #8907 from vpisarev:dnn_fast_conv
Vadim Pisarevsky [Tue, 13 Jun 2017 21:04:31 +0000 (21:04 +0000)]
Merge pull request #8907 from vpisarev:dnn_fast_conv

7 years agoMerge pull request #8891 from alalek:cmake_build_x64_sse3
Vadim Pisarevsky [Tue, 13 Jun 2017 17:33:01 +0000 (17:33 +0000)]
Merge pull request #8891 from alalek:cmake_build_x64_sse3

7 years agoMerge pull request #8843 from terfendail:resizenn_patch
Vadim Pisarevsky [Tue, 13 Jun 2017 17:29:30 +0000 (17:29 +0000)]
Merge pull request #8843 from terfendail:resizenn_patch

7 years agoUpdated fix for accumulate performance test in case of multiple iterations
Vitaly Tuzov [Mon, 29 May 2017 13:47:41 +0000 (16:47 +0300)]
Updated fix for accumulate performance test in case of multiple iterations

7 years agoUpdated alignment declarations to CV_DECL_ALIGNED macro
Vitaly Tuzov [Tue, 13 Jun 2017 15:44:38 +0000 (18:44 +0300)]
Updated alignment declarations to CV_DECL_ALIGNED macro

7 years agoadded v_reduce_sum4() universal intrinsic; corrected number of threads in cv::getNumT...
Vadim Pisarevsky [Tue, 13 Jun 2017 15:04:00 +0000 (18:04 +0300)]
added v_reduce_sum4() universal intrinsic; corrected number of threads in cv::getNumThreads() in the case of GCD

7 years agosuppress unreachable code warning
Tomoaki Teshima [Mon, 12 Jun 2017 23:11:04 +0000 (08:11 +0900)]
suppress unreachable code warning
 - fix the define condition based on the comment

7 years agoMerge pull request #8753 from RyuheiMori:fix-cpu-feature-detection-on-android
Alexander Alekhin [Mon, 12 Jun 2017 16:08:08 +0000 (16:08 +0000)]
Merge pull request #8753 from RyuheiMori:fix-cpu-feature-detection-on-android

7 years ago3rdparty: cpufeatures workaround
Alexander Alekhin [Sun, 11 Jun 2017 04:53:59 +0000 (04:53 +0000)]
3rdparty: cpufeatures workaround

7 years agoupdate CPU detection on ANDROID patch
Alexander Alekhin [Fri, 9 Jun 2017 15:24:14 +0000 (15:24 +0000)]
update CPU detection on ANDROID patch

7 years agocmake: set minimal CPU instruction to SSE3 (x64)
Alexander Alekhin [Sun, 11 Jun 2017 03:51:53 +0000 (03:51 +0000)]
cmake: set minimal CPU instruction to SSE3 (x64)

7 years ago3rdparty: remove jinja2 source code
Alexander Alekhin [Sun, 11 Jun 2017 02:18:15 +0000 (05:18 +0300)]
3rdparty: remove jinja2 source code

It used for Matlab binding only

7 years agoMerge pull request #8888 from lewisjb:docs-build-doxygen
Alexander Alekhin [Sat, 10 Jun 2017 20:12:20 +0000 (20:12 +0000)]
Merge pull request #8888 from lewisjb:docs-build-doxygen

7 years agoUpdate doc build instructions for doxygen
lewisjb [Sat, 10 Jun 2017 14:00:45 +0000 (00:00 +1000)]
Update doc build instructions for doxygen

7 years agoMerge pull request #8862 from alalek:build_hardening_flag
Alexander Alekhin [Fri, 9 Jun 2017 14:14:52 +0000 (14:14 +0000)]
Merge pull request #8862 from alalek:build_hardening_flag

7 years agoMerge pull request #8877 from alalek:fix_integer_overflow
Alexander Alekhin [Fri, 9 Jun 2017 14:14:12 +0000 (14:14 +0000)]
Merge pull request #8877 from alalek:fix_integer_overflow

7 years agophoto: fix integer overflow
Alexander Alekhin [Fri, 9 Jun 2017 00:16:58 +0000 (00:16 +0000)]
photo: fix integer overflow

There is no cast to wide integer type:
    std::numeric_limits<ST>::max() * std::numeric_limits<ST>::max()

7 years agoMerge pull request #8868 from alalek:fix_build_softfloat
Alexander Alekhin [Thu, 8 Jun 2017 20:22:52 +0000 (20:22 +0000)]
Merge pull request #8868 from alalek:fix_build_softfloat

7 years agoMerge pull request #8863 from LukeZheZhu:pyrlk_small_winsize
Alexander Alekhin [Thu, 8 Jun 2017 20:15:04 +0000 (20:15 +0000)]
Merge pull request #8863 from LukeZheZhu:pyrlk_small_winsize

7 years agoMerge pull request #8876 from alalek:fix_build_msvs
Alexander Alekhin [Thu, 8 Jun 2017 19:53:29 +0000 (19:53 +0000)]
Merge pull request #8876 from alalek:fix_build_msvs

7 years agoMerge pull request #8816 from mshabunin:sprintf-fix
Maksim Shabunin [Thu, 8 Jun 2017 19:53:16 +0000 (22:53 +0300)]
Merge pull request #8816 from mshabunin:sprintf-fix

Fixed snprintf for VS 2013 (#8816)

* Fixed snprintf for VS 2013

* snprintf: removed declaration from header, changed implementation

* cv_snprintf corrected according to comments

* update snprintf patch

7 years agobuild: fix warning
Alexander Alekhin [Wed, 7 Jun 2017 22:49:09 +0000 (01:49 +0300)]
build: fix warning

C4189: 'clImageUV' : local variable is initialized but not referenced

7 years agobuild: fix "ambiguous call" (MSVS2010)
Alexander Alekhin [Wed, 7 Jun 2017 21:40:35 +0000 (00:40 +0300)]
build: fix "ambiguous call" (MSVS2010)

7 years agoMerge pull request #8852 from BKNio:testsForVideoStab
Alexander Alekhin [Thu, 8 Jun 2017 13:36:51 +0000 (13:36 +0000)]
Merge pull request #8852 from BKNio:testsForVideoStab

7 years agoadd tests for videostab;
Dinar [Mon, 5 Jun 2017 03:54:03 +0000 (06:54 +0300)]
add tests for videostab;

7 years agoMerge pull request #8860 from alalek:fix_java_headers
Alexander Alekhin [Thu, 8 Jun 2017 02:43:09 +0000 (02:43 +0000)]
Merge pull request #8860 from alalek:fix_java_headers

7 years agoMerge pull request #8844 from mshabunin:fix-arm-tbb
Alexander Alekhin [Thu, 8 Jun 2017 02:42:31 +0000 (02:42 +0000)]
Merge pull request #8844 from mshabunin:fix-arm-tbb

7 years agobuild: fix errors for MSVS2010-2013, reduce default softfloat scope
Alexander Alekhin [Wed, 7 Jun 2017 20:24:58 +0000 (23:24 +0300)]
build: fix errors for MSVS2010-2013, reduce default softfloat scope

7 years agocmake: add ENABLE_BUILD_HARDENING option
Alexander Alekhin [Wed, 7 Jun 2017 09:07:32 +0000 (09:07 +0000)]
cmake: add ENABLE_BUILD_HARDENING option

7 years agoMerge pull request #8803 from 4ekmah:sgbm_modehh4_SIMD
Vadim Pisarevsky [Wed, 7 Jun 2017 13:35:53 +0000 (13:35 +0000)]
Merge pull request #8803 from 4ekmah:sgbm_modehh4_SIMD

7 years agoModify the pyrlk.cl to support winSize from 8*8 to 24*24 for optical flow
LukeZhu [Wed, 7 Jun 2017 06:56:01 +0000 (14:56 +0800)]
Modify the pyrlk.cl to support winSize from 8*8 to 24*24 for optical flow

7 years agoMerge pull request #8857 from alalek:fix_pch_stub_regeneration
Alexander Alekhin [Tue, 6 Jun 2017 19:35:03 +0000 (19:35 +0000)]
Merge pull request #8857 from alalek:fix_pch_stub_regeneration

7 years agojava: use module's public headers only
Alexander Alekhin [Tue, 6 Jun 2017 18:10:02 +0000 (21:10 +0300)]
java: use module's public headers only

7 years agobuild: fix PCH stub files generation optimization
Alexander Alekhin [Tue, 6 Jun 2017 18:09:22 +0000 (21:09 +0300)]
build: fix PCH stub files generation optimization

7 years agoMerge pull request #8838 from tomoaki0705:dispatchFp16
Alexander Alekhin [Tue, 6 Jun 2017 15:31:42 +0000 (15:31 +0000)]
Merge pull request #8838 from tomoaki0705:dispatchFp16

7 years agoupdate convertFp16 using CV_CPU_CALL_FP16
Tomoaki Teshima [Tue, 6 Jun 2017 13:26:51 +0000 (22:26 +0900)]
update convertFp16 using CV_CPU_CALL_FP16
 * avoid link error (move the implementation of software version to header)
 * make getConvertFuncFp16 local (move from precomp.hpp to convert.hpp)
 * fix error on 32bit x86

7 years agoTBB: fix build on ARM
Maksim Shabunin [Fri, 2 Jun 2017 09:49:11 +0000 (12:49 +0300)]
TBB: fix build on ARM

7 years agoFixing buildbot's messages.
Pyotr Chekmaryov [Sun, 4 Jun 2017 17:32:07 +0000 (20:32 +0300)]
Fixing buildbot's messages.

7 years agoMerge pull request #8848 from alalek:fix_test_photo_aarch64
Alexander Alekhin [Sat, 3 Jun 2017 15:51:44 +0000 (15:51 +0000)]
Merge pull request #8848 from alalek:fix_test_photo_aarch64

7 years agophoto(test): fix MergeRobertson test for AARCH64 build
Alexander Alekhin [Sat, 3 Jun 2017 13:57:23 +0000 (16:57 +0300)]
photo(test): fix MergeRobertson test for AARCH64 build

7 years agoMerge pull request #8842 from delftrobotics-forks:compile_fix_circlesgrid_debug
Maksim Shabunin [Fri, 2 Jun 2017 10:19:32 +0000 (10:19 +0000)]
Merge pull request #8842 from delftrobotics-forks:compile_fix_circlesgrid_debug

7 years agoMerge pull request #8828 from woodychow:multithreaded_gaussian
Alexander Alekhin [Thu, 1 Jun 2017 19:52:54 +0000 (19:52 +0000)]
Merge pull request #8828 from woodychow:multithreaded_gaussian

7 years agoAVX and SSE optimizations for resize NN
Vitaly Tuzov [Wed, 31 May 2017 11:06:45 +0000 (14:06 +0300)]
AVX and SSE optimizations for resize NN

7 years agoCompile fix for circlesgrid in debug.
rmensing [Thu, 1 Jun 2017 14:00:13 +0000 (16:00 +0200)]
Compile fix for circlesgrid in debug.

7 years agoMerge pull request #8819 from Robzz:master
Alexander Alekhin [Thu, 1 Jun 2017 11:57:53 +0000 (11:57 +0000)]
Merge pull request #8819 from Robzz:master

7 years agoFallback to single threaded version of IPP gaussian blur / bilateral filter when...
Woody Chow [Thu, 1 Jun 2017 04:34:50 +0000 (13:34 +0900)]
Fallback to single threaded version of IPP gaussian blur / bilateral filter when the mutlithreaded version cannot be called.

7 years agoMultithread IPP gaussian blur
Woody Chow [Wed, 31 May 2017 09:16:47 +0000 (18:16 +0900)]
Multithread IPP gaussian blur

7 years agoMerge pull request #8823 from wpalfi:patch-1
Alexander Alekhin [Tue, 30 May 2017 20:11:33 +0000 (20:11 +0000)]
Merge pull request #8823 from wpalfi:patch-1

7 years agofixed typo in pyopencv_from Point3d
Werner Palfinger [Tue, 30 May 2017 14:49:23 +0000 (16:49 +0200)]
fixed typo in pyopencv_from Point3d

7 years agoFix build with CUDA on windows with JOM and Ninja (#6372)
Robin Chavignat [Mon, 29 May 2017 12:45:10 +0000 (14:45 +0200)]
Fix build with CUDA on windows with JOM and Ninja (#6372)

7 years agoMerge pull request #8818 from mshabunin:java-cleanup-fix
Maksim Shabunin [Mon, 29 May 2017 14:53:19 +0000 (14:53 +0000)]
Merge pull request #8818 from mshabunin:java-cleanup-fix

7 years agoMerge pull request #8797 from sovrasov:hog_sse_fix
Vadim Pisarevsky [Mon, 29 May 2017 14:32:46 +0000 (14:32 +0000)]
Merge pull request #8797 from sovrasov:hog_sse_fix

7 years agoMerge pull request #8798 from BKNio:fix_motionEstimation
Vadim Pisarevsky [Mon, 29 May 2017 14:31:03 +0000 (14:31 +0000)]
Merge pull request #8798 from BKNio:fix_motionEstimation

7 years agoSoftFloat integrated (#8668)
Rostislav Vasilikhin [Mon, 29 May 2017 14:07:25 +0000 (17:07 +0300)]
SoftFloat integrated  (#8668)

* everything is put into softfloat.cpp and softfloat.hpp

* WIP: try to integrate softfloat into OpenCV

* extra functions removed

* softfloat made stateless

* CV_EXPORTS added

* operators fixed

* exp added, log: WIP

* log32 fixed

* shorter names; a lot of TODOs

* log64 rewritten

* cbrt32 added

* minors, refactoring

* "inline" -> "CV_INLINE"

* cast to bool warnings fixed

* several warnings fixed

* fixed warning about unsigned unary minus

* fixed warnings on type cast

* inline -> CV_INLINE

* special cases processing added (NaNs, Infs, etc.)

* constants for NaN and Inf added

* more macros and helper functions added

* added (or fixed) tests for pow32, pow64, cbrt32

* exp-like functions fixed

* minor changes

* fixed random number generation for tests

* tests for exp32 and exp64: values are compared to SoftFloat-based naive implementation

* minor warning fix

* pow(f, i) 32/64: special cases handling added

* unused functions removed

* refactoring is in progress (not compiling)

* CV_inline added

* unions {uint_t, float_t} removed

* tests compilation fixed

* static const members -> static methods returning const

* reinterpret_cast

* warning fixed

* const-ness fixed

* all FP calculations (even compile-time) are done in SoftFloat + minor fixes

* pow(f, i) removed from interface (can cause incorrect cast) to internals of pow(f, f), tests fixed

* CV_INLINE -> inline

* internal constants moved to .cpp file

* toInt_minMag() methods merged into toInt() methods

* macros moved to .cpp file

* refactoring: types renamed to softfloat and softdouble; explicit constructors, etc.

* toFloat(), toDouble() -> operator float(), operator double()

* removed f32/f64 prefixes from functions names

* toType() methods removed, round() and trunc() functions added

* minor change

* minors

* MSVC: warnings fixed

* added int cvRound(), cvFloor, cvCeil, cvTrunc, saturate_cast<T>()

* typo fixed

* type cast fixed

7 years agoMerge pull request #8805 from catree:solvePnP_doc
Alexander Alekhin [Mon, 29 May 2017 13:52:15 +0000 (13:52 +0000)]
Merge pull request #8805 from catree:solvePnP_doc

7 years agoMerge pull request #8814 from woodychow:openmp_num_threads
Alexander Alekhin [Mon, 29 May 2017 13:17:41 +0000 (13:17 +0000)]
Merge pull request #8814 from woodychow:openmp_num_threads

7 years agoMerge pull request #8809 from berak:fix_py_tut_braces_py3
Alexander Alekhin [Mon, 29 May 2017 13:16:08 +0000 (13:16 +0000)]
Merge pull request #8809 from berak:fix_py_tut_braces_py3

7 years agoImprove solvePnP doc, add assert >= 4 in solvePnP, escape underscore character for...
catree [Fri, 26 May 2017 22:31:09 +0000 (00:31 +0200)]
Improve solvePnP doc, add assert >= 4 in solvePnP, escape underscore character for Scalar_ documentation.

Add reference to SOLVEPNP_ITERATIVE in the doc.

7 years agopy_tutorials: add print() braces for python3
berak [Sun, 28 May 2017 09:07:15 +0000 (11:07 +0200)]
py_tutorials: add print() braces for python3

7 years agoDo not clean src and gen directories when java is disabled
Maksim Shabunin [Mon, 29 May 2017 10:54:36 +0000 (13:54 +0300)]
Do not clean src and gen directories when java is disabled

7 years agoUse num_threads clause of #pragma omp parallel instead to avoid calling omp_set_num_t...
Woody Chow [Mon, 29 May 2017 05:16:10 +0000 (14:16 +0900)]
Use num_threads clause of #pragma omp parallel instead to avoid calling omp_set_num_threads for the entire application

7 years agoMerge pull request #8799 from terfendail:cmake_ignore
Alexander Alekhin [Sun, 28 May 2017 17:28:38 +0000 (17:28 +0000)]
Merge pull request #8799 from terfendail:cmake_ignore

7 years agoPerformance tests are added.
Pyotr Chekmaryov [Fri, 26 May 2017 22:48:03 +0000 (22:48 +0000)]
Performance tests are added.

7 years agoRemoved CMake configuration files from gitignore, since builds should be performed...
Vitaly Tuzov [Fri, 26 May 2017 15:27:21 +0000 (18:27 +0300)]
Removed CMake configuration files from gitignore, since builds should be performed out of source tree.

7 years agofix estimateGlobalMotionRansac;
Dinar Ahmatnurov [Fri, 26 May 2017 13:10:07 +0000 (16:10 +0300)]
fix estimateGlobalMotionRansac;

7 years agoMerge pull request #8455 from terfendail:ovxhal_skipsmall
Vadim Pisarevsky [Fri, 26 May 2017 12:10:18 +0000 (12:10 +0000)]
Merge pull request #8455 from terfendail:ovxhal_skipsmall

7 years agoMerge pull request #8796 from liurs1990:master
Vadim Pisarevsky [Fri, 26 May 2017 12:04:56 +0000 (12:04 +0000)]
Merge pull request #8796 from liurs1990:master

7 years agoobdetect: fix in SSE code
Vladislav Sovrasov [Fri, 26 May 2017 11:26:05 +0000 (14:26 +0300)]
obdetect: fix in SSE code

7 years agofix the mser issue
n001519 [Fri, 26 May 2017 08:51:54 +0000 (16:51 +0800)]
fix the mser issue

7 years agoMoved size restrictions for OpenVX processed images to corresponding cpp files
Vitaly Tuzov [Thu, 25 May 2017 16:10:21 +0000 (19:10 +0300)]
Moved size restrictions for OpenVX processed images to corresponding cpp files

7 years agoMerge pull request #8307 from AhiyaHiya:dev_xcode_macos_universal_binary
Vadim Pisarevsky [Thu, 25 May 2017 15:54:12 +0000 (15:54 +0000)]
Merge pull request #8307 from AhiyaHiya:dev_xcode_macos_universal_binary

7 years agoMerge pull request #8314 from chacha21:fix_cuda_absdiff
Vadim Pisarevsky [Thu, 25 May 2017 09:09:19 +0000 (09:09 +0000)]
Merge pull request #8314 from chacha21:fix_cuda_absdiff

7 years agochange tutorial to use enum name instead of value (#8783)
Drew Hintz [Thu, 25 May 2017 09:10:13 +0000 (11:10 +0200)]
change tutorial to use enum name instead of value (#8783)

* change tutorial to use enum name instead of value

* use enum name instead of value

7 years agoMerge pull request #8789 from vpisarev:parallel_ccomp
Vadim Pisarevsky [Wed, 24 May 2017 17:10:42 +0000 (17:10 +0000)]
Merge pull request #8789 from vpisarev:parallel_ccomp

7 years agoMerge pull request #8788 from sovrasov:calib_doc_update
Vadim Pisarevsky [Wed, 24 May 2017 13:59:21 +0000 (13:59 +0000)]
Merge pull request #8788 from sovrasov:calib_doc_update

7 years agoeliminated trailing whitespaces
Vadim Pisarevsky [Wed, 24 May 2017 13:54:12 +0000 (16:54 +0300)]
eliminated trailing whitespaces

7 years agoMerge branch 'master' of https://github.com/MicheleCancilla/opencv into parallel_ccomp
Vadim Pisarevsky [Wed, 24 May 2017 13:51:18 +0000 (16:51 +0300)]
Merge branch 'master' of https://github.com/MicheleCancilla/opencv into parallel_ccomp