platform/upstream/opencv.git
9 years agofix performance tests in tiny mode
Vladislav Vinogradov [Fri, 6 Mar 2015 12:45:14 +0000 (15:45 +0300)]
fix performance tests in tiny mode

9 years agofix accuracy tests in tiny mode
Vladislav Vinogradov [Fri, 6 Mar 2015 10:59:08 +0000 (13:59 +0300)]
fix accuracy tests in tiny mode

9 years agoturn on stereob instantiates that required for tests
Vladislav Vinogradov [Fri, 6 Mar 2015 10:58:52 +0000 (13:58 +0300)]
turn on stereob instantiates that required for tests

9 years agoturn on some instantiates that required for other primitives
Vladislav Vinogradov [Fri, 6 Mar 2015 10:58:35 +0000 (13:58 +0300)]
turn on some instantiates that required for other primitives

9 years agofixed seg faults
Vladislav Vinogradov [Thu, 5 Mar 2015 15:38:36 +0000 (18:38 +0300)]
fixed seg faults

9 years agoreduce color instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 14:03:15 +0000 (17:03 +0300)]
reduce color instantiates for tiny build

9 years agoreduce copy_make_border instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:41:12 +0000 (16:41 +0300)]
reduce copy_make_border instantiates for tiny build

9 years agoreduce matrix_reductions instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:37:41 +0000 (16:37 +0300)]
reduce matrix_reductions instantiates for tiny build

9 years agoreduce pyramids instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:27:20 +0000 (16:27 +0300)]
reduce pyramids instantiates for tiny build

9 years agoreduce resize instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:23:30 +0000 (16:23 +0300)]
reduce resize instantiates for tiny build

9 years agoreduce remap instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:18:57 +0000 (16:18 +0300)]
reduce remap instantiates for tiny build

9 years agoreduce warp instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:15:14 +0000 (16:15 +0300)]
reduce warp instantiates for tiny build

9 years agoreduce stereobm instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:08:19 +0000 (16:08 +0300)]
reduce stereobm instantiates for tiny build

9 years agoreduce element_operations instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 13:02:54 +0000 (16:02 +0300)]
reduce element_operations instantiates for tiny build

9 years agoreduce add_weighted instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:57:18 +0000 (14:57 +0300)]
reduce add_weighted instantiates for tiny build

9 years agoreduce brute_force_matcher instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:44:52 +0000 (14:44 +0300)]
reduce brute_force_matcher instantiates for tiny build

9 years agoreduce bilateral filter instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:32:11 +0000 (14:32 +0300)]
reduce bilateral filter instantiates for tiny build

9 years agoreduce filter2d instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:24:18 +0000 (14:24 +0300)]
reduce filter2d instantiates for tiny build

9 years agoreduce separable filter instantiates for tiny build
Vladislav Vinogradov [Wed, 4 Mar 2015 11:18:49 +0000 (14:18 +0300)]
reduce separable filter instantiates for tiny build

9 years agointroduce BUILD_TINY_GPU_MODULE CMake option
Vladislav Vinogradov [Wed, 4 Mar 2015 10:38:46 +0000 (13:38 +0300)]
introduce BUILD_TINY_GPU_MODULE CMake option

it adds OPENCV_TINY_GPU_MODULE definition, that will allow
to build tiny version of gpu module (with limited image format support)

9 years agoMerge pull request #3990 from jet47:cuda-bitwise-mask
Alexander Smorkalov [Wed, 6 May 2015 12:50:08 +0000 (12:50 +0000)]
Merge pull request #3990 from jet47:cuda-bitwise-mask

9 years agoMerge pull request #3976 from SpecLad:rm-insertIframe
Alexander Smorkalov [Wed, 6 May 2015 12:47:59 +0000 (12:47 +0000)]
Merge pull request #3976 from SpecLad:rm-insertIframe

9 years agoMerge pull request #3989 from asmorkalov:as/tbb_dep
Alexander Smorkalov [Wed, 6 May 2015 12:47:41 +0000 (12:47 +0000)]
Merge pull request #3989 from asmorkalov:as/tbb_dep

