platform/upstream/opencv.git
7 years agoFixed build_framework.py script for osx
Dal Rupnik [Tue, 24 Jan 2017 18:14:50 +0000 (19:14 +0100)]
Fixed build_framework.py script for osx

7 years agoReplaced macro with built-in OpenCV export
Dal Rupnik [Tue, 24 Jan 2017 09:26:19 +0000 (10:26 +0100)]
Replaced macro with built-in OpenCV export

7 years agoAdded export functions for ObjC classes
Dal Rupnik [Mon, 23 Jan 2017 16:15:17 +0000 (17:15 +0100)]
Added export functions for ObjC classes

7 years agoMerge pull request #8053 from pwuertz:umat-copy-python
Alexander Alekhin [Mon, 23 Jan 2017 13:20:56 +0000 (13:20 +0000)]
Merge pull request #8053 from pwuertz:umat-copy-python

7 years agoMerge pull request #8058 from tomoaki0705:universalIntrinsicFast
Alexander Alekhin [Mon, 23 Jan 2017 13:13:14 +0000 (13:13 +0000)]
Merge pull request #8058 from tomoaki0705:universalIntrinsicFast

7 years agouse universal intrinsic in fast
Tomoaki Teshima [Mon, 23 Jan 2017 10:03:22 +0000 (19:03 +0900)]
use universal intrinsic in fast

7 years agoExpose more UMat constructors to python
Peter Würtz [Fri, 20 Jan 2017 17:34:41 +0000 (18:34 +0100)]
Expose more UMat constructors to python

7 years agoMerge pull request #8001 from alalek:c_defines
Alexander Alekhin [Fri, 20 Jan 2017 17:52:24 +0000 (17:52 +0000)]
Merge pull request #8001 from alalek:c_defines

7 years agoMerge pull request #8049 from tomoaki0705:universalIntrinsicCorner
Alexander Alekhin [Fri, 20 Jan 2017 16:43:48 +0000 (16:43 +0000)]
Merge pull request #8049 from tomoaki0705:universalIntrinsicCorner

7 years agoMerge pull request #8009 from Legoless:master
Dal Rupnik [Fri, 20 Jan 2017 16:16:01 +0000 (17:16 +0100)]
Merge pull request #8009 from Legoless:master

