profile/ivi/opencv.git
10 years agoBuild both Python 2 and Python 3 bindings
Michael Pratt [Sun, 29 Jun 2014 20:45:24 +0000 (16:45 -0400)]
Build both Python 2 and Python 3 bindings

If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process.  Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.

The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python.  Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3.  Both are built from the same source. but for different
versions of Python.

10 years agoMerge pull request #2852 from ilya-lavrenov:tapi_abs
Alexander Alekhin [Fri, 27 Jun 2014 08:21:06 +0000 (08:21 +0000)]
Merge pull request #2852 from ilya-lavrenov:tapi_abs

10 years agoMerge pull request #2626 from KayKwon:matlab_formatter
Roman Donchenko [Thu, 26 Jun 2014 13:40:25 +0000 (17:40 +0400)]
Merge pull request #2626 from KayKwon:matlab_formatter

10 years agoMerge pull request #2672 from a-wi:findContours
Roman Donchenko [Thu, 26 Jun 2014 13:35:07 +0000 (17:35 +0400)]
Merge pull request #2672 from a-wi:findContours

10 years agoMerge pull request #2774 from 23pointsNorth:lsd-nfa-fix
Roman Donchenko [Thu, 26 Jun 2014 13:29:25 +0000 (17:29 +0400)]
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix

10 years agoMerge pull request #2858 from 23pointsNorth:patch-3
Roman Donchenko [Thu, 26 Jun 2014 13:24:24 +0000 (17:24 +0400)]
Merge pull request #2858 from 23pointsNorth:patch-3

10 years agoMerge pull request #2824 from abidrahmank:pylsd
Roman Donchenko [Thu, 26 Jun 2014 13:22:53 +0000 (17:22 +0400)]
Merge pull request #2824 from abidrahmank:pylsd

10 years agoMerge pull request #2894 from vpisarev:cleanup_project_tree1
Andrey Pavlenko [Wed, 25 Jun 2014 17:12:20 +0000 (17:12 +0000)]
Merge pull request #2894 from vpisarev:cleanup_project_tree1

10 years agofixed some more compile warnings on Windows
Vadim Pisarevsky [Wed, 25 Jun 2014 16:22:56 +0000 (20:22 +0400)]
fixed some more compile warnings on Windows

10 years agofixed compile warnings on Windows
Vadim Pisarevsky [Wed, 25 Jun 2014 12:17:52 +0000 (16:17 +0400)]
fixed compile warnings on Windows

10 years agoremoved extra whitespaces
Vadim Pisarevsky [Tue, 24 Jun 2014 19:05:24 +0000 (23:05 +0400)]
removed extra whitespaces

10 years agoput the detection-based tracker back (to objdetect module), so that the Android face...
Vadim Pisarevsky [Tue, 24 Jun 2014 17:16:09 +0000 (21:16 +0400)]
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.

10 years agoMerge pull request #2881 from mlyashko:moments_opt
Alexander Alekhin [Tue, 24 Jun 2014 16:19:52 +0000 (16:19 +0000)]
Merge pull request #2881 from mlyashko:moments_opt

10 years agoMerge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate
Alexander Alekhin [Tue, 24 Jun 2014 16:12:42 +0000 (16:12 +0000)]
Merge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate

10 years agoremoved contrib, legacy and softcsscade modules; removed latentsvm and datamatrix...
Vadim Pisarevsky [Tue, 24 Jun 2014 15:18:51 +0000 (19:18 +0400)]
removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.
some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.

10 years agoMerge pull request #2892 from PhilLab:patch-1
Vadim Pisarevsky [Tue, 24 Jun 2014 11:52:36 +0000 (11:52 +0000)]
Merge pull request #2892 from PhilLab:patch-1

10 years agoUpdates python feature matching tutorial
PhilLab [Tue, 24 Jun 2014 09:35:22 +0000 (11:35 +0200)]
Updates python feature matching tutorial

The given ORB parameter was misspelled

10 years agoMerge pull request #2887 from ilya-lavrenov:ipp_morph_fix
Alexander Alekhin [Mon, 23 Jun 2014 14:27:10 +0000 (14:27 +0000)]
Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix

10 years agoMerge pull request #2874 from vbystricky:ocl_LUTAMDfix
Alexander Alekhin [Mon, 23 Jun 2014 14:23:26 +0000 (14:23 +0000)]
Merge pull request #2874 from vbystricky:ocl_LUTAMDfix

