platform/upstream/opencv.git
9 years agoanother attempt to resolve ABI checker complains
Vadim Pisarevsky [Tue, 21 Apr 2015 09:42:46 +0000 (12:42 +0300)]
another attempt to resolve ABI checker complains

9 years agotrying to avoid ABI checker failures
Vadim Pisarevsky [Tue, 21 Apr 2015 08:30:41 +0000 (11:30 +0300)]
trying to avoid ABI checker failures

9 years agofixed some newly introduced compile errors and warnings
Vadim Pisarevsky [Mon, 20 Apr 2015 18:34:37 +0000 (21:34 +0300)]
fixed some newly introduced compile errors and warnings

9 years agoextended universal intrinsics: added 64-bit integers, improved shift operators, renam...
Vadim Pisarevsky [Mon, 20 Apr 2015 17:27:03 +0000 (20:27 +0300)]
extended universal intrinsics: added 64-bit integers, improved shift operators, renamed "pack" operations; changed semantics of extended integer multiplication, added v_dotprod.
also, split intrinsics into separate files. C implementation is compiled only when none of SSE2 or NEON is available.

9 years agotrying to fix test failures (take 2)
Vadim Pisarevsky [Fri, 17 Apr 2015 08:32:20 +0000 (11:32 +0300)]
trying to fix test failures (take 2)

9 years agotrying to fix test failures
Vadim Pisarevsky [Fri, 17 Apr 2015 07:51:49 +0000 (10:51 +0300)]
trying to fix test failures

9 years agocontinuing fixing universal intrinsics
Vadim Pisarevsky [Fri, 17 Apr 2015 05:32:06 +0000 (08:32 +0300)]
continuing fixing universal intrinsics

9 years agofixed some more compile warnings (2)
Vadim Pisarevsky [Thu, 16 Apr 2015 21:13:08 +0000 (00:13 +0300)]
fixed some more compile warnings (2)

9 years agofixed some more compile warnings
Vadim Pisarevsky [Thu, 16 Apr 2015 20:52:23 +0000 (23:52 +0300)]
fixed some more compile warnings

9 years agofixed compile warnings
Vadim Pisarevsky [Thu, 16 Apr 2015 20:42:00 +0000 (23:42 +0300)]
fixed compile warnings

9 years agofully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic...
Vadim Pisarevsky [Thu, 16 Apr 2015 20:00:26 +0000 (23:00 +0300)]
fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions

9 years agoHAL extensions: added initial version of universal intrinsics (C implementation and...
Vadim Pisarevsky [Tue, 14 Apr 2015 21:36:27 +0000 (00:36 +0300)]
HAL extensions: added initial version of universal intrinsics (C implementation and SSE2, NEON - TBD). added empty files where some functionality from core and imgproc will be moved to

9 years agoMerge pull request #3911 from vpisarev:core_tweaks
Vadim Pisarevsky [Tue, 7 Apr 2015 19:03:48 +0000 (19:03 +0000)]
Merge pull request #3911 from vpisarev:core_tweaks

9 years agoMerge pull request #3879 from mshabunin:add-hal
Vadim Pisarevsky [Tue, 7 Apr 2015 17:06:58 +0000 (17:06 +0000)]
Merge pull request #3879 from mshabunin:add-hal

9 years agoreverted "typedef _InputArray InputArray", fixed warning from doxygen
Vadim Pisarevsky [Tue, 7 Apr 2015 16:34:51 +0000 (19:34 +0300)]
reverted "typedef _InputArray InputArray", fixed warning from doxygen

9 years agoBasic HAL module
Maksim Shabunin [Thu, 26 Mar 2015 12:25:42 +0000 (15:25 +0300)]
Basic HAL module

9 years ago1. Input/OutputArray optimizations;
Vadim Pisarevsky [Tue, 7 Apr 2015 13:44:26 +0000 (16:44 +0300)]
1. Input/OutputArray optimizations;
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed

9 years agoMerge pull request #3906 from yxiong:policy-0042
Vadim Pisarevsky [Tue, 7 Apr 2015 09:35:07 +0000 (09:35 +0000)]
Merge pull request #3906 from yxiong:policy-0042

9 years agoMerge pull request #3890 from greensea:patch-1
Vadim Pisarevsky [Tue, 7 Apr 2015 09:33:36 +0000 (09:33 +0000)]
Merge pull request #3890 from greensea:patch-1

9 years agoFix a segment fault issue in cascade classfier
greensea [Tue, 31 Mar 2015 09:28:40 +0000 (17:28 +0800)]
Fix a segment fault issue in cascade classfier

work_var_count and sample_count are both 32bit integer, if the product of work_var_count and sample_count is bigger than 2^31, the compiler will treat (work_var_count*sample_count) as a negative number. Force work_var_count as an unsigned 64bit integer to avoid this issue.

9 years agoSilence cmake 3.0+ warnings about MACOSX_RPATH
Ying Xiong [Mon, 6 Apr 2015 20:37:06 +0000 (16:37 -0400)]
Silence cmake 3.0+ warnings about MACOSX_RPATH

9 years agoMerge pull request #3903 from SeninAndrew:master
Vadim Pisarevsky [Sun, 5 Apr 2015 18:01:17 +0000 (18:01 +0000)]
Merge pull request #3903 from SeninAndrew:master

9 years agoMerge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix
Vadim Pisarevsky [Sun, 5 Apr 2015 17:57:51 +0000 (17:57 +0000)]
Merge pull request #3729 from bitstars:AsyncServiceHelper.java-Android-5-hotfix

9 years agoMerge pull request #3694 from Ashod:jp2
Vadim Pisarevsky [Sun, 5 Apr 2015 17:57:11 +0000 (17:57 +0000)]
Merge pull request #3694 from Ashod:jp2

9 years agoJpeg2k color to greyscale conversion on non-Windows is done post decoding because...
Ashod Nakashian [Sat, 4 Apr 2015 00:59:13 +0000 (20:59 -0400)]
Jpeg2k color to greyscale conversion on non-Windows is done post decoding because system libjasper segfaults when decoding color images as greyscale.

9 years agoSimplified temp filename generation.
Ashod Nakashian [Sun, 29 Mar 2015 20:49:47 +0000 (16:49 -0400)]
Simplified temp filename generation.

9 years agoJasper unit-tests and removed a superfluous assertion.
Ashod Nakashian [Thu, 12 Feb 2015 02:28:44 +0000 (21:28 -0500)]
Jasper unit-tests and removed a superfluous assertion.

9 years agoFix for decoding large Jp2 images on Windows.
Ashod Nakashian [Wed, 11 Feb 2015 22:49:19 +0000 (17:49 -0500)]
Fix for decoding large Jp2 images on Windows.

On Windows, the tmpnam function returns a temp filename in the current directory, which has a prepended backslash '\\'.
This subsequently fails the open function.

This patch creates a proper temp filename in the temp folder and makes unlike work by opening the file as short-lived.

9 years agoXimea camera fix (see issue #4235)
Andrew Senin [Fri, 3 Apr 2015 19:49:50 +0000 (22:49 +0300)]
Ximea camera fix (see issue #4235)

9 years agoMerge pull request #3902 from apavlenko:doc_fix_imwrite_master
Vadim Pisarevsky [Fri, 3 Apr 2015 13:26:22 +0000 (13:26 +0000)]
Merge pull request #3902 from apavlenko:doc_fix_imwrite_master

9 years agoMerge pull request #3901 from StevenPuttemans:add_breakrule_cascade_accuracy
Vadim Pisarevsky [Fri, 3 Apr 2015 13:24:47 +0000 (13:24 +0000)]
Merge pull request #3901 from StevenPuttemans:add_breakrule_cascade_accuracy

9 years agofixing confusing variable naming in a sample code
Andrey Pavlenko [Fri, 3 Apr 2015 11:03:09 +0000 (14:03 +0300)]
fixing confusing variable naming in a sample code

9 years agofixing wrong equation in accuracy break rule
StevenPuttemans [Fri, 3 Apr 2015 10:54:05 +0000 (12:54 +0200)]
fixing wrong equation in accuracy break rule

9 years agoMerge pull request #3798 from StevenPuttemans:add_breakrule_cascade_accuracy
Vadim Pisarevsky [Fri, 3 Apr 2015 10:19:03 +0000 (10:19 +0000)]
Merge pull request #3798 from StevenPuttemans:add_breakrule_cascade_accuracy

9 years agoMerge pull request #3813 from hahne:iss1915
Vadim Pisarevsky [Fri, 3 Apr 2015 10:16:29 +0000 (10:16 +0000)]
Merge pull request #3813 from hahne:iss1915

9 years agoallowing people to manually define how sharp a cascade classifier model should be...
StevenPuttemans [Fri, 6 Mar 2015 10:52:26 +0000 (11:52 +0100)]
allowing people to manually define how sharp a cascade classifier model should be trained

9 years agoMerge pull request #3892 from MSOpenTech:imgcodecs-contrib
Vadim Pisarevsky [Thu, 2 Apr 2015 11:53:55 +0000 (11:53 +0000)]
Merge pull request #3892 from MSOpenTech:imgcodecs-contrib

9 years agoMerge pull request #3869 from Dikay900:remove_unused_variable
Vadim Pisarevsky [Thu, 2 Apr 2015 11:48:43 +0000 (11:48 +0000)]
Merge pull request #3869 from Dikay900:remove_unused_variable

9 years agoMerge pull request #3889 from nitsch:fix-mingw-cmake
Vadim Pisarevsky [Thu, 2 Apr 2015 11:45:20 +0000 (11:45 +0000)]
Merge pull request #3889 from nitsch:fix-mingw-cmake

9 years agoMerge pull request #3897 from sanchom:bugfix_4030
Vadim Pisarevsky [Thu, 2 Apr 2015 11:44:32 +0000 (11:44 +0000)]
Merge pull request #3897 from sanchom:bugfix_4030

9 years agoUpdate android+AsyncServiceHelper.java
Simon Heinen [Thu, 2 Apr 2015 07:05:56 +0000 (09:05 +0200)]
Update android+AsyncServiceHelper.java

small formatting fixes

9 years agoUpdate android+AsyncServiceHelper.java
Simon Heinen [Thu, 2 Apr 2015 06:42:19 +0000 (08:42 +0200)]
Update android+AsyncServiceHelper.java

changed tabs in last commit to spaces

9 years agoBugfix: #4030 SVM auto-training.
Sancho McCann [Wed, 1 Apr 2015 19:00:39 +0000 (19:00 +0000)]
Bugfix: #4030 SVM auto-training.

9 years agoinitialize tiltedOffset variable at correct location
Dikay900 [Wed, 1 Apr 2015 18:22:27 +0000 (20:22 +0200)]
initialize tiltedOffset variable at correct location
do not use this variable if it is not an tilted feature

9 years agoMerge pull request #3874 from paroj:calib_sample
Vadim Pisarevsky [Wed, 1 Apr 2015 11:13:04 +0000 (11:13 +0000)]
Merge pull request #3874 from paroj:calib_sample

9 years agoMerge pull request #3887 from MSOpenTech:update_py_script
Vadim Pisarevsky [Wed, 1 Apr 2015 11:05:56 +0000 (11:05 +0000)]
Merge pull request #3887 from MSOpenTech:update_py_script

9 years agoMerge pull request #3891 from mshabunin:fix-v4l2-link
Vadim Pisarevsky [Wed, 1 Apr 2015 10:49:52 +0000 (10:49 +0000)]
Merge pull request #3891 from mshabunin:fix-v4l2-link

9 years agoFunctionality for relocation of tests
Evgeny Agafonchikov [Fri, 27 Mar 2015 13:50:18 +0000 (16:50 +0300)]
Functionality for relocation of tests

This allows to start run.py with --move_tests parameter to place tests

to another location and keep them runnable from there

9 years agoFixing help messages
Evgeny Agafonchikov [Tue, 24 Mar 2015 12:52:49 +0000 (15:52 +0300)]
Fixing help messages

--help message and starting run.py w/o parameters generate different messages

E. g. w/ and w/o build_path in the end

build_path is required, removing square brackets

9 years agoAdded sample imgcodecs logic to winrt sample app
Maxim Kostin [Tue, 31 Mar 2015 14:09:09 +0000 (17:09 +0300)]
Added sample imgcodecs logic to winrt sample app
 - Made use imread() in OcvImageProcessing sample.
 - Added test/sample logic to verify file creation via imgcodecs.

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years ago - update documentation
Pavel Rojtberg [Wed, 25 Mar 2015 15:11:53 +0000 (16:11 +0100)]
  - update documentation
    * correct the part about fixed aspect
    * improve formatting
    * add snippet markers to source
    * replace inline code by @snippet
  - do not run calibration twice when using a imageList
  - make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample
  - respect write extrinsic/ points flags
  - set the aspectRatio value when specified
  - fix writing of calibration settings. also update grammar.
  - fix intendation and remove some size_t -> int casts by using size_t

9 years agoAdded support for 'imgcodecs' module:
Maxim Kostin [Tue, 31 Mar 2015 13:31:37 +0000 (16:31 +0300)]
Added support for 'imgcodecs' module:
 - Resolved GET_ENV and input type incompatibility
 - Made libjpeg compile for WINRT. So does imgcodecs module.
 - Updated .gitignore (log, tlog)

9 years agocap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
Roman Donchenko [Wed, 9 Jul 2014 12:55:40 +0000 (16:55 +0400)]
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both

How this worked before, I do not know.

9 years agoFix static/shared lib detection
Alexander Nitsch [Mon, 30 Mar 2015 21:38:43 +0000 (23:38 +0200)]
Fix static/shared lib detection

The check for BUILD_SHARED_LIBS had its logic backwards. If this
variable is not defined we must assume a build of static libs.

9 years agoRemove local variables from CMAKE namespace
Alexander Nitsch [Tue, 17 Mar 2015 12:52:59 +0000 (13:52 +0100)]
Remove local variables from CMAKE namespace

9 years agoFix MinGW detection on x86
Alexander Nitsch [Sat, 7 Mar 2015 14:49:48 +0000 (15:49 +0100)]
Fix MinGW detection on x86

Make detection of x64 using the gcc's target triplet identical
to the one used in cmake/OpenCVDetectCXXCompiler.cmake.
Otherwise, MinGW-w64 setups will always be treated as x64 since
they contain "w64" as vendor key.

9 years agoFix MinGW architecture detection
Alexander Nitsch [Sat, 7 Mar 2015 14:37:21 +0000 (15:37 +0100)]
Fix MinGW architecture detection

Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.

9 years agoFix MinGW detection on x86
Alexander Nitsch [Mon, 23 Feb 2015 14:01:00 +0000 (15:01 +0100)]
Fix MinGW detection on x86

MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.

Turns out we do not even need this additional check since the
architecture has been correctly determined earlier in this file.
No need to do it again.

9 years agoMerge pull request #3873 from Dmitry-Me:reduceVariableScope10
Vadim Pisarevsky [Mon, 30 Mar 2015 17:20:39 +0000 (17:20 +0000)]
Merge pull request #3873 from Dmitry-Me:reduceVariableScope10

9 years agoMerge pull request #3888 from alalek:fix_build
Alexander Alekhin [Mon, 30 Mar 2015 15:52:05 +0000 (15:52 +0000)]
Merge pull request #3888 from alalek:fix_build

9 years agofix build (related to PR #3814)
Alexander Alekhin [Mon, 30 Mar 2015 13:28:53 +0000 (16:28 +0300)]
fix build (related to PR #3814)

9 years agoMerge pull request #3883 from kmsquire:python_cmake_fix
Vadim Pisarevsky [Mon, 30 Mar 2015 09:38:18 +0000 (09:38 +0000)]
Merge pull request #3883 from kmsquire:python_cmake_fix

9 years agoMerge pull request #3876 from vpisarev:mjpeg_codec
Vadim Pisarevsky [Mon, 30 Mar 2015 09:27:10 +0000 (09:27 +0000)]
Merge pull request #3876 from vpisarev:mjpeg_codec

9 years agoMerge pull request #3872 from mshabunin:add-rst-link
Vadim Pisarevsky [Mon, 30 Mar 2015 09:13:26 +0000 (09:13 +0000)]
Merge pull request #3872 from mshabunin:add-rst-link

9 years agoMerge pull request #3884 from mshabunin:fix-vc10-build
Alexander Alekhin [Fri, 27 Mar 2015 18:03:37 +0000 (18:03 +0000)]
Merge pull request #3884 from mshabunin:fix-vc10-build

9 years agoadded video writer quality, which user may change dynamically in the case of motion...
Vadim Pisarevsky [Fri, 27 Mar 2015 12:15:59 +0000 (15:15 +0300)]
added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder

9 years agoCommented unused constants in the RHO algorithm
Maksim Shabunin [Fri, 27 Mar 2015 11:36:27 +0000 (14:36 +0300)]
Commented unused constants in the RHO algorithm

9 years agoFix build for VC10
Maksim Shabunin [Fri, 27 Mar 2015 09:15:26 +0000 (12:15 +0300)]
Fix build for VC10

9 years agoAllow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden
Kevin Squire [Fri, 16 Jan 2015 02:13:06 +0000 (18:13 -0800)]
Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden

9 years agoMerge pull request #3847 from mshabunin:android-build
Vadim Pisarevsky [Thu, 26 Mar 2015 16:56:49 +0000 (16:56 +0000)]
Merge pull request #3847 from mshabunin:android-build

9 years agoMerge pull request #3880 from vpisarev:fix_emd
Vadim Pisarevsky [Thu, 26 Mar 2015 16:40:17 +0000 (16:40 +0000)]
Merge pull request #3880 from vpisarev:fix_emd

9 years agoMerge pull request #3871 from potpath:patch-1
Vadim Pisarevsky [Thu, 26 Mar 2015 13:35:35 +0000 (13:35 +0000)]
Merge pull request #3871 from potpath:patch-1

9 years agoMerge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc
Vadim Pisarevsky [Thu, 26 Mar 2015 13:35:12 +0000 (13:35 +0000)]
Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc

9 years agoinitialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report)
Vadim Pisarevsky [Thu, 26 Mar 2015 13:26:41 +0000 (16:26 +0300)]
initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report)

9 years agoMerge pull request #3875 from alalek:fix_build
Vadim Pisarevsky [Thu, 26 Mar 2015 13:09:01 +0000 (13:09 +0000)]
Merge pull request #3875 from alalek:fix_build

9 years agofixed warnings; transpose qtab to make it compatible with neon branch
Vadim Pisarevsky [Thu, 26 Mar 2015 12:59:49 +0000 (15:59 +0300)]
fixed warnings; transpose qtab to make it compatible with neon branch

9 years agoMerge pull request #3878 from mshabunin:fix-python
Vadim Pisarevsky [Thu, 26 Mar 2015 10:22:11 +0000 (10:22 +0000)]
Merge pull request #3878 from mshabunin:fix-python

9 years agoAdd python test for inheritance structure generation
Maksim Shabunin [Thu, 26 Mar 2015 08:43:49 +0000 (11:43 +0300)]
Add python test for inheritance structure generation

9 years agoFix python submodules inheritance detection
Maksim Shabunin [Thu, 26 Mar 2015 08:22:52 +0000 (11:22 +0300)]
Fix python submodules inheritance detection

9 years agoadded self-contained motion jpeg encoder (filename should end with .avi; fourcc shoul...
Vadim Pisarevsky [Wed, 25 Mar 2015 21:39:29 +0000 (00:39 +0300)]
added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"

9 years agofix build (related to PR #3814)
Alexander Alekhin [Wed, 25 Mar 2015 16:09:53 +0000 (19:09 +0300)]
fix build (related to PR #3814)

9 years agoReduce variables scope
Dmitry-Me [Wed, 25 Mar 2015 14:17:06 +0000 (17:17 +0300)]
Reduce variables scope

9 years agoMerge pull request #3870 from Dmitry-Me:reduceVariableScope9
Vadim Pisarevsky [Wed, 25 Mar 2015 13:32:33 +0000 (13:32 +0000)]
Merge pull request #3870 from Dmitry-Me:reduceVariableScope9

9 years agoAdd link to old documentation format
Maksim Shabunin [Wed, 25 Mar 2015 13:27:35 +0000 (16:27 +0300)]
Add link to old documentation format

9 years agodisable cuda::OpticalFlowNeedleMap if configured without cudaimgproc
Dikay900 [Sat, 21 Mar 2015 18:18:54 +0000 (19:18 +0100)]
disable cuda::OpticalFlowNeedleMap if configured without cudaimgproc
disable cuda::FastOpticalFlowBM if configured without cudaarithm

9 years agoFix a typo in template_matching.markdown
potpath [Wed, 25 Mar 2015 11:07:01 +0000 (18:07 +0700)]
Fix a typo in template_matching.markdown

Fix a typo in first equation under method=CV_TM_CCOEFF.

9 years agoMerge pull request #3670 from obilaniu:master
Vadim Pisarevsky [Wed, 25 Mar 2015 10:10:04 +0000 (10:10 +0000)]
Merge pull request #3670 from obilaniu:master

9 years agoMerge pull request #3866 from tdsmith:python-linkage
Vadim Pisarevsky [Wed, 25 Mar 2015 09:51:20 +0000 (09:51 +0000)]
Merge pull request #3866 from tdsmith:python-linkage

9 years agoReduce variable scope
Dmitry-Me [Wed, 25 Mar 2015 07:35:11 +0000 (10:35 +0300)]
Reduce variable scope

9 years agoMerge pull request #3634 from mshabunin:transition-guide
Vadim Pisarevsky [Tue, 24 Mar 2015 16:10:19 +0000 (16:10 +0000)]
Merge pull request #3634 from mshabunin:transition-guide

9 years agoChanged Android Manager version to 3.0
Maksim Shabunin [Tue, 24 Mar 2015 15:57:29 +0000 (18:57 +0300)]
Changed Android Manager version to 3.0

9 years agoMerge pull request #3814 from erikrk:denoising-16bit-master
Vadim Pisarevsky [Tue, 24 Mar 2015 15:23:58 +0000 (15:23 +0000)]
Merge pull request #3814 from erikrk:denoising-16bit-master

9 years agoMerge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master
Vadim Pisarevsky [Tue, 24 Mar 2015 15:19:55 +0000 (15:19 +0000)]
Merge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master

9 years agoMerge pull request #3849 from Dikay900:fix_tilted_features_crash
Vadim Pisarevsky [Tue, 24 Mar 2015 15:19:13 +0000 (15:19 +0000)]
Merge pull request #3849 from Dikay900:fix_tilted_features_crash

9 years agoMerge pull request #3854 from Dmitry-Me:reduceVariableScope8
Vadim Pisarevsky [Tue, 24 Mar 2015 15:13:34 +0000 (15:13 +0000)]
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8

9 years agoMerge pull request #3858 from MSOpenTech:fix-ml-test
Vadim Pisarevsky [Tue, 24 Mar 2015 15:09:53 +0000 (15:09 +0000)]
Merge pull request #3858 from MSOpenTech:fix-ml-test

9 years agoMerge pull request #3859 from NewProggie:fix-doc-typo
Vadim Pisarevsky [Tue, 24 Mar 2015 15:08:03 +0000 (15:08 +0000)]
Merge pull request #3859 from NewProggie:fix-doc-typo

9 years agoMerge pull request #3860 from theodr:document_hconcat_vconcat
Vadim Pisarevsky [Tue, 24 Mar 2015 15:07:34 +0000 (15:07 +0000)]
Merge pull request #3860 from theodr:document_hconcat_vconcat

9 years agoMerge pull request #3861 from wangyan42164:cascade_optimizing
Vadim Pisarevsky [Tue, 24 Mar 2015 15:07:12 +0000 (15:07 +0000)]
Merge pull request #3861 from wangyan42164:cascade_optimizing

9 years agoMerge pull request #3863 from MSOpenTech:fix_winrt_linker
Vadim Pisarevsky [Tue, 24 Mar 2015 15:05:43 +0000 (15:05 +0000)]
Merge pull request #3863 from MSOpenTech:fix_winrt_linker