9 years agoBug #4315 : fix CUDA bitwise operations with mask
Vladislav Vinogradov [Wed, 6 May 2015 10:28:08 +0000 (13:28 +0300)]
Bug #4315 : fix CUDA bitwise operations with mask

9 years agoAdded explicit deb package dependency from libtbb-dev if TBB is enabled.
Alexander Smorkalov [Wed, 6 May 2015 10:10:39 +0000 (13:10 +0300)]
Added explicit deb package dependency from libtbb-dev if TBB is enabled.

9 years agoMerge pull request #3969 from Dikay900:master_to_2_4
Maksim Shabunin [Mon, 4 May 2015 10:13:44 +0000 (10:13 +0000)]
Merge pull request #3969 from Dikay900:master_to_2_4

9 years agoRemove insertIframe.js
Roman Donchenko [Thu, 30 Apr 2015 12:26:40 +0000 (15:26 +0300)]
Remove insertIframe.js

It hasn't been used since f82c04f. Also, the line adding the script had
an unneeded pathto call, so the script was being loaded from the wrong path
anyway.

9 years agoFix typo
Belev [Mon, 27 Apr 2015 08:10:47 +0000 (11:10 +0300)]
Fix typo

Fixed difference in the given arguments to the ellipse function and the description after that

Fixed two more typos

Replaced unnecessary the with to

Conflicts:
doc/tutorials/core/adding_images/adding_images.markdown
doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.markdown
doc/tutorials/core/random_generator_and_text/random_generator_and_text.markdown
modules/imgproc/include/opencv2/imgproc.hpp

9 years agoMerge pull request #3961 from apavlenko:2.4_fix_polylines_empty
Andrey Pavlenko [Tue, 28 Apr 2015 16:22:31 +0000 (16:22 +0000)]
Merge pull request #3961 from apavlenko:2.4_fix_polylines_empty

9 years agoAdd example data types for calibrateCamera call
Martin Ueding [Thu, 23 Apr 2015 11:30:14 +0000 (13:30 +0200)]
Add example data types for calibrateCamera call

It took me a while to figure out what was meant with

    OpenCV Error: Assertion failed (i < 0) in getMat

While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/)
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.

After I fixed that, I got the next error message:

    OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
    collectCalibrationData, file
    /build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
    line 3193

The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.

In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.

Conflicts:
modules/calib3d/include/opencv2/calib3d.hpp

9 years agoMerge pull request #3946 from zjulujia:bugfix_for_hog_detectMultiScale_with_weights
Vadim Pisarevsky [Tue, 28 Apr 2015 10:54:45 +0000 (10:54 +0000)]
Merge pull request #3946 from zjulujia:bugfix_for_hog_detectMultiScale_with_weights

9 years agoMerge pull request #3959 from jet47:gpu-fixes
Vadim Pisarevsky [Tue, 28 Apr 2015 10:49:05 +0000 (10:49 +0000)]
Merge pull request #3959 from jet47:gpu-fixes

9 years agoMerge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
Vadim Pisarevsky [Tue, 28 Apr 2015 10:48:33 +0000 (10:48 +0000)]
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes

9 years agoMerge pull request #3965 from Dikay900:2_4_diff_to_master_2
Vadim Pisarevsky [Tue, 28 Apr 2015 10:47:05 +0000 (10:47 +0000)]
Merge pull request #3965 from Dikay900:2_4_diff_to_master_2

9 years agoMerge pull request #3963 from Dikay900:2_4_diff_to_master
Vadim Pisarevsky [Tue, 28 Apr 2015 10:41:42 +0000 (10:41 +0000)]
Merge pull request #3963 from Dikay900:2_4_diff_to_master

9 years agoFix a typo error
Pierre Moulon [Fri, 14 Feb 2014 11:21:35 +0000 (12:21 +0100)]
Fix a typo error

Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp

9 years agoAdded call to clone() to avoid unexpected change to external data.
Adi Shavit [Thu, 3 Jul 2014 19:14:58 +0000 (22:14 +0300)]
Added call to clone() to avoid unexpected change to external data.
- Fix both stitching_detailed.cpp sample and cv::Stitcher.

9 years agofix qt example on 2.4 with vs2010 and higher
Dikay900 [Sat, 25 Apr 2015 12:31:50 +0000 (14:31 +0200)]
fix qt example on 2.4 with vs2010 and higher