CMake: Building Dynamic Framework on iOS (#8009)

* Updated python script with dynamic parameter

Updated python script to build static library by default

Updated python script to include bitcode flag

Added bitcode flag to c flags

Fixed directories and targets with static

Bitcode parameter fixed

Fixed script for static library

Fixed parameters in build function

Updated cmake common toolchain

Added changes to OpenCV Utils

Updates to cmake

Added cache internal

Updates to common toolchain

Fixed path in framework destination and added UIKit dependency

Dynamic plist for framework

Lib version removed hardcoded value

Removed trailing whitespace in toolchain

* Removed trailing whitespace

* Fixed typo in comment

* Renamed bitcode variable to bitcodedisabled

* Fixed target device family

7 years agouse universal intrinsic in corner detection series
Tomoaki Teshima [Fri, 20 Jan 2017 10:22:44 +0000 (19:22 +0900)]
use universal intrinsic in corner detection series

7 years agoMerge pull request #8042 from alalek:fix_8037
Alexander Alekhin [Thu, 19 Jan 2017 17:04:34 +0000 (17:04 +0000)]
Merge pull request #8042 from alalek:fix_8037

7 years agoMerge pull request #8020 from alalek:fix_4976
Alexander Alekhin [Thu, 19 Jan 2017 15:40:07 +0000 (15:40 +0000)]
Merge pull request #8020 from alalek:fix_4976

7 years agoMerge pull request #7926 from saskatchewancatch:issue-7310
Alexander Alekhin [Thu, 19 Jan 2017 14:03:42 +0000 (14:03 +0000)]
Merge pull request #7926 from saskatchewancatch:issue-7310

7 years agocmake: fix MKL detection in case of unsupported versions
Alexander Alekhin [Thu, 19 Jan 2017 10:33:39 +0000 (13:33 +0300)]
cmake: fix MKL detection in case of unsupported versions

CMake should not fail.

7 years agoMerge pull request #7863 from tomoaki0705:universalIntrinsicPopcount
Alexander Alekhin [Wed, 18 Jan 2017 17:25:02 +0000 (17:25 +0000)]
Merge pull request #7863 from tomoaki0705:universalIntrinsicPopcount

7 years agoMerge pull request #8024 from catree:fix_typo_py_houghlines
Alexander Alekhin [Wed, 18 Jan 2017 16:56:25 +0000 (19:56 +0300)]
Merge pull request #8024 from catree:fix_typo_py_houghlines

Fix typos in py_houghlines tutorial.

7 years agoMerge pull request #7999 from alalek:fix_lapack
Alexander Alekhin [Wed, 18 Jan 2017 13:20:30 +0000 (13:20 +0000)]
Merge pull request #7999 from alalek:fix_lapack

7 years agoMerge pull request #8021 from mshabunin:doc-minor-fixes
Alexander Alekhin [Wed, 18 Jan 2017 12:15:32 +0000 (12:15 +0000)]
Merge pull request #8021 from mshabunin:doc-minor-fixes

7 years agoMerge pull request #8023 from sovrasov:fs_add_full_yml_type_heading
Alexander Alekhin [Wed, 18 Jan 2017 12:08:10 +0000 (12:08 +0000)]
Merge pull request #8023 from sovrasov:fs_add_full_yml_type_heading

7 years agoMinor documentation fixes:
Maksim Shabunin [Tue, 17 Jan 2017 13:29:50 +0000 (16:29 +0300)]
Minor documentation fixes:

- disabled OPTIMIZE_OUTPUT_JAVA
- filtered out *.m scripts
- removed link to old Sphinx documentation
- replaced all mentions of Sphinx with Doxygen

7 years agoshape: force column-based vector
Alexander Alekhin [Tue, 17 Jan 2017 12:22:56 +0000 (15:22 +0300)]
shape: force column-based vector

7 years agoMerge pull request #8026 from catree:fix_link_tutorial_brightness
Alexander Alekhin [Wed, 18 Jan 2017 09:54:26 +0000 (12:54 +0300)]
Merge pull request #8026 from catree:fix_link_tutorial_brightness

Fix tutorial code link in basic_linear_transform tutorial.

7 years agoFix tutorial code link in basic_linear_transform tutorial. Add some resource links.
catree [Tue, 17 Jan 2017 16:47:27 +0000 (17:47 +0100)]
Fix tutorial code link in basic_linear_transform tutorial. Add some resource links.

7 years agoFix typos in py_houghlines tutorial. Extract the python code in a specific folder.
catree [Tue, 17 Jan 2017 15:09:27 +0000 (16:09 +0100)]
Fix typos in py_houghlines tutorial. Extract the python code in a specific folder.

7 years agoMerge pull request #7941 from wykvictor:master
Alexander Alekhin [Tue, 17 Jan 2017 14:34:04 +0000 (14:34 +0000)]
Merge pull request #7941 from wykvictor:master

7 years agoAdd support of type headings from YAML1.2
Vladislav Sovrasov [Tue, 17 Jan 2017 13:40:38 +0000 (16:40 +0300)]
Add support of type headings from YAML1.2

7 years agoeliminate warnings
Alexander Alekhin [Tue, 17 Jan 2017 12:52:45 +0000 (15:52 +0300)]
eliminate warnings

hal_internal.cpp(101): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data

7 years agocmake: fix lapack
Alexander Alekhin [Fri, 23 Dec 2016 11:50:33 +0000 (14:50 +0300)]
cmake: fix lapack

- added compile check with multiple tries for different configurations
- restored find_package(LAPACK)
- avoided modification of OPENCV_LINKER_LIBS

7 years agoMerge pull request #8019 from berak:patch-2
berak [Tue, 17 Jan 2017 10:57:50 +0000 (11:57 +0100)]
Merge pull request #8019 from berak:patch-2

ml: fix small typo in lr.cpp (#8019)

7 years agoMerge pull request #7978 from logic1988:master
logic1988 [Mon, 16 Jan 2017 10:19:24 +0000 (18:19 +0800)]
Merge pull request #7978 from logic1988:master

Fix error usage in HitMiss tutorial, and improved the visualization results (#7978)

* Fix error usage in HitMiss tutorial, and improved the visualization results

Fix error usage in HitMiss tutorial, and improved the visualization results

* Update HitMiss.cpp

* Update HitMiss.cpp

7 years agoMerge pull request #7994 from nnadeau:master
Nicholas Nadeau [Mon, 16 Jan 2017 10:03:49 +0000 (05:03 -0500)]
Merge pull request #7994 from nnadeau:master

Fixed exceptions, print statements, and long types for gen_pattern.py to be Python 3 compatible (#7994)

* fixed exceptions and print statements to be python 3 compatible; removed long type checks (py3 uses int); whitespace reformatting

* Pulled latest svgfig from upstream

https://github.com/jpivarski/svgfig/commit/f3179a8926508bf0f9021fd4e1f9731c95524a38

7 years agoMerge pull request #8000 from mshabunin:fix-opencl-clahe
Alexander Alekhin [Mon, 16 Jan 2017 10:01:59 +0000 (10:01 +0000)]
Merge pull request #8000 from mshabunin:fix-opencl-clahe

7 years agoMerge pull request #7966 from Tetragramm:Issue#4235
Vadim Pisarevsky [Fri, 13 Jan 2017 14:24:57 +0000 (14:24 +0000)]
Merge pull request #7966 from Tetragramm:Issue#4235

7 years agoimgproc/CLAHE/ocl: Removed unnecessary __local variable
mshabunin [Thu, 12 Jan 2017 16:12:54 +0000 (19:12 +0300)]
imgproc/CLAHE/ocl: Removed unnecessary __local variable

7 years agocmake: add global defines to enable useful macros
Alexander Alekhin [Thu, 12 Jan 2017 16:14:51 +0000 (19:14 +0300)]
cmake: add global defines to enable useful macros

7 years agoMerge pull request #7998 from alalek:fix_7993
Alexander Alekhin [Thu, 12 Jan 2017 16:57:25 +0000 (16:57 +0000)]
Merge pull request #7998 from alalek:fix_7993

7 years agocuda: fix CUDA tests initialization
Alexander Alekhin [Thu, 12 Jan 2017 11:38:47 +0000 (14:38 +0300)]
cuda: fix CUDA tests initialization

7 years agouse universal intrinsic and SSE4 popcount instruction in normHamming
Tomoaki Teshima [Wed, 11 Jan 2017 23:47:28 +0000 (08:47 +0900)]
use universal intrinsic and SSE4 popcount instruction in normHamming
 - add v_popcount in universal intrinsic
 - add test for v_popcount
 - add wrapper of popcount for both MSVC and GCC

7 years agoMerge pull request #7991 from sovrasov:cmake_find_mkl_x86_fix
Vadim Pisarevsky [Wed, 11 Jan 2017 15:47:14 +0000 (15:47 +0000)]
Merge pull request #7991 from sovrasov:cmake_find_mkl_x86_fix

7 years agoFix MKL x86 detection on Windows
Vladislav Sovrasov [Wed, 11 Jan 2017 14:17:02 +0000 (17:17 +0300)]
Fix MKL x86 detection on Windows

7 years agoMerge pull request #7947 from utibenkei:tracking-module-java
Vadim Pisarevsky [Wed, 11 Jan 2017 11:41:19 +0000 (11:41 +0000)]
Merge pull request #7947 from utibenkei:tracking-module-java

7 years agoMerge pull request #7960 from catree:tutorial_parallel_for_
Alexander Alekhin [Wed, 11 Jan 2017 09:58:53 +0000 (12:58 +0300)]
Merge pull request #7960 from catree:tutorial_parallel_for_

Add OpenCV parallel_for_ tutorial.

7 years agoMerge pull request #7976 from StevenPuttemans:fix_opencv_annotation_tool
Alexander Alekhin [Wed, 11 Jan 2017 04:40:43 +0000 (04:40 +0000)]
Merge pull request #7976 from StevenPuttemans:fix_opencv_annotation_tool

7 years agoAdd case including both moments empty.
Tetragramm [Wed, 11 Jan 2017 03:38:31 +0000 (21:38 -0600)]
Add case including both moments empty.

7 years agoAdd OpenCV parallel_for_ tutorial.
catree [Tue, 3 Jan 2017 21:28:19 +0000 (22:28 +0100)]
Add OpenCV parallel_for_ tutorial.

7 years agoMerge pull request #7972 from catree:tutorial_brightness
Vadim Pisarevsky [Tue, 10 Jan 2017 12:26:20 +0000 (12:26 +0000)]
Merge pull request #7972 from catree:tutorial_brightness

7 years agoMerge pull request #7935 from alalek:fix_waitKey
Vadim Pisarevsky [Tue, 10 Jan 2017 11:18:13 +0000 (11:18 +0000)]
Merge pull request #7935 from alalek:fix_waitKey

7 years agoMerge pull request #7975 from tomoaki0705:cleanupCalib3dStereo
Vadim Pisarevsky [Tue, 10 Jan 2017 11:12:15 +0000 (11:12 +0000)]
Merge pull request #7975 from tomoaki0705:cleanupCalib3dStereo

7 years agoMerge pull request #7983 from LaurentBerger:docFindcontours
Vadim Pisarevsky [Tue, 10 Jan 2017 11:10:16 +0000 (11:10 +0000)]
Merge pull request #7983 from LaurentBerger:docFindcontours

7 years agoMerge pull request #7986 from atinfinity:pullreq/170109-add_USE_AVX2_condition
Alexander Alekhin [Mon, 9 Jan 2017 16:11:00 +0000 (16:11 +0000)]
Merge pull request #7986 from atinfinity:pullreq/170109-add_USE_AVX2_condition

7 years agoMerge pull request #7965 from D-Barber:stereoCalibrateR2T2CalculationTinyDocumentationFix
Maksim Shabunin [Mon, 9 Jan 2017 13:16:38 +0000 (13:16 +0000)]
Merge pull request #7965 from D-Barber:stereoCalibrateR2T2CalculationTinyDocumentationFix

7 years agoadded to check the support of AVX2
atinfinity [Mon, 9 Jan 2017 10:51:33 +0000 (19:51 +0900)]
added to check the support of AVX2

7 years agodd a note in findcontours doc
LaurentBerger [Sun, 8 Jan 2017 14:24:29 +0000 (15:24 +0100)]
dd a note in findcontours doc

7 years agofix some issues with skipping files and old redundant code
StevenPuttemans [Fri, 6 Jan 2017 10:19:47 +0000 (11:19 +0100)]
fix some issues with skipping files and old redundant code

7 years agoclean up unused #if
Tomoaki Teshima [Tue, 18 Oct 2016 01:23:47 +0000 (10:23 +0900)]
clean up unused #if

7 years agoMerge pull request #7959 from alalek:fix_7957
Alexander Alekhin [Fri, 6 Jan 2017 02:10:06 +0000 (02:10 +0000)]
Merge pull request #7959 from alalek:fix_7957

7 years agoUse directly the doxygen snippet command for the Changing the contrast and brightness...
catree [Thu, 5 Jan 2017 15:05:53 +0000 (16:05 +0100)]
Use directly the doxygen snippet command for the Changing the contrast and brightness of an image tutorial. Extend the tutorial with a pratical example and with a gamma correction method to adjust the brightness of an image.

7 years agoAdd check for all zero moments. If one of the shapes is empty, the match would return...
Tetragramm [Thu, 5 Jan 2017 00:38:46 +0000 (18:38 -0600)]
Add check for all zero moments. If one of the shapes is empty, the match would return zero distance between the shapes even when the other one had content. It now returns DBL_MAX if no moments had value.

7 years agoTiny documentation fix in stereoCalibrate
Duncan Barber [Wed, 4 Jan 2017 21:24:25 +0000 (21:24 +0000)]
Tiny documentation fix in stereoCalibrate

Modified the (R2,T2) computation documentation in the stereoCalibrate function documentation to display on two lines for clarity

7 years agoMerge pull request #7948 from LorenaGdL:hitmiss_tutorial
Alexander Alekhin [Tue, 3 Jan 2017 19:35:40 +0000 (19:35 +0000)]
Merge pull request #7948 from LorenaGdL:hitmiss_tutorial

7 years agoimgproc: fix using of uninitialized edge[] members in FillConvexPoly
Alexander Alekhin [Tue, 3 Jan 2017 19:18:27 +0000 (22:18 +0300)]
imgproc: fix using of uninitialized edge[] members in FillConvexPoly

7 years agoHitMiss tutorial
Lorena García [Tue, 3 Jan 2017 17:34:04 +0000 (18:34 +0100)]
HitMiss tutorial

7 years agoMerge pull request #7942 from bae43:fix-typos
Bryce Evans [Tue, 3 Jan 2017 03:00:12 +0000 (19:00 -0800)]
Merge pull request #7942 from bae43:fix-typos

Fix Documentation Typos (#7942)

7 years agoMerge pull request #7952 from mattmyne:JSONWriteFixTrailingDecimalPoint
Matt Bennett [Mon, 2 Jan 2017 20:28:07 +0000 (20:28 +0000)]
Merge pull request #7952 from mattmyne:JSONWriteFixTrailingDecimalPoint

Append zero to trailing decimal place for FileStorage JSON write of a float or double value (#7952)

* Fix for FileStorage JSON write of a float or double value that has no fractional part; appends a zero character after the trailing decimal place to meet JSON standard.

* strlen return to size_t type rather than unnecessary cast to int

7 years agoMerge pull request #7950 from BadrinathS:firstbugfix-lr_opencv
Alexander Alekhin [Sat, 31 Dec 2016 12:48:54 +0000 (12:48 +0000)]
Merge pull request #7950 from BadrinathS:firstbugfix-lr_opencv

7 years agoResolving issue #7924
BadrinathS [Sat, 31 Dec 2016 11:07:51 +0000 (16:37 +0530)]
Resolving issue #7924

7 years agoAdded Java wrapping for tracking module
utibenkei [Fri, 30 Dec 2016 16:54:07 +0000 (01:54 +0900)]
Added Java wrapping for tracking module

7 years agoMerge pull request #7946 from SSteve:master
Alexander Alekhin [Fri, 30 Dec 2016 10:35:22 +0000 (10:35 +0000)]
Merge pull request #7946 from SSteve:master

7 years agoAvoid segmentation fault
Steve [Fri, 30 Dec 2016 01:23:40 +0000 (17:23 -0800)]
Avoid segmentation fault

Change `<=` to `<` to avoid accessing the first character of an empty string

7 years agoBufferPool is used for temporary buffer, use mat create directly
Yakun Wang [Thu, 29 Dec 2016 10:29:44 +0000 (18:29 +0800)]
BufferPool is used for temporary buffer, use mat create directly

7 years agoSpeedup MedianFilter::apply() when calling repeatedly
wykvictor [Thu, 29 Dec 2016 08:46:35 +0000 (16:46 +0800)]
Speedup MedianFilter::apply() when calling repeatedly

Speedup MedianFilter::apply(), avoid to newly create the two GpuMat every time calling filter->apply(), which is very time consuming.

7 years agohighgui: preserve waitKey -1 return value
Alexander Alekhin [Wed, 28 Dec 2016 10:06:28 +0000 (13:06 +0300)]
highgui: preserve waitKey -1 return value

7 years ago Issue-7310: Updated imwrite doc to correct default setting for IMWRITE_PNG_COMPRESSI...
Raj Natarajan [Mon, 26 Dec 2016 06:44:43 +0000 (00:44 -0600)]
 Issue-7310: Updated imwrite doc to correct default setting for IMWRITE_PNG_COMPRESSION and clarified existing doc a bit.

7 years agoMerge tag '3.2.0'
Alexander Alekhin [Fri, 23 Dec 2016 13:20:02 +0000 (16:20 +0300)]
Merge tag '3.2.0'

7 years agoOpenCV Version++
Alexander Alekhin [Fri, 23 Dec 2016 12:54:44 +0000 (15:54 +0300)]
OpenCV Version++

3.2.0

7 years agorestored OpenBLAS detection; fixed MKL's lapack header (#7921)
Vadim Pisarevsky [Fri, 23 Dec 2016 12:40:51 +0000 (15:40 +0300)]
restored OpenBLAS detection; fixed MKL's lapack header (#7921)

7 years agocmake(osx): fix CoreImage error (#7916)
Alexander Alekhin [Fri, 23 Dec 2016 08:30:17 +0000 (10:30 +0200)]
cmake(osx): fix CoreImage error (#7916)

7 years agomoved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository...
Vadim Pisarevsky [Thu, 22 Dec 2016 19:57:44 +0000 (22:57 +0300)]
moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository (#7918)

* moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository.

* trying to fix the bug with undefined symbols sgesdd_ and dgesdd_

* removed extra whitespaces; disabled LAPACK on IOS

7 years agoMerge pull request #7901 from peterentwistle:fixClassifierTutorialLinks
Alexander Alekhin [Thu, 22 Dec 2016 12:38:26 +0000 (12:38 +0000)]
Merge pull request #7901 from peterentwistle:fixClassifierTutorialLinks

7 years agoMerge pull request #7915 from alalek:CvMat
Alexander Alekhin [Thu, 22 Dec 2016 12:36:37 +0000 (12:36 +0000)]
Merge pull request #7915 from alalek:CvMat

7 years agophoto: fix InputArray -> CvMat
Alexander Alekhin [Thu, 22 Dec 2016 01:15:14 +0000 (04:15 +0300)]
photo: fix InputArray -> CvMat

7 years agocalib3d: fix InputArray -> CvMat
Alexander Alekhin [Thu, 22 Dec 2016 00:11:53 +0000 (03:11 +0300)]
calib3d: fix InputArray -> CvMat

7 years agoMerge pull request #7802 from terfendail:ovxhal_wrappers_migration
Vitaly Tuzov [Wed, 21 Dec 2016 13:19:06 +0000 (16:19 +0300)]
Merge pull request #7802 from terfendail:ovxhal_wrappers_migration

* OpenVX HAL updated to use generic OpenVX wrappers

* vxErr class from OpenVX HAL replaced with ivx::WrapperError

* reduced usage of vxImage class from OpenVX HAL replaced with ivx::Image

* vxImage class rewritten as ivx::Image subclass that calls swapHandle prior release

* Fix OpenVX HAL build

* Fix for review comments

7 years agoFixed broken links in the cascade classifier tutorial
Peter Entwistle [Mon, 19 Dec 2016 23:22:08 +0000 (23:22 +0000)]
Fixed broken links in the cascade classifier tutorial

7 years agoMerge pull request #7885 from alalek:release-3.2.0-rc
Alexander Alekhin [Mon, 19 Dec 2016 17:59:14 +0000 (17:59 +0000)]
Merge pull request #7885 from alalek:release-3.2.0-rc

7 years agoMerge pull request #7838 from khnaba:morphology-32f
Alexander Alekhin [Mon, 19 Dec 2016 16:22:03 +0000 (16:22 +0000)]
Merge pull request #7838 from khnaba:morphology-32f

7 years agoMerge pull request #7852 from savuor:fix/orb_rotation
Vadim Pisarevsky [Mon, 19 Dec 2016 16:19:38 +0000 (16:19 +0000)]
Merge pull request #7852 from savuor:fix/orb_rotation

7 years agoMerge pull request #7887 from kevinhughes27:traincascade-baseformat-fix
Vadim Pisarevsky [Mon, 19 Dec 2016 16:18:42 +0000 (16:18 +0000)]
Merge pull request #7887 from kevinhughes27:traincascade-baseformat-fix

7 years agoMerge pull request #7687 from apavlenko:vx-hal
Alexander Alekhin [Mon, 19 Dec 2016 15:57:36 +0000 (15:57 +0000)]
Merge pull request #7687 from apavlenko:vx-hal

7 years agoadd the type_id to the old save format
Kevin Hughes [Sat, 17 Dec 2016 18:54:55 +0000 (13:54 -0500)]
add the type_id to the old save format

7 years agomoving HAL-related CMakeLists.txt to 'hal' sub-dir
apavlenko [Mon, 21 Nov 2016 10:16:56 +0000 (13:16 +0300)]
moving HAL-related CMakeLists.txt to 'hal' sub-dir

7 years agomoving hal to a separate folder
apavlenko [Fri, 18 Nov 2016 07:40:47 +0000 (10:40 +0300)]
moving hal to a separate folder

7 years agoMerge pull request #7897 from alalek:fix_ffmpeg_check
Alexander Alekhin [Mon, 19 Dec 2016 14:18:49 +0000 (16:18 +0200)]
Merge pull request #7897 from alalek:fix_ffmpeg_check

cmake: fix ffmpeg check code (port into master #7893)

7 years agoOpenCV version++
Alexander Alekhin [Mon, 19 Dec 2016 14:12:18 +0000 (17:12 +0300)]
OpenCV version++

3.2.0-rc

7 years agocmake: fix ffmpeg check code
Alexander Alekhin [Sun, 18 Dec 2016 21:22:16 +0000 (00:22 +0300)]
cmake: fix ffmpeg check code

7 years agoMerge pull request #7694 from sergiud:cmake-config-optional-components
Alexander Alekhin [Mon, 19 Dec 2016 13:53:36 +0000 (13:53 +0000)]
Merge pull request #7694 from sergiud:cmake-config-optional-components

7 years agoMerge pull request #7871 from savuor:fix/openvx_cvt_on
Alexander Alekhin [Mon, 19 Dec 2016 13:51:53 +0000 (13:51 +0000)]
Merge pull request #7871 from savuor:fix/openvx_cvt_on

7 years agoMerge pull request #7896 from alalek:fix_add_testdata
Alexander Alekhin [Mon, 19 Dec 2016 13:49:23 +0000 (13:49 +0000)]
Merge pull request #7896 from alalek:fix_add_testdata

7 years agoMerge pull request #7855 from logic1988:master
Vadim Pisarevsky [Mon, 19 Dec 2016 13:45:51 +0000 (13:45 +0000)]
Merge pull request #7855 from logic1988:master