10 years agoadded 32s to 32u conversion
Ilya Lavrenov [Wed, 11 Jun 2014 15:30:10 +0000 (19:30 +0400)]
added 32s to 32u conversion

10 years agoFixed core for CCORR and SQDIFF. Used float instead of int for CV_8U. Fixed condition...
Elena Gvozdeva [Tue, 10 Jun 2014 06:37:51 +0000 (10:37 +0400)]
Fixed core for CCORR and SQDIFF. Used float instead of int for CV_8U. Fixed conditions for call dft.

10 years agoreplaced factors computation by precomputed values, added kernel for
mlyashko [Fri, 20 Jun 2014 07:55:17 +0000 (11:55 +0400)]
replaced factors computation by precomputed values, added kernel for
binary mode

10 years agoadded extra condition
Ilya Lavrenov [Sun, 22 Jun 2014 15:18:14 +0000 (19:18 +0400)]
added extra condition

10 years agoMerge pull request #2790 from akarsakov:ocl_pyrUp_unroll
Alexander Alekhin [Fri, 20 Jun 2014 13:49:14 +0000 (13:49 +0000)]
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll

10 years agoMerge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
Alexander Alekhin [Fri, 20 Jun 2014 08:49:36 +0000 (08:49 +0000)]
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test

10 years agoMerge pull request #2864 from ilya-lavrenov:tapi_boxfilter
Alexander Alekhin [Fri, 20 Jun 2014 08:47:51 +0000 (08:47 +0000)]
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter

10 years agoMerge pull request #2847 from ilya-lavrenov:tapi_pow
Alexander Alekhin [Fri, 20 Jun 2014 08:47:18 +0000 (08:47 +0000)]
Merge pull request #2847 from ilya-lavrenov:tapi_pow

10 years agoMerge pull request #2840 from ilya-lavrenov:tapi_calchist
Alexander Alekhin [Fri, 20 Jun 2014 08:46:32 +0000 (08:46 +0000)]
Merge pull request #2840 from ilya-lavrenov:tapi_calchist

10 years agoIncrease epsilon for pass sanity check
vbystricky [Thu, 19 Jun 2014 14:52:25 +0000 (18:52 +0400)]
Increase epsilon for pass sanity check

10 years agoFix error
vbystricky [Thu, 19 Jun 2014 14:09:23 +0000 (18:09 +0400)]
Fix error

10 years agoChange threshold
vbystricky [Thu, 19 Jun 2014 13:45:04 +0000 (17:45 +0400)]
Change threshold

10 years agoAdd peromance tests for OCL integral sum of square
vbystricky [Thu, 19 Jun 2014 13:07:09 +0000 (17:07 +0400)]
Add peromance tests for OCL integral sum of square

10 years agoMerge pull request #2832 from BRAINSia:20140605_Upstream
Roman Donchenko [Thu, 19 Jun 2014 07:57:51 +0000 (11:57 +0400)]
Merge pull request #2832 from BRAINSia:20140605_Upstream

10 years agoMerge pull request #2863 from apavlenko:disable_cuda_stubs_defaults
Andrey Pavlenko [Wed, 18 Jun 2014 12:13:13 +0000 (16:13 +0400)]
Merge pull request #2863 from apavlenko:disable_cuda_stubs_defaults

10 years agoChange uchar2 to short
vbystricky [Wed, 18 Jun 2014 11:44:56 +0000 (15:44 +0400)]
Change uchar2 to short

10 years agoMove some variables into #ifdef
vbystricky [Wed, 18 Jun 2014 11:03:09 +0000 (15:03 +0400)]
Move some variables into #ifdef

10 years agoCOMP: Fix problem with narrowing in c++11
Hans Johnson [Thu, 5 Jun 2014 15:14:56 +0000 (10:14 -0500)]
COMP: Fix problem with narrowing in c++11

modules/core/src/arithm.cpp:345:51:
error: constant expression evaluates to 4294967295 which cannot be narrowed to type 'int' [-Wc++11-narrowing]
static int CV_DECL_ALIGNED(16) v64f_absmask[] = { 0xffffffff, 0x7fffffff, 0xffffffff, 0x7fffffff };
                                                  ^~~~~~~~~~

