Vadim Pisarevsky
2f2a9ad536
Merge pull request #3020 from vpisarev:ocl_disable_more_funcs
2014-07-31 12:54:13 +00:00
Vadim Pisarevsky
b0cd822924
trying to make the tests pass
2014-07-31 14:24:21 +04:00
Vadim Pisarevsky
10b60f8d16
continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way
2014-07-31 14:12:10 +04:00
Michael Pratt
52df3b232d
Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH
...
PYTHON_NUMPY_INCLUDE_PATH was a typo, it should have been
PYTHON_NUMPY_INCLUDE_DIRS.
2014-07-31 03:27:06 -04:00
Fco. Javier Delgado del Hoyo
fd10557e78
Removed cvCalcOpticalFlowBM from cudaoptflow test
2014-07-31 09:21:44 +02:00
Fco. Javier Delgado del Hoyo
8def44047a
Removed cvCalcOpticalFlowBM from performance test
2014-07-31 09:08:29 +02:00
Michael Pratt
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
Samson Yilma
4fe04775d1
Merge remote-tracking branch 'upstream/master' into HomographyDecomp
2014-07-30 20:36:41 -04:00
Samson Yilma
3b608fa489
added comment.
2014-07-30 19:32:37 -04:00
Samson Yilma
3c5eb7de84
updated documentation for decomposeHomography
2014-07-30 18:53:33 -04:00
Vadim Pisarevsky
223cdcd0ee
fixed compilation of some samples; fixed ANN_MLP::predict
2014-07-30 22:53:46 +04:00
Vadim Pisarevsky
1a1097ab23
Merge pull request #2983 from wnoise:shrink-global-cuda-usage
2014-07-30 15:55:02 +00:00
Vadim Pisarevsky
ef8647fe30
put IPP ReduceSum_32f back
2014-07-30 19:12:11 +04:00
Vadim Pisarevsky
2ab7fb6051
Merge pull request #3017 from f-morozov:akaze
2014-07-30 15:03:47 +00:00
Vadim Pisarevsky
5267ed46c7
1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F), cv::convertScaleAbs (CV_32F) and cv::reduce (SUM, CV_32F), cv::reduce (MIN & MAX), cv::flip (3-channel case).
...
2. changed the number of test loops from 1 to 30 (except for cv::pow() test, which fails for yet unknown reason)
3. disabled IPP acceleration for 3-channel norms.
4. modified relativeNorm test function to handle very small values
2014-07-30 18:19:47 +04:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
Vadim Pisarevsky
a782ee93de
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
2014-07-30 12:48:41 +00:00
Vadim Pisarevsky
e368f17caf
fixed python bindings generation
2014-07-30 16:11:08 +04:00
vbystricky
bd8894002e
Fix some problems
2014-07-30 11:56:28 +04:00
Fco. Javier Delgado del Hoyo
d3d0434f07
Removed opencv_legacy dependency from cudaoptflow
2014-07-30 09:00:23 +02:00
vbystricky
878dec65c8
Optimize OpenCL version of morfology and box filters for small filter kernels
2014-07-30 10:32:52 +04:00
Sergei Nikulov
eaec132091
#2992 : update after review
2014-07-30 00:03:41 +04:00
Vadim Pisarevsky
ba3783d205
initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed
2014-07-29 23:54:23 +04:00
Vadim Pisarevsky
dce1824a91
Merge pull request #2940 from davembradley:master
2014-07-29 17:22:30 +00:00
Vadim Pisarevsky
cf2a307832
Merge pull request #2991 from kovand11:calibrateDebevecFix
2014-07-29 16:58:32 +00:00
Andrey Pavlenko
4c8a9c5d70
Merge pull request #3012 from vpisarev:clean_objdetect
2014-07-29 15:29:35 +00:00
Vadim Pisarevsky
101769d26c
eliminated some unnecessary instructions
2014-07-29 18:10:18 +04:00
Vadim Pisarevsky
277802483f
Merge pull request #2987 from anishp:master
2014-07-28 21:15:39 +00:00
Vadim Pisarevsky
e9bed17d98
Merge pull request #3008 from jet47:fix-cudacodec-dependecies
2014-07-28 21:13:59 +00:00
siddharth
4cdc155eac
test
2014-07-29 00:15:11 +05:30
siddharth
0972a2d758
Fixed mixed cloning bug
2014-07-29 00:15:11 +05:30
siddharth
88d05a89d4
removed build error
...
Whitespaces removed
2014-07-29 00:15:11 +05:30
siddharth
1a14d8506d
recursive filter output corrected
2014-07-29 00:15:11 +05:30
siddharth
14631be59f
Updated Documentation
2014-07-29 00:15:11 +05:30
Vadim Pisarevsky
41df63aacd
Merge pull request #3010 from vpisarev:ocl_disable_some_norms2
2014-07-28 17:24:42 +00:00
Vadim Pisarevsky
a587759d76
Merge pull request #2989 from smvv:gstreamer_capture_init
2014-07-28 16:00:33 +00:00
Vadim Pisarevsky
962b519708
Merge pull request #2996 from akarsakov:ocl_dft_new_concept
2014-07-28 15:59:59 +00:00
Vadim Pisarevsky
0c749fd7e5
Merge pull request #2998 from ernest-galbrun:cuda_concurrency
2014-07-28 15:59:43 +00:00
Vadim Pisarevsky
af83884dc7
disabled ocl_minmaxloc on 32-bit data completely
2014-07-28 19:35:06 +04:00
Vadim Pisarevsky
1925fab427
disabled some more stuff
2014-07-28 19:32:06 +04:00
Vadim Pisarevsky
11e9e375a3
fixed compile warning with GCC
2014-07-28 19:23:46 +04:00
Vadim Pisarevsky
2fd01dcced
fixed doc builder warnings
2014-07-28 17:18:28 +04:00
Vadim Pisarevsky
97f6dd1820
trying to make OpenCL builder green
2014-07-28 17:16:02 +04:00
Vadim Pisarevsky
1ad9827fc4
removed ERFilter (to be moved to opencv_contrib/modules/text) and lineMOD (to be moved to opencv_contrib/modules/rgbd)
2014-07-28 16:48:53 +04:00
Vadim Pisarevsky
00263dd664
Merge pull request #2179 from adishavit:feature-SupportClipboardCopyOnWindows
2014-07-28 11:52:27 +00:00
Vadim Pisarevsky
f42bb0bd65
disable OpenCL difference norms with mask, since some of the tests fail
2014-07-28 15:45:54 +04:00
Vadim Pisarevsky
4255746c00
fixed compile warnings and removed extra whitespaces
2014-07-28 15:20:25 +04:00
Vadim Pisarevsky
1310dc4ca2
Merge pull request #2994 from znah:py_hpp_glob
2014-07-28 11:15:21 +00:00
Vadim Pisarevsky
50a1def80b
Merge pull request #3006 from smvv:fix_findContours_for_python2
2014-07-28 11:13:45 +00:00
Vadim Pisarevsky
cb492cc24d
Merge pull request #3007 from kobigurk:master
2014-07-28 11:12:14 +00:00
Vadim Pisarevsky
ef0f010437
Merge pull request #3003 from ElenaGvozdeva:ocl_sum
2014-07-28 11:08:08 +00:00
Vadim Pisarevsky
4dfb613c3e
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
2014-07-28 14:54:41 +04:00
Alexander Karsakov
fecfaf4092
Using std::map in PlanCache
2014-07-28 14:19:47 +04:00
Elena Gvozdeva
27d97aa231
fixed
2014-07-28 12:21:00 +04:00
Vladislav Vinogradov
ba706177cb
fix cudacodec module dependecies
2014-07-28 12:13:52 +04:00
Alexander Mordvintsev
586ace1873
double to float cast warning fix
2014-07-27 18:25:42 +04:00
Kobi Gurkan
6cac76bfe4
fixes tab indentation - replacing with 4 spaces
2014-07-27 17:14:54 +03:00
Kobi Gurkan
fc8f0e341b
adding support for 16-bit 4 channel tiffs
...
- when IMREAD_UNCHANGED is set in flags, the tiff is read with 4 channels
- adding test for read/write
2014-07-27 17:09:05 +03:00
Alexander Mordvintsev
5f47f70183
module blacklist
2014-07-27 18:03:27 +04:00
Alexander Mordvintsev
a2ae1db31c
'adas' extra module doesn't produce .lib on windows (causes link error)
2014-07-27 17:41:12 +04:00
Alexander Mordvintsev
9ab3b89c53
pass header list to gen2.py by a text file (avoid command line length limit on windows)
2014-07-27 17:17:36 +04:00
Alexander Mordvintsev
42ecfc5538
fixed parsing enums with tailing comma
...
gen2.py reports headers it processes
cmake file restructured
2014-07-27 17:17:35 +04:00
Alexander Mordvintsev
964657a155
glob for python module dependences
2014-07-27 17:17:35 +04:00
Alexander Mordvintsev
1d1bfd3d7d
automatic search for headers for python wrapper generation
2014-07-27 17:17:35 +04:00
Sander Mathijs van Veen
d25770ee76
Fix Python 2 bindings for findContours
...
The sanity check prevents Python 2 from calling findContours, because the
Python 2 bindings pass an empty matrix for `_contours`. If `_contours` is not
empty, the channel and depth check should determine whether the matrix is of
the correct type and size.
Note: the Python 2 bindings passes a matrix of type `STD_VECTOR_MAT` to
parameters of the type `OutputArrayOfArrays`.
2014-07-26 16:40:09 +02:00
Vadim Pisarevsky
ee90b88dd7
Merge pull request #2720 from pglotov:master
2014-07-25 12:54:22 +00:00
Vadim Pisarevsky
8e80f9b7a8
Merge pull request #1292 from adrians:neon-pull
2014-07-25 12:29:49 +00:00
Vadim Pisarevsky
603030b005
Merge pull request #2993 from vbystricky:oclopt_warp_affine
2014-07-25 11:26:24 +00:00
Elena Gvozdeva
fe29af2e58
Fixed bug in reduce.cl
2014-07-25 14:51:30 +04:00
vbystricky
e49d148d47
Optimize ocl function pyrDown
2014-07-25 13:39:19 +04:00
Alexander Karsakov
37d01e2d27
Added license header, using cv::Ptr, small fixes.
2014-07-25 13:27:00 +04:00
Adrian Stratulat
a98ce86ca3
Add NEON intrinsics to core/src/arithm.cpp
2014-07-24 19:45:32 +00:00
Alexander Karsakov
e51c0810b6
Added accuracy and performance tests for DFT all modes.
2014-07-24 15:17:31 +04:00
Alexander Karsakov
66ac46214d
Final refactoring, fixes
2014-07-24 13:23:02 +04:00
Sander Mathijs van Veen
facb2f9a81
Reset class members to NULL after gst_*_unref()
2014-07-23 19:15:16 +02:00
Sander Mathijs van Veen
f8442da945
Initialize all pointers of CvCapture_GStreamer correctly
2014-07-23 14:41:17 +02:00
Ernest Galbrun
551ab83cf2
trailing whitespace
2014-07-23 14:34:22 +02:00
Ernest Galbrun
d7038423dd
Merge branch 'master' of https://github.com/Itseez/opencv
2014-07-23 14:21:45 +02:00
Ernest Galbrun
6a769c92b3
modified default stream initialization to allow concurrent calls modified cuda surf.cuda.cpp to allow concurrent call
2014-07-23 14:21:21 +02:00
Vadim Pisarevsky
da1ac35930
Merge pull request #2990 from vbystricky:highgui_split2
2014-07-23 11:27:25 +00:00
Vadim Pisarevsky
7bd7c85b1d
Merge pull request #2919 from larshg:Openni2Support
2014-07-23 11:23:48 +00:00
Elena Gvozdeva
4fdd6de8e8
Fixed ippiDFT call
2014-07-23 13:39:31 +04:00
Alexander Karsakov
1d2cf0e20e
Added nonzero_rows support
2014-07-22 18:31:08 +04:00
Alexander Karsakov
52f76a3283
Added rest Elena's changes
2014-07-22 18:31:08 +04:00
Alexander Karsakov
7791264525
Added multi-block scheme
2014-07-22 18:31:03 +04:00
Alexander Karsakov
2b9e556055
Added Elena's changes with implemented DFT_INVERSE C2C mode.
2014-07-22 18:27:31 +04:00
Alexander Karsakov
b17bf031f6
Added DFT_SCALE for forward transforms
2014-07-22 18:27:31 +04:00
Alexander Karsakov
6c8b6bd0c7
Added packing to CCS format
2014-07-22 18:27:25 +04:00
Alexander Karsakov
ed07241f89
Completed all forward transforms.
2014-07-22 18:27:17 +04:00
Alexander Karsakov
e5a3ab3cb9
Added fftplan cache
2014-07-22 18:27:08 +04:00
Alexander Karsakov
0318d27720
Enabled precalculated wave
2014-07-22 18:26:58 +04:00
Alexander Karsakov
5dd9263848
Multi-radix with kernel generation
2014-07-22 18:25:59 +04:00
Alexander Alekhin
63a8cb594a
Merge pull request #2961 from ilya-lavrenov:tapi_corners
2014-07-22 09:38:11 +00:00
vbystricky
716218cac4
Optimize ocl version of warp_affine
2014-07-22 13:22:40 +04:00
András Kovács
d1c7983fe5
calibrateDebevec index fix (issue 3664)
2014-07-21 17:27:03 +02:00
Sergey Nikulov
9d107fb2d5
fixed test compilation
2014-07-21 19:26:26 +04:00
Sergey Nikulov
bd144cfa64
upmerged pull req #2974 to master - added more jpeg options to imgcodecs
2014-07-21 18:56:35 +04:00
vbystricky
fd51c133df
Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs
2014-07-21 15:10:41 +04:00
Alexander Alekhin
9e3124a1c9
Merge pull request #2960 from ilya-lavrenov:tapi_perf_fix
2014-07-21 09:10:24 +00:00
Anish Pednekar
d2493393db
added macro guard to enable overriding ENABLE_LOG
2014-07-20 21:06:37 +05:30