platform/upstream/opencv.git
9 years agoUse imported targets for linking to CUDA
Roman Donchenko [Mon, 30 Mar 2015 12:16:32 +0000 (15:16 +0300)]
Use imported targets for linking to CUDA

This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:

* It removes the need to use link_directories, which doesn't guarantee that
  the libraries from the supplied directory will be used (there may be
  libraries with the same names earlier in the search path).

* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
  is used with target_link_libraries, where such entries are treated as linker
  flags, so doing this is unportable. I remove the support for -L entries
  from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
  future.

9 years agoMove the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
Roman Donchenko [Mon, 30 Mar 2015 12:04:27 +0000 (15:04 +0300)]
Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop

There's no reason to do it twice.

9 years agoTurn ocv_convert_to_lib_name into a function
Roman Donchenko [Mon, 30 Mar 2015 11:58:37 +0000 (14:58 +0300)]
Turn ocv_convert_to_lib_name into a function

9 years agoMerge pull request #3805 from nitsch:fix-mingw-cmake-config
Vadim Pisarevsky [Wed, 25 Mar 2015 09:53:35 +0000 (09:53 +0000)]
Merge pull request #3805 from nitsch:fix-mingw-cmake-config

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

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 agoDon't explicitly link Python on OS X
Tim D. Smith [Tue, 24 Mar 2015 06:09:57 +0000 (23:09 -0700)]
Don't explicitly link Python on OS X

Explicitly linking to a Python framework on OS X prevents modules from
being built against one python (i.e. system python) and imported from
another (i.e. Homebrew python); the interpreter segfaults if there's a
linkage to a foreign python. Building the module with `-undefined
dynamic_lookup` instead of an explicit link allows the symbols to be
resolved at load time from a compatible python.

9 years agoMerge pull request #3850 from piponazo:2.4
Vadim Pisarevsky [Mon, 23 Mar 2015 08:03:49 +0000 (08:03 +0000)]
Merge pull request #3850 from piponazo:2.4

9 years agoMerge pull request #3834 from asmorkalov:retina_docs_fix
Vadim Pisarevsky [Fri, 20 Mar 2015 10:14:29 +0000 (10:14 +0000)]
Merge pull request #3834 from asmorkalov:retina_docs_fix

9 years agoMerge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir
Vadim Pisarevsky [Fri, 20 Mar 2015 10:13:46 +0000 (10:13 +0000)]
Merge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir

9 years agoMerge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
Vadim Pisarevsky [Fri, 20 Mar 2015 09:37:49 +0000 (09:37 +0000)]
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq

9 years agoFix a bug that impede to set the trackbar pos using the Qt control panel
Luis Díaz Más [Thu, 19 Mar 2015 20:25:10 +0000 (21:25 +0100)]
Fix a bug that impede to set the trackbar pos using the Qt control panel

9 years agoFix a bad free space check in icvGrowSeq.
Boris Daskalov [Tue, 17 Mar 2015 14:23:03 +0000 (16:23 +0200)]
Fix a bad free space check in icvGrowSeq.

A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.

9 years agoMerge pull request #3843 from piponazo:BugFix4244
Vadim Pisarevsky [Thu, 19 Mar 2015 12:15:41 +0000 (12:15 +0000)]
Merge pull request #3843 from piponazo:BugFix4244

9 years agoFixing the bug #4244 that I just reported in code.opencv.org
Luis Díaz Más [Wed, 18 Mar 2015 19:07:08 +0000 (20:07 +0100)]
Fixing the bug #4244 that I just reported in code.opencv.org

9 years agoDocumentation update after iOS warnings fix in contrib/retina header.
Alexander Smorkalov [Tue, 17 Mar 2015 03:43:54 +0000 (06:43 +0300)]
Documentation update after iOS warnings fix in contrib/retina header.

9 years agoMerge pull request #3824 from Milania1:tutorial_hough_lines_fix
Vadim Pisarevsky [Tue, 17 Mar 2015 11:14:13 +0000 (11:14 +0000)]
Merge pull request #3824 from Milania1:tutorial_hough_lines_fix

9 years agoMerge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
Vadim Pisarevsky [Mon, 16 Mar 2015 10:02:06 +0000 (10:02 +0000)]
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory

9 years agofixed error in hough lines tutorial (the point (9,4) is not on the lines, but the...
Milania1 [Thu, 12 Mar 2015 15:46:25 +0000 (16:46 +0100)]
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)