Converted to unsigned int.  This variable is only used to initialize a bit pattern anywhy for a 128bit type.

10 years agoMerge pull request #2871 from vbystricky:oclopt_integral
Alexander Alekhin [Tue, 17 Jun 2014 14:23:31 +0000 (18:23 +0400)]
Merge pull request #2871 from vbystricky:oclopt_integral

10 years agoRemoved storing of zeros in local memory
Alexander Karsakov [Wed, 11 Jun 2014 11:15:15 +0000 (15:15 +0400)]
Removed storing of zeros in local memory

10 years agoused vector data types for CCORR cn==1
Elena Gvozdeva [Fri, 6 Jun 2014 12:53:52 +0000 (16:53 +0400)]
used vector data types for CCORR cn==1

10 years agoadded dft for CCORR
Elena Gvozdeva [Thu, 5 Jun 2014 13:21:25 +0000 (17:21 +0400)]
added dft for CCORR

10 years agochanged CCOEFF cn==1
Elena Gvozdeva [Thu, 29 May 2014 10:49:33 +0000 (14:49 +0400)]
changed CCOEFF cn==1

10 years agochanged support for 3-channels, changed CCOEFF
Elena Gvozdeva [Wed, 21 May 2014 07:54:53 +0000 (11:54 +0400)]
changed support for 3-channels, changed CCOEFF

10 years agoMerge pull request #2854 from ilya-lavrenov:tapi_filter2d
Alexander Alekhin [Tue, 17 Jun 2014 12:59:00 +0000 (16:59 +0400)]
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d

10 years agoMerge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
Alexander Alekhin [Tue, 17 Jun 2014 10:37:51 +0000 (14:37 +0400)]
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn

10 years agoFix pointer conversion
vbystricky [Mon, 16 Jun 2014 14:14:05 +0000 (18:14 +0400)]
Fix pointer conversion

10 years agoSmall refactoring
vbystricky [Mon, 16 Jun 2014 13:17:16 +0000 (17:17 +0400)]
Small refactoring

10 years agooptimized cv::boxFilter
Ilya Lavrenov [Thu, 12 Jun 2014 10:30:50 +0000 (14:30 +0400)]
optimized cv::boxFilter

10 years agofixed usage of reshape
Ilya Lavrenov [Thu, 12 Jun 2014 10:07:04 +0000 (14:07 +0400)]
fixed usage of reshape

10 years agoJoin kernel code for int and float destination types
vbystricky [Mon, 16 Jun 2014 11:08:15 +0000 (15:08 +0400)]
Join kernel code for int and float destination types

10 years agoMerge pull request #2865 from ilya-lavrenov:morph
Alexander Alekhin [Mon, 16 Jun 2014 09:35:56 +0000 (13:35 +0400)]
Merge pull request #2865 from ilya-lavrenov:morph

10 years agoMerge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
Alexander Alekhin [Mon, 16 Jun 2014 09:22:03 +0000 (13:22 +0400)]
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix

10 years agoRemove pre_invalid parameter
vbystricky [Mon, 16 Jun 2014 09:07:39 +0000 (13:07 +0400)]
Remove pre_invalid parameter

10 years agoinvoking OCL before IPP
Ilya Lavrenov [Mon, 16 Jun 2014 08:33:13 +0000 (12:33 +0400)]
invoking OCL before IPP

10 years agoDon't build CUDA modules stubs by default (use `-DBUILD_CUDA_STUBS=ON` if need them)
Andrey Pavlenko [Mon, 16 Jun 2014 07:18:52 +0000 (11:18 +0400)]
Don't build CUDA modules stubs by default (use `-DBUILD_CUDA_STUBS=ON` if need them)

10 years agoRemoved "CV_" prefix from constants in docs
Daniel Angelov [Sat, 14 Jun 2014 17:41:04 +0000 (18:41 +0100)]
Removed "CV_" prefix from constants in docs

The `calib3d.hpp` has a definition of the constant that does not contain the prefix "CV_".
The affected methods were `findHomography` and `findEssentialMat`.
Now the documentation updates the definition of the constants to conform to the header.

10 years agoMerge pull request #2783 from daferna2:master
Vadim Pisarevsky [Thu, 12 Jun 2014 17:41:28 +0000 (21:41 +0400)]
Merge pull request #2783 from daferna2:master