9 years agoadd input paramter checking that verifies the existance of the input files to stero_m...
Brian Park [Wed, 22 Oct 2014 05:47:49 +0000 (22:47 -0700)]
add input paramter checking that verifies the existance of the input files to stero_match example

remove the unnecessary header file

check input paramter by checking the image size

9 years agoAct on INSTALL_PYTHON_EXAMPLES
Chris Mayo [Tue, 30 Dec 2014 10:13:10 +0000 (10:13 +0000)]
Act on INSTALL_PYTHON_EXAMPLES

Conflicts:
samples/CMakeLists.txt

9 years agostore user-provided data in PlaneTracker class
Ben Hagen [Mon, 19 Jan 2015 20:51:19 +0000 (21:51 +0100)]
store user-provided data in PlaneTracker class

9 years agoENH: explicitly declared outputFilename to surpress error C2668
Yang Fan [Tue, 14 Apr 2015 05:39:00 +0000 (13:39 +0800)]
ENH: explicitly declared outputFilename to surpress error C2668

Conflicts:
samples/gpu/video_writer.cpp

9 years agoAdded suuport for finding Intel TBB for Visual Studio 2013
Abhijit Kundu [Mon, 28 Apr 2014 11:23:49 +0000 (07:23 -0400)]
Added suuport for finding Intel TBB for Visual Studio 2013

9 years agosquashed #3729
Simon Heinen [Fri, 20 Feb 2015 11:54:54 +0000 (12:54 +0100)]
squashed #3729

Update android+AsyncServiceHelper.java

Update android+AsyncServiceHelper.java

changed tabs in last commit to spaces

Update android+AsyncServiceHelper.java

small formatting fixes

9 years agoadded support for uncompressed parameters to tiff image format as described here...
Eric Sommerlade [Mon, 23 Feb 2015 13:12:42 +0000 (06:12 -0700)]
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html

Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp

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 agofindcontour_example check image empty
ttagu99 [Tue, 14 Apr 2015 01:01:53 +0000 (10:01 +0900)]
findcontour_example check image empty

9 years agoUpdate MatchTemplate_Demo.cpp
侯骥 [Wed, 11 Jun 2014 08:29:30 +0000 (10:29 +0200)]
Update MatchTemplate_Demo.cpp

9 years agoFix typo
Jay Bosamiya [Sat, 17 Jan 2015 17:23:30 +0000 (22:53 +0530)]
Fix typo

9 years agoUpdate lkdemo.cpp because of memory leak
RafaRuiz [Tue, 24 Mar 2015 09:06:55 +0000 (09:06 +0000)]
Update lkdemo.cpp because of memory leak

In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250

9 years agoFixed typo
Pastafarianist [Sun, 21 Apr 2013 19:04:54 +0000 (23:04 +0400)]
Fixed typo

9 years agouse constant instead of value backported from #785
Dikay900 [Fri, 24 Apr 2015 17:52:28 +0000 (19:52 +0200)]
use constant instead of value backported from #785

9 years agofilename correction from #3217
Dikay900 [Fri, 24 Apr 2015 17:07:57 +0000 (19:07 +0200)]
filename correction from #3217

9 years agosquashed #823
Kevin Hughes [Wed, 17 Apr 2013 17:20:32 +0000 (13:20 -0400)]
squashed #823
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface

Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp

starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error

starter_video.cpp hid local functions

9 years agoFix typo in error for extrinsic parameters
Maximilien Cuony [Wed, 17 Sep 2014 07:32:19 +0000 (09:32 +0200)]
Fix typo in error for extrinsic parameters

9 years agoupdate openni sample comments referring #81
Dikay900 [Fri, 24 Apr 2015 16:15:50 +0000 (18:15 +0200)]
update openni sample comments referring #81

9 years agoadding test for `polylines()` call with empty Point-s vector and fix for crash in...
Andrey Pavlenko [Fri, 24 Apr 2015 13:40:14 +0000 (16:40 +0300)]
adding test for `polylines()` call with empty Point-s vector and fix for crash in this case

9 years agofixed tests for aarch64
Ilya Lavrenov [Fri, 24 Apr 2015 09:20:54 +0000 (12:20 +0300)]
fixed tests for aarch64