9 years agoMerge pull request #3815 from StevenPuttemans:add_camera_IP_regulations
Vadim Pisarevsky [Thu, 12 Mar 2015 14:39:48 +0000 (14:39 +0000)]
Merge pull request #3815 from StevenPuttemans:add_camera_IP_regulations

9 years agoMerge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
Vadim Pisarevsky [Thu, 12 Mar 2015 14:29:03 +0000 (14:29 +0000)]
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation

9 years agoextra camera specific information for IP settings
StevenPuttemans [Tue, 10 Mar 2015 08:28:37 +0000 (09:28 +0100)]
extra camera specific information for IP settings

9 years agoupgrade traincascade default memory
StevenPuttemans [Mon, 9 Mar 2015 09:43:14 +0000 (10:43 +0100)]
upgrade traincascade default memory

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 agoMerge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation
Alexander Alekhin [Fri, 6 Mar 2015 14:53:42 +0000 (14:53 +0000)]
Merge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation

9 years agoadding usage information
StevenPuttemans [Fri, 6 Mar 2015 12:47:43 +0000 (13:47 +0100)]
adding usage information

9 years agoupdate cmakelists of annotation tool
StevenPuttemans [Thu, 5 Mar 2015 13:22:43 +0000 (14:22 +0100)]
update cmakelists of annotation tool

9 years agoAdd -L for CUDA libs path to pkg-config
quentin [Thu, 5 Mar 2015 13:37:21 +0000 (14:37 +0100)]
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

9 years agoMerge pull request #3774 from JoeHowse:2.4
Vadim Pisarevsky [Tue, 3 Mar 2015 12:31:29 +0000 (12:31 +0000)]
Merge pull request #3774 from JoeHowse:2.4

9 years agoCat face detection cascades
Joe Howse [Mon, 2 Mar 2015 15:58:08 +0000 (11:58 -0400)]
Cat face detection cascades

9 years agoMerge pull request #3761 from StevenPuttemans:fix_smile_model
Vadim Pisarevsky [Mon, 2 Mar 2015 11:49:41 +0000 (11:49 +0000)]
Merge pull request #3761 from StevenPuttemans:fix_smile_model

9 years agoMerge pull request #3754 from eliteraspberries:unsigned-mask
Vadim Pisarevsky [Mon, 2 Mar 2015 11:34:43 +0000 (11:34 +0000)]
Merge pull request #3754 from eliteraspberries:unsigned-mask

9 years agoMerge pull request #3755 from eliteraspberries:mat-size-sign
Vadim Pisarevsky [Mon, 2 Mar 2015 11:34:09 +0000 (11:34 +0000)]
Merge pull request #3755 from eliteraspberries:mat-size-sign

9 years agoMerge pull request #3745 from nitsch:fix-mingw-detection
Vadim Pisarevsky [Mon, 2 Mar 2015 10:55:00 +0000 (10:55 +0000)]
Merge pull request #3745 from nitsch:fix-mingw-detection

9 years agoMerge pull request #3756 from eliteraspberries:cast-double
Vadim Pisarevsky [Mon, 2 Mar 2015 10:52:28 +0000 (10:52 +0000)]
Merge pull request #3756 from eliteraspberries:cast-double

9 years agoMerge pull request #3766 from StevenPuttemans:add_GPU_old_models
Vadim Pisarevsky [Mon, 2 Mar 2015 10:49:38 +0000 (10:49 +0000)]
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models

9 years agoMerge pull request #3765 from jet47:gpu-hog-fix
Vadim Pisarevsky [Mon, 2 Mar 2015 10:34:51 +0000 (10:34 +0000)]
Merge pull request #3765 from jet47:gpu-hog-fix

9 years agoMerge pull request #3768 from jet47:gpumat-set-to
Vadim Pisarevsky [Mon, 2 Mar 2015 10:33:44 +0000 (10:33 +0000)]
Merge pull request #3768 from jet47:gpumat-set-to

9 years agofix GpuMat::setTo implementation
Vladislav Vinogradov [Fri, 27 Feb 2015 13:28:06 +0000 (16:28 +0300)]
fix GpuMat::setTo implementation

previous implementation was not thread/stream safe, since it used constant
memory

new implementation doesn't use any global objects, so it is thread/stream safe

9 years agoAdd GPU models in seperate folder, only old models are supported and they were replac...
StevenPuttemans [Fri, 27 Feb 2015 12:18:38 +0000 (13:18 +0100)]
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
This solves the undesired consequence of breaking the GPU interface.

