Andrey Kamaev
1d3219747a
Merge pull request #633 from jet47:gpu-debayer-gray
2013-03-11 21:15:00 +04:00
Andrey Kamaev
632211eb27
Merge pull request #630 from asmorkalov:android_view_stretch
2013-03-11 21:14:43 +04:00
Andrey Kamaev
980fc93b4d
Fix clang + ccache build warnings
2013-03-11 18:41:22 +04:00
Vladislav Vinogradov
4ddf634c30
gpu : implement Bayer* -> Gray color conversion
2013-03-11 15:41:50 +04:00
Andrey Kamaev
ec8637a990
Fix build errors
2013-03-11 14:52:22 +04:00
peng xiao
34998b6034
Add ocl::SURF accurate test.
...
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9
remove the OpenCL define
2013-03-11 17:21:31 +08:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
yao
7f0d6d42f0
fix mismatch on NV OCL and some AMD GPUs
2013-03-08 10:30:01 +08:00
Andrey Kamaev
13f402a554
Merge pull request #620 from apavlenko:java_tutorial_fix
2013-03-06 15:47:09 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
bbac4bc4cf
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
2013-03-05 15:26:16 +04:00
yao
65bb4250a4
Fix a bug in addWeighted x64 mode
...
And a potential problem in remap
2013-03-01 18:08:53 +08:00
Vadim Pisarevsky
a910360689
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
2013-03-01 10:55:11 +04:00
yao
82b9854837
fix compile warnings
2013-03-01 08:47:20 +08:00
Andrey Kamaev
c865b28243
Merge pull request #591 from jet47:gpu-sanity-tests
2013-02-28 18:08:11 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Kamaev
fba0e6fc5c
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
2013-02-28 18:06:28 +04:00
Andrey Kamaev
4811988caf
Merge pull request #585 from bitwangyaoyao:2.4_SURF
2013-02-28 18:06:14 +04:00
Andrey Pavlenko
d18b2c2502
patch -> revision
2013-02-28 17:19:52 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Vladislav Vinogradov
f533f0dca9
fixed gpu sanity tests
2013-02-28 16:54:37 +04:00
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +04:00
Andrey Kamaev
d0e340bc80
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
2013-02-28 15:43:51 +04:00
yao
f12369a53c
Fix ocl::HOG crash on Intel OCL
2013-02-28 16:56:39 +08:00
Andrey Kamaev
831580ef31
Merge pull request #578 from jet47:nmake-ffmpeg-copy
2013-02-28 12:56:26 +04:00
cuda-geek
0771fd82c0
Merge pull request #557 from jet47:gpu-sanity
2013-02-28 11:17:12 +04:00
yao
f791344810
linux warning fix
2013-02-28 14:37:37 +08:00
yao
504008dbe0
Fix ocl::bruteforcematcher crash on Intel OCL
2013-02-28 14:31:08 +08:00
Vladislav Vinogradov
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04:00
yao
7c1f1d8837
fix bug #2787
2013-02-28 14:05:36 +08:00
yao
69eebdd608
fix the blend crash in some cases
2013-02-28 09:03:10 +08:00
Andrey Kamaev
a5d2253be8
Merge pull request #544 from AnnaKogan8:added-regressions-only-option
2013-02-28 00:38:47 +04:00
Andrey Kamaev
0a8711d76b
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
2013-02-27 19:33:54 +04:00
Andrey Kamaev
af13c8604d
Merge pull request #568 from bitwangyaoyao:2.4_moments
2013-02-27 19:33:26 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
cuda-geek
5d43ce853e
Merge pull request #559 from jet47:gpu-hough-circles
2013-02-27 12:29:45 +04:00
Andrey Kamaev
1a82ceac9c
Merge pull request #563 from taka-no-me:perf_classify_speedups
2013-02-27 11:37:18 +04:00
Andrey Kamaev
b836e3c65b
Merge pull request #556 from bitwangyaoyao:2.4_SURF
2013-02-27 11:37:04 +04:00
Andrey Kamaev
f03c04c151
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
2013-02-27 11:36:40 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
dba2ec0539
remove the compile warnings
2013-02-27 14:53:27 +08:00
yao
6df23428af
Add moments function
2013-02-27 13:45:16 +08:00
yao
9ec5333a9b
pyrlk also take advantages of cl_image support detection
2013-02-27 10:45:07 +08:00
yao
da47ccec9c
Put the cl_image support detection in utils
2013-02-27 10:24:03 +08:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
cuda-geek
0e5255d4fb
Merge pull request #561 from asmorkalov:android_tutorial_2_4_4_update
2013-02-26 19:58:34 +04:00
Andrey Pavlenko
1c1c3c29c3
fixing eclipse import errors
2013-02-26 19:52:59 +04:00
Andrey Kamaev
4d2c864bea
Add option --with-score to summary.py to automatically classify speedups
...
Legend for new column is:
* FASTER - strong speedup
* faster - spedup is detected but it is unreliable
* <empty> - no change in speed
* slower - slowdown is detected but it is unreliable
* SLOWER - strong slowdown
2013-02-26 19:42:51 +04:00
Andrey Kamaev
f6dd3651ea
Merge pull request #552 from taka-no-me:fix_invert
2013-02-26 18:31:30 +04:00
Andrey Kamaev
dcf7a69430
Merge pull request #555 from bitwangyaoyao:2.4_fixFft
2013-02-26 18:31:17 +04:00
yao
04faaa9e35
Fix ocl::dft the compile warning on Linux
2013-02-26 21:18:51 +08:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
yao
3ff5689fe5
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
2013-02-26 20:30:42 +08:00
Vladislav Vinogradov
10402c8a85
fixed gpu HoughCircles test
2013-02-26 16:10:35 +04:00
Vladislav Vinogradov
c9868fc01f
fixed warp tests
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
4f7cfbc26e
fixed gpu bitwise operations with scalars
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
a138e12a26
refactored gpu perf tests and fixed sanity tests
2013-02-26 13:53:38 +04:00
yao
ea433cc496
remove the device specific logic
2013-02-26 17:53:08 +08:00
yao
62f8b0fc48
Fix ocl::dft error when program end on Linux
2013-02-26 17:44:19 +08:00
yao
0ac7f0d374
Simplify the bind texture logic of interpolate frame function
2013-02-26 17:12:03 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Andrey Kamaev
ab221e94c0
Fix invert under MSVC
2013-02-26 11:16:57 +04:00
Anna Kogan
a9b1c5db78
Added --regressions-only=X-FACTOR option
2013-02-26 11:09:17 +04:00
Andrey Kamaev
0d12f451be
Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm
2013-02-26 01:00:55 +04:00
Vadim Pisarevsky
416432a8e5
replaced tabs with spaces
2013-02-25 23:10:38 +04:00
Vadim Pisarevsky
087537463d
attempt to make the ultimate fix for the failure in Core_Invert.small
2013-02-25 22:46:30 +04:00
Vadim Pisarevsky
25bbcba0ea
fixed Core_MulSpectrums failure
2013-02-25 22:02:24 +04:00
Daniil Osokin
cf5e272878
Added multithreaded implementation for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Daniil Osokin
d8f538d67b
Added tests for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
LeonidBeynenson
41dc829341
Made changes to avoid warnings (Windows compilation).
2013-02-25 15:38:59 +04:00
Andrey Kamaev
6082f351ab
Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
2013-02-25 14:04:02 +04:00
Andrey Kamaev
b6cdc849db
Merge pull request #540 from hgaspar:244
2013-02-25 14:03:36 +04:00
yao
59ebf4ed9f
Fix the ocl::cvtColor mismatch on some devices
2013-02-25 15:19:39 +08:00
hgaspar
60981565fa
updated the ocl module introduction
2013-02-24 22:34:44 -05:00
Daniil Osokin
7255ede3af
Added implementation for RGB to YUV420p color conversion
2013-02-24 23:07:05 +04:00
Andrey Kamaev
cfd019e2a2
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
2013-02-24 15:26:42 +04:00
Andrey Kamaev
7047c23489
Merge pull request #535 from bitwangyaoyao:2.4_clean
2013-02-24 15:26:24 +04:00
yao
f1a5c1328c
remove the empty implementation when HAVE_OPENCL not defined
2013-02-23 20:50:03 +08:00
yao
b7ebedc23e
fix mismatch of WarpAffine
2013-02-23 17:43:10 +08:00
yao
9bbf170054
some cleanup
2013-02-23 15:34:43 +08:00
yao
720eaf1e1a
fix the haar kernel problems on Nvidia and Intel OCL
2013-02-23 15:19:46 +08:00
yao
d050159f07
Remove the perf running from ocl::matchTemplate accuracy tests
2013-02-23 14:30:04 +08:00
Andrey Kamaev
051aa4cb98
Merge pull request #530 from bitwangyaoyao:2.4_fixEqHist
2013-02-22 16:40:06 +04:00
Andrey Kamaev
58f546dd93
Merge pull request #529 from bitwangyaoyao:2.4_fixGemm
2013-02-22 16:39:50 +04:00
Andrey Kamaev
3406832aa2
Merge pull request #528 from bitwangyaoyao:2.4_fixPyrLK
2013-02-22 16:35:30 +04:00
Andrey Kamaev
b1975fb13d
Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
2013-02-22 16:35:18 +04:00
Andrey Kamaev
e68901bbce
Merge pull request #523 from taka-no-me:fix_2815
2013-02-22 16:34:28 +04:00
Andrey Kamaev
7cd4edd695
Merge pull request #518 from asmorkalov:ts_refactor
2013-02-22 16:34:14 +04:00
yao
1a488c0542
fix the warning on Linux when OpenCL 1.2 not supported
2013-02-22 18:33:16 +08:00
yao
7810254198
Fix ocl::equalizeHist mismatch
2013-02-22 15:48:31 +08:00
yao
3316d0bfb2
Fix the compiling errors of gemm on Linux
2013-02-22 15:05:49 +08:00
yao
2e3f4fdada
fix pyrLK's mismatch on Linux
2013-02-22 11:23:43 +08:00
yao
f4ef0c1598
fix meanShift mismatch on none-double GPUs
2013-02-22 10:13:20 +08:00
Andrey Kamaev
c17e9ef7ba
Repair binary compatibility of ocl module
2013-02-22 01:58:01 +04:00
Andrey Kamaev
995154d10d
Fix binary compatibility of gpu module
2013-02-22 00:14:58 +04:00
LeonidBeynenson
bfb644ac04
Changed error message in Algorithm::get.
2013-02-21 20:10:42 +04:00
LeonidBeynenson
e7b214b6d2
Removed urequired functions
2013-02-21 19:49:37 +04:00
Andrey Kamaev
eda2a76ee9
Merge pull request #520 from jet47:gpu-updates
2013-02-21 18:03:06 +04:00
gferry
e3803f9985
fix for OpenCV issue #2815
...
- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values
2013-02-21 17:37:24 +04:00
Andrey Kamaev
f0dce1fa35
Merge pull request #521 from asmorkalov:2.4.4_preparation
2013-02-21 17:25:21 +04:00
Vladislav Vinogradov
73ffd71a22
Fixed documentation build
2013-02-21 17:06:53 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Alexander Smorkalov
9f39c8eaa1
OpenCV 2.4.4 preparation
...
Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.
2013-02-21 14:42:28 +04:00
Andrey Kamaev
16461247ce
Merge pull request #498 from asmorkalov:doc_ptr
2013-02-21 13:30:34 +04:00
Vladislav Vinogradov
21f95a3b11
restored source compatibility
2013-02-21 12:38:12 +04:00
Andrey Kamaev
d4e7bec29a
Merge pull request #440 from AnnaKogan8:fixed-perfomance-tests
2013-02-21 12:29:57 +04:00
Andrey Kamaev
decf04dfec
Merge pull request #512 from jet47:core-gpu-updates
2013-02-21 12:22:04 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Alexander
4091eab45e
cv::Ptr description extended.
2013-02-21 12:14:42 +04:00
Alexander Smorkalov
e21a1d3124
Test system refactoring
...
cmpEps replaced on cmpEps2 to reduce code dublication;
Constants for cmpEps return values added.
2013-02-21 12:07:04 +04:00
Vladislav Vinogradov
ce2559b332
optimized DeviceInfo class and ensureSizeIsEnough
2013-02-20 19:30:57 +04:00
Anna Kogan
f6e0d327b0
Increased time limits
2013-02-20 17:34:00 +04:00
Anna Kogan
a567c03fdf
Switched to TEST_CYCLE_MULTIRUN for fast tests
2013-02-20 17:05:54 +04:00
yao
429ae44ae3
add openCLExecuteKernelInterop method
2013-02-20 17:46:43 +08:00
Andrey Kamaev
5691fd3abe
Merge pull request #503 from taka-no-me:fix_docs
2013-02-19 18:01:51 +04:00
Andrey Kamaev
5cc2a6bdbf
Merge pull request #500 from nielsgm:predict_python_wrapper_to_docs
2013-02-19 18:01:30 +04:00
Andrey Kamaev
afa8e4e645
Merge pull request #492 from taka-no-me:fix_warnings_gcov
2013-02-19 18:01:06 +04:00
Andrey Kamaev
2fe7482b73
Add support for enums into rst ocv domain
2013-02-19 16:22:20 +04:00
Andrey Kamaev
ff7b604a25
Fix several inconsistent declarations identified by check_doc2 script
2013-02-19 16:22:20 +04:00
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
2bbb777d95
Fix warnings about missing parent for class members
2013-02-19 11:49:05 +04:00
Niels Gerlif Myrtue
7697d79d93
Added the predict_all function wrapper for python that was missing from the documentation
...
Copied the docstring description
2013-02-19 13:11:30 +11:00
Andrey Kamaev
39baa2237e
Merge pull request #499 from vpisarev:zeroelem_fix
2013-02-18 18:05:02 +04:00
Andrey Kamaev
c6f6f9ab35
Merge pull request #451 from bitwangyaoyao:2.4_operator
2013-02-18 18:04:44 +04:00
Vadim Pisarevsky
a1c7e0368c
fixed problem reported by Thouis (Ray) Jones
2013-02-18 17:01:21 +04:00
yao
9613135e8d
fix compiling errors on Linux
...
more operators use oclMatExpr
2013-02-16 18:41:43 +08:00
yao
69fd2d8273
add oclMatExpr class to prevent extra allocations
2013-02-16 11:05:23 +08:00
Andrey Kamaev
3ead4449ad
Fix several warnings about uninitialized variables from gcov build
2013-02-15 17:28:23 +04:00
Andrey Kamaev
f58dffe31f
Merge pull request #401 from Daniil-Osokin:bugfix_doc_setNumThreads
2013-02-14 19:07:41 +04:00
Daniil Osokin
5f32e0e24d
Rewrote doc for set-get number of threads functionality with support new frameworks (bug #2064 )
2013-02-14 17:11:16 +04:00
Daniil Osokin
6deda2531c
Fixed getNumThreads() for C=
2013-02-14 17:07:36 +04:00
Vladislav Vinogradov
78c924baad
removed obsolete CARMA toolchain and CMake variable
2013-02-14 16:27:17 +04:00
Andrey Kamaev
37c6357b97
Merge pull request #485 from jet47:gpu-new-functionality
2013-02-14 16:00:55 +04:00
Vladislav Vinogradov
a3a09cf4d1
refactored OpticalFlowDual_TVL1:
...
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
Andrey Kamaev
8547984d29
Merge pull request #486 from amroamroamro:2.4
2013-02-14 11:21:16 +04:00
Andrey Kamaev
37e2664cf0
Merge pull request #479 from ilya-lavrenov:TestHighGUI
2013-02-14 11:21:01 +04:00
Amro
42a2cb0a38
add description of ddepth param of cv::boxFilter
...
bug #2709
2013-02-13 15:16:17 +03:00
Vladislav Vinogradov
2181a41a07
added perf4au app
2013-02-13 15:58:24 +04:00
Vladislav Vinogradov
50f28c9e25
added Warp::reduce function
2013-02-13 15:57:55 +04:00
Vladislav Vinogradov
36e42084f0
added gpu BM optical flow implementation
2013-02-13 15:57:40 +04:00
Vladislav Vinogradov
fe2e89df1b
added gpu::HoughLinesP function
2013-02-13 15:56:58 +04:00
Vladislav Vinogradov
86bd325131
added gpu::normalize function
2013-02-13 15:55:58 +04:00
Vladislav Vinogradov
61b54149b1
added mask support to gpu norm and sum
2013-02-13 15:54:50 +04:00
Vladislav Vinogradov
08914aa708
added gpu compare with scalar
2013-02-13 15:53:03 +04:00