10 years agoMerge pull request #2784 from saree90:bugfix_Simplex
Vadim Pisarevsky [Thu, 12 Jun 2014 17:41:09 +0000 (21:41 +0400)]
Merge pull request #2784 from saree90:bugfix_Simplex

10 years agoMerge pull request #2799 from 23pointsNorth:patch-1
Vadim Pisarevsky [Thu, 12 Jun 2014 17:40:53 +0000 (21:40 +0400)]
Merge pull request #2799 from 23pointsNorth:patch-1

10 years agoMerge pull request #2828 from otsedom:updating_and_adding_haarcascades_mcs
Vadim Pisarevsky [Thu, 12 Jun 2014 17:39:49 +0000 (21:39 +0400)]
Merge pull request #2828 from otsedom:updating_and_adding_haarcascades_mcs

10 years agoMerge pull request #2845 from shaibagon:patch-1
Vadim Pisarevsky [Thu, 12 Jun 2014 17:38:55 +0000 (21:38 +0400)]
Merge pull request #2845 from shaibagon:patch-1

10 years agoMerge pull request #2850 from Sekunde:master
Vadim Pisarevsky [Thu, 12 Jun 2014 17:38:41 +0000 (21:38 +0400)]
Merge pull request #2850 from Sekunde:master

10 years agofixed cv::warpPerspective
Ilya Lavrenov [Thu, 12 Jun 2014 11:15:59 +0000 (15:15 +0400)]
fixed cv::warpPerspective

10 years agoused abs in reduction operations
Ilya Lavrenov [Wed, 11 Jun 2014 14:54:43 +0000 (18:54 +0400)]
used abs in reduction operations

10 years agoused abs
Ilya Lavrenov [Wed, 11 Jun 2014 14:30:48 +0000 (18:30 +0400)]
used abs

10 years agoused built-in functions
Ilya Lavrenov [Tue, 10 Jun 2014 13:11:08 +0000 (17:11 +0400)]
used built-in functions

10 years agoMerge pull request #2823 from ilya-lavrenov:tapi_warpaffine
Alexander Alekhin [Wed, 11 Jun 2014 10:41:29 +0000 (14:41 +0400)]
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine

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

10 years agoAdded support for 3-channels
Elena Gvozdeva [Wed, 21 May 2014 07:54:53 +0000 (11:54 +0400)]
Added support for 3-channels

10 years agoChanging #include to generic video.hpp
Daniel Fernandes [Wed, 11 Jun 2014 07:00:21 +0000 (02:00 -0500)]
Changing #include to generic video.hpp

Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590

10 years agoMerge pull request #2837 from ilya-lavrenov:tapi_norm_relative
Alexander Alekhin [Tue, 10 Jun 2014 18:21:09 +0000 (22:21 +0400)]
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative

10 years agocv::equalizeHist
Ilya Lavrenov [Tue, 10 Jun 2014 11:48:42 +0000 (15:48 +0400)]
cv::equalizeHist

10 years agoMerge pull request #2844 from ilya-lavrenov:tapi_perf_pow
Alexander Alekhin [Tue, 10 Jun 2014 15:32:03 +0000 (19:32 +0400)]
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow

10 years agooptimized histogram merging
Ilya Lavrenov [Mon, 9 Jun 2014 15:58:45 +0000 (19:58 +0400)]
optimized histogram merging

10 years agoeliminated convertTo
Ilya Lavrenov [Mon, 9 Jun 2014 15:45:37 +0000 (19:45 +0400)]
eliminated convertTo

10 years agooptimized cv::calcHist
Ilya Lavrenov [Mon, 9 Jun 2014 13:07:11 +0000 (17:07 +0400)]
optimized cv::calcHist

10 years agoMerge pull request #2839 from ilya-lavrenov:tapi_fix
Alexander Alekhin [Tue, 10 Jun 2014 15:30:26 +0000 (19:30 +0400)]
Merge pull request #2839 from ilya-lavrenov:tapi_fix

10 years agoMerge pull request #2835 from ilya-lavrenov:defects
Alexander Alekhin [Tue, 10 Jun 2014 15:29:46 +0000 (19:29 +0400)]
Merge pull request #2835 from ilya-lavrenov:defects