9 years agofix gpu HOG implementation:
Vladislav Vinogradov [Fri, 27 Feb 2015 11:28:12 +0000 (14:28 +0300)]
fix gpu HOG implementation:

move hog::set_up_constants from constructor to compute method

if user changed CUDA device between constructor and computation,
some variables were uninitialized

9 years agofixing model size, typo in previous PR
StevenPuttemans [Thu, 26 Feb 2015 14:53:00 +0000 (15:53 +0100)]
fixing model size, typo in previous PR

9 years agoMerge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
Vadim Pisarevsky [Wed, 25 Feb 2015 12:10:31 +0000 (12:10 +0000)]
Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras

9 years agoMerge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
Alexander Smorkalov [Wed, 25 Feb 2015 11:54:44 +0000 (11:54 +0000)]
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon

9 years agofix annotation tool, add auto make of tool
StevenPuttemans [Tue, 24 Feb 2015 15:02:15 +0000 (16:02 +0100)]
fix annotation tool, add auto make of tool

9 years agoset epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
Vladislav Vinogradov [Wed, 25 Feb 2015 10:16:36 +0000 (13:16 +0300)]
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic

9 years agoFix setting of architecture for MinGW builds
Alexander Nitsch [Tue, 24 Feb 2015 22:13:27 +0000 (23:13 +0100)]
Fix setting of architecture for MinGW builds

The architecture has been correctly determined earlier in this
file. No need to do it again.

9 years agoCast a long integer to double explicitly.
Mansour Moufid [Tue, 24 Feb 2015 22:04:28 +0000 (17:04 -0500)]
Cast a long integer to double explicitly.

9 years agoCast some image coordinates and sizes to double.
Mansour Moufid [Tue, 24 Feb 2015 17:21:34 +0000 (12:21 -0500)]
Cast some image coordinates and sizes to double.

9 years agoMerge pull request #3677 from ilya-lavrenov:cuda_backport
Alexander Smorkalov [Tue, 24 Feb 2015 15:06:15 +0000 (15:06 +0000)]
Merge pull request #3677 from ilya-lavrenov:cuda_backport

9 years agoMerge pull request #3653 from StevenPuttemans:add_annotationtool
Vadim Pisarevsky [Tue, 24 Feb 2015 13:50:39 +0000 (13:50 +0000)]
Merge pull request #3653 from StevenPuttemans:add_annotationtool

9 years agobackport from master
Ilya Lavrenov [Thu, 5 Feb 2015 10:23:28 +0000 (13:23 +0300)]
backport from master

9 years agoMerge pull request #3735 from SpecLad:align-cpack-variables
Alexander Smorkalov [Tue, 24 Feb 2015 11:42:40 +0000 (11:42 +0000)]
Merge pull request #3735 from SpecLad:align-cpack-variables

9 years agoMerge pull request #3727 from StevenPuttemans:fix_3714_2.4
Maksim Shabunin [Tue, 24 Feb 2015 10:08:43 +0000 (10:08 +0000)]
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4

9 years agoMerge pull request #3740 from StevenPuttemans:fix_3028_2.4
Maksim Shabunin [Tue, 24 Feb 2015 10:06:20 +0000 (10:06 +0000)]
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4

9 years agoMerge pull request #3739 from ilya-lavrenov:2_4_cc
Alexander Smorkalov [Tue, 24 Feb 2015 09:35:31 +0000 (09:35 +0000)]
Merge pull request #3739 from ilya-lavrenov:2_4_cc

9 years agoCast some matrix sizes to type int.
Mansour Moufid [Tue, 24 Feb 2015 04:17:27 +0000 (23:17 -0500)]
Cast some matrix sizes to type int.

9 years agoChange some vector mask types to unsigned.
Mansour Moufid [Tue, 24 Feb 2015 04:10:57 +0000 (23:10 -0500)]
Change some vector mask types to unsigned.

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.

Since we are actually interested in finding the "64" in the
triplet's operating system key, this fix makes sure to look for
"mingw64" and thus avoids the false match.

Fixes issue #3835. Credits to Lode Leroy for the original patch.

9 years agoadd fit ellipse technique notice
StevenPuttemans [Mon, 23 Feb 2015 13:59:40 +0000 (14:59 +0100)]
add fit ellipse technique notice

9 years agofixed cross-compilation for Android with CUDA
Ilya Lavrenov [Sun, 22 Feb 2015 09:42:42 +0000 (12:42 +0300)]
fixed cross-compilation for Android with CUDA