9 years agodisable several heavy performance tests
Vladislav Vinogradov [Thu, 23 Apr 2015 16:09:03 +0000 (19:09 +0300)]
disable several heavy performance tests

9 years agodisable Video_PyrLKOpticalFlowDense performance test
Vladislav Vinogradov [Thu, 23 Apr 2015 16:08:40 +0000 (19:08 +0300)]
disable Video_PyrLKOpticalFlowDense performance test

sanity fails on Maxwell and CUDA 7.0 due to unknow reason

9 years agouse border extrapolation for central pixel in pyrDown
Vladislav Vinogradov [Thu, 23 Apr 2015 09:44:09 +0000 (12:44 +0300)]
use border extrapolation for central pixel in pyrDown

in case if image has odd dimension

9 years agofix racecheck warning in scanRows kernel
Vladislav Vinogradov [Thu, 23 Apr 2015 09:43:17 +0000 (12:43 +0300)]
fix racecheck warning in scanRows kernel

9 years agoincrease epsilon for solvePnPRansac function
Vladislav Vinogradov [Thu, 23 Apr 2015 09:43:31 +0000 (12:43 +0300)]
increase epsilon for solvePnPRansac function

9 years agoMerge pull request #3956 from ilya-lavrenov:cuda_aarch64
Vadim Pisarevsky [Thu, 23 Apr 2015 13:49:33 +0000 (13:49 +0000)]
Merge pull request #3956 from ilya-lavrenov:cuda_aarch64

9 years agoMerge pull request #3953 from ilya-lavrenov:cuda_unused
Vadim Pisarevsky [Thu, 23 Apr 2015 12:26:07 +0000 (12:26 +0000)]
Merge pull request #3953 from ilya-lavrenov:cuda_unused

9 years agofixed find cuda for aarch64
Ilya Lavrenov [Thu, 23 Apr 2015 11:29:37 +0000 (14:29 +0300)]
fixed find cuda for aarch64

9 years agormeoved unused functions
Ilya Lavrenov [Thu, 23 Apr 2015 09:48:31 +0000 (12:48 +0300)]
rmeoved unused functions

9 years agoMerge pull request #3949 from ilya-lavrenov:clobbered_warning
Vadim Pisarevsky [Wed, 22 Apr 2015 19:07:46 +0000 (19:07 +0000)]
Merge pull request #3949 from ilya-lavrenov:clobbered_warning

9 years agosuppress -Wclobbered warning
Ilya Lavrenov [Wed, 22 Apr 2015 13:42:03 +0000 (16:42 +0300)]
suppress -Wclobbered warning

9 years agobugfix_for_hog_detectMultiScale_with_weights
lujia [Tue, 21 Apr 2015 06:32:27 +0000 (02:32 -0400)]
bugfix_for_hog_detectMultiScale_with_weights

9 years agoMerge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4
Vadim Pisarevsky [Mon, 20 Apr 2015 19:47:55 +0000 (19:47 +0000)]
Merge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4

9 years agoMerge pull request #3924 from jet47:gpu-fixes
Alexander Smorkalov [Sun, 19 Apr 2015 11:04:54 +0000 (11:04 +0000)]
Merge pull request #3924 from jet47:gpu-fixes

9 years agocompleting and fixing gen_pattern.py for 2.4 branch
S. Garrido [Sat, 18 Apr 2015 20:13:22 +0000 (22:13 +0200)]
completing and fixing gen_pattern.py for 2.4 branch

9 years agoincrease epsilons for some sanity tests
Vladislav Vinogradov [Tue, 14 Apr 2015 07:12:56 +0000 (10:12 +0300)]
increase epsilons for some sanity tests

9 years agoMerge pull request #3923 from ilya-lavrenov:typo
Alexander Alekhin [Mon, 13 Apr 2015 16:57:12 +0000 (16:57 +0000)]
Merge pull request #3923 from ilya-lavrenov:typo

9 years agofix BruteForceMatcher resource distribution
Vladislav Vinogradov [Mon, 13 Apr 2015 14:12:04 +0000 (17:12 +0300)]
fix BruteForceMatcher resource distribution

added launch bounds attributes for all CUDA kernels