10 years agosome optimizaions of cv::pow
Ilya Lavrenov [Tue, 10 Jun 2014 14:34:50 +0000 (18:34 +0400)]
some optimizaions of cv::pow

10 years agoUpdate global_motion.cpp
Shai [Tue, 10 Jun 2014 14:31:18 +0000 (17:31 +0300)]
Update global_motion.cpp

An extremely rare case where, for numeric reasons bestM finds more inliers than ninliersMax.
This RARE case causes memory corruption and a nasty seg fault.

10 years agochanged power in cv::pow test to test actual kernel
Ilya Lavrenov [Tue, 10 Jun 2014 13:25:31 +0000 (17:25 +0400)]
changed power in cv::pow test to test actual kernel

10 years agofixed defects found by coverity scan
Ilya Lavrenov [Fri, 6 Jun 2014 15:29:51 +0000 (19:29 +0400)]
fixed defects found by coverity scan

10 years agoMerge pull request #2841 from SpecLad:merge-2.4
Roman Donchenko [Tue, 10 Jun 2014 07:50:12 +0000 (11:50 +0400)]
Merge pull request #2841 from SpecLad:merge-2.4

10 years agoMerge pull request #2838 from ilya-lavrenov:tapi_warnings
Alexander Alekhin [Mon, 9 Jun 2014 16:25:28 +0000 (20:25 +0400)]
Merge pull request #2838 from ilya-lavrenov:tapi_warnings

10 years agoadded norm_inf support to minmaxloc kernel
Ilya Lavrenov [Mon, 9 Jun 2014 11:32:35 +0000 (15:32 +0400)]
added norm_inf support to minmaxloc kernel

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 9 Jun 2014 14:03:03 +0000 (18:03 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/contrib/src/spinimages.cpp

10 years agobixed cv::boxFilter
Ilya Lavrenov [Mon, 9 Jun 2014 13:09:44 +0000 (17:09 +0400)]
bixed cv::boxFilter

10 years agofixed possible runtime error
Ilya Lavrenov [Mon, 9 Jun 2014 12:48:59 +0000 (16:48 +0400)]
fixed possible runtime error

10 years agoMerge pull request #2813 from 23pointsNorth:patch-2
Roman Donchenko [Mon, 9 Jun 2014 11:58:24 +0000 (15:58 +0400)]
Merge pull request #2813 from 23pointsNorth:patch-2

10 years agofixed warnings
Ilya Lavrenov [Mon, 9 Jun 2014 11:54:10 +0000 (15:54 +0400)]
fixed warnings

10 years agoMerge pull request #2817 from bf:patch-1
Roman Donchenko [Mon, 9 Jun 2014 11:06:06 +0000 (15:06 +0400)]
Merge pull request #2817 from bf:patch-1

10 years agoMerge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Roman Donchenko [Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)]
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4

10 years agoMerge pull request #2822 from timedia:akaze-java
Roman Donchenko [Mon, 9 Jun 2014 10:27:51 +0000 (14:27 +0400)]
Merge pull request #2822 from timedia:akaze-java

10 years agoMerge pull request #2831 from alalek:android_examples
Roman Donchenko [Mon, 9 Jun 2014 10:26:31 +0000 (14:26 +0400)]
Merge pull request #2831 from alalek:android_examples

10 years agoMerge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Roman Donchenko [Mon, 9 Jun 2014 09:37:38 +0000 (13:37 +0400)]
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial

10 years agofixes
Ilya Lavrenov [Sun, 8 Jun 2014 20:50:14 +0000 (00:50 +0400)]
fixes

10 years agooptimized cv::norm with NORM_RELATIVE
Ilya Lavrenov [Sat, 7 Jun 2014 16:53:20 +0000 (20:53 +0400)]
optimized cv::norm with NORM_RELATIVE

10 years agooptimized cv::norm with 2 args
Ilya Lavrenov [Sat, 7 Jun 2014 11:51:41 +0000 (15:51 +0400)]
optimized cv::norm with 2 args

10 years agofixed calculation method of "cv::TickMeter"
atinfinity [Fri, 6 Jun 2014 22:29:22 +0000 (07:29 +0900)]
fixed calculation method of "cv::TickMeter"

10 years agooptimized cv::norm with NORM_INF
Ilya Lavrenov [Fri, 6 Jun 2014 13:15:19 +0000 (17:15 +0400)]
optimized cv::norm with NORM_INF