9 years agoMerge pull request #3721 from nitsch:fix-cmake-current-list-dir
Alexander Smorkalov [Sat, 21 Feb 2015 16:49:36 +0000 (16:49 +0000)]
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir

9 years agoMerge pull request #3708 from StevenPuttemans:fix_traincascade_load_message
Alexander Smorkalov [Sat, 21 Feb 2015 16:47:58 +0000 (16:47 +0000)]
Merge pull request #3708 from StevenPuttemans:fix_traincascade_load_message

9 years agoMerge pull request #3732 from StevenPuttemans:fix_4004_2.4
Alexander Smorkalov [Sat, 21 Feb 2015 16:46:41 +0000 (16:46 +0000)]
Merge pull request #3732 from StevenPuttemans:fix_4004_2.4

9 years agoExclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
Alexander Nitsch [Fri, 20 Feb 2015 18:54:14 +0000 (19:54 +0100)]
Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR

This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.

9 years agoMerge pull request #3726 from asmorkalov:ocv_version_inc4
Andrey Pavlenko [Fri, 20 Feb 2015 16:11:58 +0000 (16:11 +0000)]
Merge pull request #3726 from asmorkalov:ocv_version_inc4

9 years agoMark the libs component required
Roman Donchenko [Fri, 20 Feb 2015 15:37:21 +0000 (18:37 +0300)]
Mark the libs component required

Everything else depends on it, after all.

9 years agoAdd component display names
Roman Donchenko [Fri, 20 Feb 2015 15:20:29 +0000 (18:20 +0300)]
Add component display names

9 years agoUpdate the CPack variables to match the changes in asmorkalov/CMake#1
Roman Donchenko [Fri, 20 Feb 2015 15:15:20 +0000 (18:15 +0300)]
Update the CPack variables to match the changes in asmorkalov/CMake#1

Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.

9 years agoadd remarks for iOS tutorial
StevenPuttemans [Fri, 20 Feb 2015 13:25:14 +0000 (14:25 +0100)]
add remarks for iOS tutorial

9 years agoMerge pull request #3710 from asmorkalov:aarc64_manager_android_5
Vadim Pisarevsky [Fri, 20 Feb 2015 13:02:07 +0000 (13:02 +0000)]
Merge pull request #3710 from asmorkalov:aarc64_manager_android_5

9 years agoMerge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
Vadim Pisarevsky [Fri, 20 Feb 2015 12:32:35 +0000 (12:32 +0000)]
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac

9 years agoMerge pull request #3723 from SpecLad:run-all-tests-windows
Vadim Pisarevsky [Fri, 20 Feb 2015 12:28:15 +0000 (12:28 +0000)]
Merge pull request #3723 from SpecLad:run-all-tests-windows

9 years agoMerge pull request #3704 from SpecLad:win-install-data
Vadim Pisarevsky [Fri, 20 Feb 2015 12:27:34 +0000 (12:27 +0000)]
Merge pull request #3704 from SpecLad:win-install-data

9 years agoMerge pull request #3707 from alalek:fix_android_camera
Vadim Pisarevsky [Fri, 20 Feb 2015 12:27:13 +0000 (12:27 +0000)]
Merge pull request #3707 from alalek:fix_android_camera

9 years agoOpenCV and OpenCV Manager version++
Alexander Smorkalov [Fri, 20 Feb 2015 10:46:54 +0000 (13:46 +0300)]
OpenCV and OpenCV Manager version++

9 years agofix bug 3714 2.4 branch
StevenPuttemans [Fri, 20 Feb 2015 10:48:55 +0000 (11:48 +0100)]
fix bug 3714 2.4 branch

9 years agoBuild fix for case without TegraDetector.
Alexander Smorkalov [Fri, 20 Feb 2015 10:29:58 +0000 (13:29 +0300)]
Build fix for case without TegraDetector.

9 years agoAndroid 5 support and aarch64-related fixes for Android Manager.
Alexander Smorkalov [Tue, 17 Feb 2015 13:54:05 +0000 (16:54 +0300)]
Android 5 support and aarch64-related fixes for Android Manager.

9 years agoAdd a script to run all tests on Windows
Roman Donchenko [Fri, 20 Feb 2015 09:38:25 +0000 (12:38 +0300)]
Add a script to run all tests on Windows

It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.

9 years agoImplement CMAKE_CURRENT_LIST_DIR for older CMake
Alexander Nitsch [Thu, 19 Feb 2015 23:55:26 +0000 (00:55 +0100)]
Implement CMAKE_CURRENT_LIST_DIR for older CMake