9 years agomake NVIDIA tests verbose by default
Vladislav Vinogradov [Mon, 13 Apr 2015 14:11:19 +0000 (17:11 +0300)]
make NVIDIA tests verbose by default

9 years agofixed a bug in scanRows CUDA kernel (part of nppStIntegral)
Vladislav Vinogradov [Mon, 13 Apr 2015 14:09:59 +0000 (17:09 +0300)]
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)

uninitialized value

9 years agoMerge pull request #3908 from jet47:gpu-wrap-border-mode
Vadim Pisarevsky [Tue, 7 Apr 2015 11:44:51 +0000 (11:44 +0000)]
Merge pull request #3908 from jet47:gpu-wrap-border-mode

9 years agofix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
Vladislav Vinogradov [Tue, 7 Apr 2015 10:04:31 +0000 (13:04 +0300)]
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture

9 years agoMerge pull request #3898 from greensea:2.4
Vadim Pisarevsky [Tue, 7 Apr 2015 09:31:36 +0000 (09:31 +0000)]
Merge pull request #3898 from greensea:2.4

9 years agotypo
Ilya Lavrenov [Tue, 7 Apr 2015 08:08:21 +0000 (11:08 +0300)]
typo

9 years agoFix a segment fault issue in cascade classfier
greensea [Thu, 2 Apr 2015 03:20:57 +0000 (11:20 +0800)]
Fix a segment fault issue in cascade classfier

9 years agoMerge pull request #3904 from SeninAndrew:2.4
Vadim Pisarevsky [Sun, 5 Apr 2015 18:00:29 +0000 (18:00 +0000)]
Merge pull request #3904 from SeninAndrew:2.4

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

9 years agoMerge pull request #3900 from apavlenko:doc_fix_imwrite
Vadim Pisarevsky [Fri, 3 Apr 2015 13:25:59 +0000 (13:25 +0000)]
Merge pull request #3900 from apavlenko:doc_fix_imwrite

9 years agoMerge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4
Vadim Pisarevsky [Fri, 3 Apr 2015 11:44:55 +0000 (11:44 +0000)]
Merge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4

9 years agofixing confusing variable naming in a sample code
Andrey Pavlenko [Fri, 3 Apr 2015 10:54:49 +0000 (13:54 +0300)]
fixing confusing variable naming in a sample code

9 years agoadd the possibility to add traincascade accuracy
StevenPuttemans [Fri, 3 Apr 2015 07:39:23 +0000 (09:39 +0200)]
add the possibility to add traincascade accuracy

9 years agoMerge pull request #3770 from jet47:gpu-hog-tests
Vadim Pisarevsky [Fri, 3 Apr 2015 10:32:59 +0000 (10:32 +0000)]
Merge pull request #3770 from jet47:gpu-hog-tests

9 years agoMerge pull request #3893 from SpecLad:cuda-imported-targets
Alexander Smorkalov [Thu, 2 Apr 2015 13:56:31 +0000 (13:56 +0000)]
Merge pull request #3893 from SpecLad:cuda-imported-targets

9 years agoMerge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives
Vadim Pisarevsky [Wed, 1 Apr 2015 13:56:29 +0000 (13:56 +0000)]
Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives

9 years agoMerge pull request #3852 from renko:multithread_cl_not_studio_generator
Vadim Pisarevsky [Wed, 1 Apr 2015 13:25:39 +0000 (13:25 +0000)]
Merge pull request #3852 from renko:multithread_cl_not_studio_generator

9 years agoNot block PDB file in multithreaded build on Windows.
Vladimir Kolesnikov [Wed, 1 Apr 2015 10:52:07 +0000 (13:52 +0300)]
Not block PDB file in multithreaded build on Windows.

If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.

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 #3886 from beahacker:2.4
Vadim Pisarevsky [Mon, 30 Mar 2015 09:09:31 +0000 (09:09 +0000)]
Merge pull request #3886 from beahacker:2.4

9 years agofix bug 4269
howtobeahacker [Sun, 29 Mar 2015 16:01:20 +0000 (00:01 +0800)]
fix bug 4269

9 years agoMerge pull request #3855 from polarfuchs99:2.4
Vadim Pisarevsky [Thu, 26 Mar 2015 16:55:29 +0000 (16:55 +0000)]
Merge pull request #3855 from polarfuchs99:2.4