The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.

Fixes issue #4205.

9 years agoMerge pull request #3705 from SpecLad:unused-nNull
Vadim Pisarevsky [Thu, 19 Feb 2015 18:40:22 +0000 (18:40 +0000)]
Merge pull request #3705 from SpecLad:unused-nNull

9 years agoMerge pull request #3683 from SeninAndrew:2.4
Alexander Alekhin [Wed, 18 Feb 2015 17:15:10 +0000 (17:15 +0000)]
Merge pull request #3683 from SeninAndrew:2.4

9 years agoMerge pull request #3699 from SpecLad:rm-component-install
Vadim Pisarevsky [Wed, 18 Feb 2015 13:55:06 +0000 (13:55 +0000)]
Merge pull request #3699 from SpecLad:rm-component-install

9 years agoMerge pull request #3663 from eliteraspberries:ffmpeg-dylib
Vadim Pisarevsky [Wed, 18 Feb 2015 12:50:09 +0000 (12:50 +0000)]
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib

9 years agoMerge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
Vijay Pradeep [Tue, 17 Feb 2015 18:16:44 +0000 (10:16 -0800)]
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac

9 years agoRemoving rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
Vijay Pradeep [Tue, 17 Feb 2015 17:19:22 +0000 (09:19 -0800)]
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed

9 years agofix message of preloaded parameters
StevenPuttemans [Tue, 17 Feb 2015 09:21:31 +0000 (10:21 +0100)]
fix message of preloaded parameters

9 years agoAndroid: fix JavaCameraView implementation
Alexander Alekhin [Mon, 16 Feb 2015 22:28:43 +0000 (01:28 +0300)]
Android: fix JavaCameraView implementation

1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
  a) fix eliminates processing of zero NV12 (green in RGB) first frame
  b) latest ready frame is delivered for processing (not previous)

9 years agocap_msmf.hpp: fix a warning about nNull being unused
Roman Donchenko [Mon, 16 Feb 2015 16:31:51 +0000 (19:31 +0300)]
cap_msmf.hpp: fix a warning about nNull being unused

The two functions featuring nNull are not particularly needed, so
I simply removed them.

9 years agoInstall data and test data on Windows
Roman Donchenko [Mon, 16 Feb 2015 16:24:07 +0000 (19:24 +0300)]
Install data and test data on Windows

Because why not?

9 years agoMerge pull request #3698 from SpecLad:avcodec-free-frame
Vadim Pisarevsky [Mon, 16 Feb 2015 11:33:00 +0000 (11:33 +0000)]
Merge pull request #3698 from SpecLad:avcodec-free-frame

9 years agoMerge pull request #3697 from tomi44g:2.4
Vadim Pisarevsky [Mon, 16 Feb 2015 11:28:02 +0000 (11:28 +0000)]
Merge pull request #3697 from tomi44g:2.4

9 years agoMerge pull request #3695 from SpecLad:fix-hdc-tautology
Roman Donchenko [Fri, 13 Feb 2015 14:09:07 +0000 (14:09 +0000)]
Merge pull request #3695 from SpecLad:fix-hdc-tautology

9 years agoMerge pull request #3693 from SpecLad:no-absolute-destinations
Roman Donchenko [Fri, 13 Feb 2015 14:06:54 +0000 (14:06 +0000)]
Merge pull request #3693 from SpecLad:no-absolute-destinations

9 years agoRemove useless CPACK_*_COMPONENT_INSTALL variables
Roman Donchenko [Fri, 13 Feb 2015 12:31:19 +0000 (15:31 +0300)]
Remove useless CPACK_*_COMPONENT_INSTALL variables

They don't actually do anything. And even if they did, all components are
enabled by default, anyway.

9 years agoFix a memory leak in CvCapture_FFMPEG::close
Roman Donchenko [Fri, 13 Feb 2015 12:12:52 +0000 (15:12 +0300)]
Fix a memory leak in CvCapture_FFMPEG::close

FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.

9 years agoFix iOS warnings about implicit conversion precision by changing double literals...
Thomas Gabrowski [Fri, 13 Feb 2015 00:51:03 +0000 (00:51 +0000)]
Fix iOS warnings about implicit conversion precision by changing double literals to float ones

9 years agoDon't install documentation if it isn't built
Roman Donchenko [Thu, 12 Feb 2015 13:51:26 +0000 (16:51 +0300)]
Don't install documentation if it isn't built

The HAVE_DOC_GENERATOR variable was always true.