Alexander Smorkalov
ca40a749b6
Turn off superres accuracy tests if video i/o is not supported.
2014-10-01 09:15:24 +04:00
Ilya Lavrenov
6f05a250be
optimization of cv::CLAHE (~3x)
2014-09-30 12:40:11 -07:00
Ilya Lavrenov
af6a64d76b
cv::accumulate functions
2014-09-30 11:07:45 -07:00
Roman Donchenko
d54d580f79
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
2014-09-30 15:55:26 +00:00
Ilya Lavrenov
be3efdf274
cv::sum refactoring
2014-09-30 14:36:21 +00:00
Ilya Lavrenov
a3e56114d1
cv::multiply
2014-09-30 14:20:22 +00:00
Alexander Alekhin
7e8846b81e
Merge pull request #3223 from vbystricky:oclopt_BgSubMOG2
2014-09-30 13:39:20 +00:00
Alexander Smorkalov
71c4e96e17
Test fisheye.rectify disabled for Tegra.
2014-09-30 14:49:33 +04:00
Alexander Alekhin
4d63362206
Merge pull request #3278 from akarsakov:ocl_houghlines_perf_test
2014-09-30 10:49:14 +00:00
StevenPuttemans
60fd5c2a3a
fixing dependencies
2014-09-30 11:53:46 +02:00
Alexander Smorkalov
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
2014-09-30 13:35:19 +04:00
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00
Alexander Smorkalov
a0431acb37
OpenCV Manager version++.
2014-09-30 12:05:46 +04:00
Ilya Lavrenov
81548a30aa
cv::medianBLur
2014-09-30 07:59:33 +00:00
Alexander Karsakov
4880dd0cd6
Added performance test for OCL version of HoughLines and HoughLinesP
2014-09-30 11:03:54 +04:00
Adrien BAK
037f27c882
change masking to patchNaNs
2014-09-30 14:58:40 +09:00
Adrien BAK
2411556242
fix photo::cloning::IlluminationChange when IPP is used
2014-09-30 14:28:44 +09:00
Artur Wieczorek
e3f1d722e7
Remove ATL dependency from MSMF capture code
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-09-30 01:35:59 +02:00
Ilya Lavrenov
8e1ccfae3d
cv::boxFilter
2014-09-29 13:54:31 -07:00
Ilya Lavrenov
1c491c42cd
fix for cornerHarris
2014-09-29 14:59:46 +00:00
Alexander Karsakov
eaf5a163b1
Added HoughLinesP OCL implementation
2014-09-29 16:48:16 +04:00
Maksim Shabunin
a160158cb3
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
2014-09-29 12:07:22 +00:00
Alexander Karsakov
3695a31606
Combined counter and corner buffers into one
2014-09-29 11:10:57 +04:00
Artur Wieczorek
34533dc569
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-29 00:39:35 +02:00
Artur Wieczorek
655b22e050
Fixed CMake issue with FFMPEG videoio configuration
2014-09-29 00:39:05 +02:00
Ilya Lavrenov
bbc161e1cb
fix for cv::Mat::convertTo with scale
2014-09-28 14:51:30 -07:00
Ilya Lavrenov
f50f0ba63e
cv::norm
2014-09-28 07:28:33 -07:00
Ilya Lavrenov
44ea50f1c4
cv::countNonZero
2014-09-28 07:06:53 -07:00
Ilya Lavrenov
34a571d37f
cv::Mat::dot
2014-09-28 05:00:22 -07:00
Ilya Lavrenov
e46332a183
cv::Mat::convertTo with scale and shift
2014-09-28 03:49:56 -07:00
Ilya Lavrenov
74e60e44ad
cv::compare
2014-09-28 02:41:08 -07:00
Ilya Lavrenov
857a2d5bfd
cv::addWeighted
2014-09-28 01:11:07 -07:00
abidrahmank
797143d515
extending stitching module for Java and Python bindings
2014-09-27 19:35:49 +04:00
Vadim Pisarevsky
e6f653af44
Merge pull request #3269 from asmorkalov:ocv_gstreamer3
2014-09-27 15:25:20 +00:00
Vadim Pisarevsky
f187fd99da
Merge pull request #3271 from mgeorg:reset_ffmpeg_mutex
2014-09-27 13:09:24 +00:00
Vadim Pisarevsky
01a883df0c
Merge pull request #3267 from a-wi:MSMF_capture_fixes_v3
2014-09-27 13:07:12 +00:00
Vadim Pisarevsky
6a53cb9307
Merge pull request #3266 from mshabunin:arm_warning
2014-09-27 13:06:44 +00:00
Vadim Pisarevsky
1920232268
Merge pull request #3260 from a-wi:MSMF_file_error
2014-09-27 13:06:18 +00:00
Manfred Georg
7f4eb4f6c6
set ffmpeg mutex to NULL on destruction.
...
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423
Cherry picked from head (file has moved but issue is the same).
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
2014-09-26 10:19:34 -07:00
Manfred Georg
8d95c91805
set ffmpeg mutex to NULL on destruction.
2014-09-26 09:44:25 -07:00
Ilya Lavrenov
d090fcf2fe
cv::moments (CV_8UC1)
2014-09-26 14:39:04 +00:00
Ilya Lavrenov
09fbc78a97
cv::threshold
2014-09-26 13:16:48 +00:00
Ilya Lavrenov
b4fc87c380
cv::remap
2014-09-26 10:35:28 +00:00
Ilya Lavrenov
6377f5a458
fixed warps accuracy tests
2014-09-26 09:41:46 +00:00
Ilya Lavrenov
4dd6148646
cv::resize 16uc1
2014-09-26 09:41:46 +00:00
Ilya Lavrenov
c0b702a994
cv::resize area 2x
2014-09-26 09:41:45 +00:00
Ilya Lavrenov
12001a42f9
corners
2014-09-26 09:41:45 +00:00
Ilya Lavrenov
d30ce2b9ac
canny
2014-09-26 09:41:45 +00:00
Maksim Shabunin
047abb0050
Merge pull request #3258 from ilya-lavrenov:neon_convert
2014-09-26 09:27:16 +00:00
Dinar Ahmatnurov
de6edcc48a
fixing issue with "ёЁ";
2014-09-26 11:32:14 +04:00
Alexander Smorkalov
23456d67e5
Added test on CAP_PROP_FRAMECOUNT option for cv::VideoCapture
2014-09-26 10:50:22 +04:00
Alexander Smorkalov
15251056ba
Fixed compatibility with GStreamer 1.x
2014-09-26 10:45:08 +04:00
Alexander Smorkalov
cc6e6aa028
Fixed query of basic VideoCapture properties. Added tests for them.
2014-09-25 14:40:54 +04:00
Artur Wieczorek
302b138aa7
CMake configuration for MSMF capture
...
Applied in PR3247 to 2.4 branch.
2014-09-25 12:05:54 +02:00
Artur Wieczorek
b91bd6716c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
...
Applied in PR3260 to 2.4 branch
2014-09-25 11:54:15 +02:00
Artur Wieczorek
8f334b4e41
Fixed assertion warning in MSMF frame grabber
...
Applied in PR3251 to 2.4 branch
2014-09-25 11:51:31 +02:00
Artur Wieczorek
7c00b17085
Fixed MSMF video capture initialization
...
Applied in PR3251 to 2.4 branch.
2014-09-25 11:49:31 +02:00
Artur Wieczorek
25cf51637d
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
...
Applied in PR3243 to 2.4 branch.
2014-09-25 11:45:11 +02:00
Artur Wieczorek
6ad3427426
Fixed compilation errors under VS 2010 and Win 7
...
Applied in PR3240 to 2.4 branch.
2014-09-25 11:43:13 +02:00
Maksim Shabunin
e88a36621e
Fixed warning during cross compile for ARM
2014-09-25 12:27:48 +04:00
Ilya Lavrenov
345b1369be
correct neon rounding
2014-09-25 07:54:52 +00:00
Dinar Ahmatnurov
e9f7c4aeba
added Cyrillic;
...
added Cyrillic;
replace binary format with hex;
move duplicated code to inline function;
2014-09-25 11:15:20 +04:00
Vadim Pisarevsky
467f5fc90f
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
2014-09-24 17:03:08 +00:00
Vadim Pisarevsky
120594163f
Merge pull request #3249 from mshabunin:java_wrap
2014-09-24 16:58:56 +00:00
Vadim Pisarevsky
541b627d21
Merge pull request #3257 from Atanahel:gbt_bugfix_master
2014-09-24 12:25:18 +00:00
Artur Wieczorek
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-24 02:11:59 +02:00
Artur Wieczorek
073a7ff95a
Fixed CMake issue with FFMPEG highgui configuration
...
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
2014-09-23 23:46:03 +02:00
Artur Wieczorek
5bf1a4c08c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
2014-09-23 20:21:53 +02:00
Ilya Lavrenov
5d018c090f
Neon optimization of cv::scaleAdd (CV_32F)
2014-09-23 21:16:29 +04:00
Ilya Lavrenov
4b3f2c1972
Neon optimization of Mat::convertTo
2014-09-23 15:06:17 +00:00
Benoit Seguin
450734cc32
Correction of the integer data treated as floating point data bug, already corrected in the 2.4 branch.
2014-09-23 14:03:20 +02:00
Vadim Pisarevsky
ecbec7235f
Merge pull request #3253 from asmorkalov:ocv_gstreamer2
2014-09-23 11:51:25 +00:00
bhack
32f6e1a554
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
...
Taken from 3f07655231
2014-09-23 12:39:16 +02:00
Alexander Smorkalov
0518455163
More accurate selection of color space conversion element for GStreamer 1.x
2014-09-23 14:18:44 +04:00
Alexander Smorkalov
aa57634213
Fixed compatibility with GStreamer 1.x.
2014-09-23 14:04:53 +04:00
Vadim Pisarevsky
7752483486
Merge pull request #3252 from GravityJack:point-division
2014-09-23 08:43:43 +00:00
Vadim Pisarevsky
10bbcca11e
Merge pull request #3251 from a-wi:MSMF_camera_errors
2014-09-23 08:42:57 +00:00
Alexander Smorkalov
a419b64347
Fixed GStreamer encoding pipeline frame drop for most cases.
...
For several muxers and encoders GStreamer still drops the last frame.
2014-09-23 12:31:51 +04:00
Vadim Pisarevsky
19b3aab23f
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
2014-09-23 07:19:38 +00:00
Vadim Pisarevsky
df28bb5ccd
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
2014-09-23 07:18:01 +00:00
Vadim Pisarevsky
281ce441a8
Merge pull request #3250 from ilya-lavrenov:neon_convert_scale_abs
2014-09-23 07:15:24 +00:00
vbystricky
a75807354d
Optimize OpenCL version function BackgroundSubstractionMOG2
2014-09-23 10:33:30 +04:00
StevenPuttemans
d4ec359f11
Fixing errors
2014-09-22 22:12:27 +02:00
Marc Rollins
c8ede7c9ea
Updating documentation to reflect division operations.
2014-09-22 12:07:16 -07:00
Marc Rollins
f32a6fb9a1
Adding element-wise division operators to Point3_ class.
2014-09-22 11:59:11 -07:00
Marc Rollins
fb9bbf99c4
Adding division operators to Point_ class.
...
Performs element-wise division.
2014-09-22 11:54:52 -07:00
Artur Wieczorek
3603102c89
Fixed assertion warning in MSMF frame grabber
2014-09-22 19:38:04 +02:00
Artur Wieczorek
a615102947
Fixed MSMF video capture initialization
2014-09-22 19:35:36 +02:00
Ilya Lavrenov
515be70867
Neon optimization of cv::convertScaleAbs
2014-09-22 15:47:46 +00:00
Vadim Pisarevsky
9c91d0103f
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
2014-09-22 15:31:09 +00:00
StevenPuttemans
03662c0589
fix blobdetector
2014-09-22 13:58:45 +02:00
Ilya Lavrenov
27b933ba5a
Neon optimization of cv::sum
2014-09-22 09:22:03 +00:00
Maksim Shabunin
0d7b44db50
Java wrappers now support nested namespaces and classes
...
- wrapper support python3
- added wrapper log
- generating full name for nested namespaces and classes
2014-09-22 11:47:03 +04:00
Maksim Shabunin
6337fd0650
Support of bioinspired contrib module wrapping
...
- added java wrapper
- disabled python wrapper
2014-09-22 11:43:29 +04:00
Artur Wieczorek
7c354c14f7
CMake configuration for MSMF capture
2014-09-21 21:03:41 +02:00
Artur Wieczorek
d2ba09e6ff
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
2014-09-19 22:46:09 +02:00
Tom Stellard
934394c5e2
ocl: Don't use 'inline' attribute on functions
...
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
2014-09-19 16:13:57 -04:00
Vadim Pisarevsky
6c3cadbd73
Merge pull request #3240 from a-wi:MSMF_compilation_errors
2014-09-19 17:36:13 +00:00
Vadim Pisarevsky
4dda2002f6
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
2014-09-19 17:35:07 +00:00
Artur Wieczorek
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
WilhelmHannemann
150487feda
Bugfix brute_force_match.cl (see http://code.opencv.org/issues/2837 ): wrong results for non-float descriptors in OpenCL BruteForceMatcher
2014-09-19 16:41:54 +02:00
Vadim Pisarevsky
3516e14e05
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
...
use different fix for the problem, embedded right into the BFMatcher.
2014-09-19 15:31:21 +04:00
E Braun
d82b918a7b
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
f60726b090
Revert "fix for bug 3172"
...
This reverts commit ed2cdb71e5
2014-09-19 14:47:43 +04:00
E Braun
1675b23a64
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
aa9da6e433
regression test for bug 3172
2014-09-19 14:47:43 +04:00
Maksim Shabunin
2992e3a1b6
Fixed android test detection and some spaces in CMakeLists.txt
2014-09-19 13:11:59 +04:00
Maksim Shabunin
cff5e3ee88
Changed java tests detection procedure
2014-09-19 12:34:42 +04:00
Juan Carlos Niebles
0c988f00bc
Merge github.com:Itseez/opencv
2014-09-18 12:00:28 -05:00
Juan Carlos Niebles
dc49e11527
removed setter methods, replaced by CV_PROP_RW macro
2014-09-18 09:39:35 -05:00
Vadim Pisarevsky
d1afa0e370
Merge pull request #3234 from vpisarev:fixed_photo_test_failure
2014-09-18 13:06:54 +00:00
Vadim Pisarevsky
1578dd1027
Merge pull request #2702 from GregoryMorse:patch-3
2014-09-18 12:38:54 +00:00
Vadim Pisarevsky
06e55ddf38
Merge pull request #2893 from ilya-lavrenov:tapi_vector_width_intel
2014-09-18 12:05:24 +00:00
Benoit Seguin
084835ec30
Fixing a line where integer data was treated as floating point data.
2014-09-18 14:03:13 +02:00
Vadim Pisarevsky
470f427a95
Merge pull request #3232 from Chuanbo-Weng:master
2014-09-18 11:48:29 +00:00
Vadim Pisarevsky
aa6ba149bc
make sure ptr<> is called with proper parameter, otherwise the assertion fails
2014-09-18 15:47:59 +04:00
Juan Carlos Niebles
f610c88103
extended python interface for KalmanFilter
2014-09-17 18:45:48 -05:00
Vadim Pisarevsky
ccaedaedc8
Merge pull request #2047 from GregoryMorse:patch-4
2014-09-17 12:48:45 +00:00
Vadim Pisarevsky
458bde5e24
Merge pull request #3180 from mshabunin:java_ptr_support
2014-09-17 12:07:43 +00:00
Vadim Pisarevsky
3bc174f1bb
Merge pull request #3230 from znah:ipp_median_fix
2014-09-17 12:06:32 +00:00
Chuanbo Weng
c5552788c5
Use vload to read unaligned data instead of dereference operator.
...
According to opencl 1.2 spec 6.1.5:
For arguments to a __kernel function declared to be a pointer to a
data type, the OpenCL compiler can assume that the pointee is always
appropriately aligned as required by the data type. The behavior of
an unaligned load or store is undefined, except for the
vloadn, vload_halfn, vstoren, and vstore_halfn functions defined in
section 6.12.7.
Original code read data of type T from address not aligned by multiple
of sizeof(T), so the result is incorrect. With this patch, the cases
./opencv_perf_imgproc
--gtest_filter=OCL_ImgSize_TmplSize_Method_MatType_MatchTemplate.MatchTemplate/*
could work well with beignet 0.9.3.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-09-17 19:28:07 +08:00
Vadim Pisarevsky
c5de129c36
Merge pull request #3222 from dmitrygribanov:dg/2.4-stitching-wave-correction-bugfix
2014-09-17 10:54:02 +00:00
Vadim Pisarevsky
533dd85299
Merge pull request #3225 from jormansa:bug_#3631
2014-09-17 10:40:42 +00:00
Vadim Pisarevsky
4a0364ded5
Merge pull request #3220 from asmorkalov:ocv_gstreamer
2014-09-17 09:55:49 +00:00
Vadim Pisarevsky
d14d4bc110
Merge pull request #3215 from dmitrygribanov:dg/stitching-wave-correction-bugfix
2014-09-17 09:52:34 +00:00
Vadim Pisarevsky
550bd24ca8
Merge pull request #3226 from whoshuu:patch-1
2014-09-17 09:52:01 +00:00
Alexander Mordvintsev
0319120adc
fix: ippiFilterMedianBorder sometimes crash when doing in-place filtering
2014-09-17 13:26:39 +04:00
Philipp Hasper
bac492fff6
Doc: Fixing indentation
2014-09-17 09:30:19 +02:00
Philipp Hasper
68fe45b594
Doc: Fixing indentation
2014-09-17 09:29:17 +02:00
Huu Nguyen
81b9be1623
Fix implicit narrowing error in initializer list
...
The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: narrowing conversion of 'PyInt_AsLong(((PyObject*)o))' from 'long int' to 'double' inside { }".
Tested on Clang 5.1.0 and Mac OS X 10.9.4.
2014-09-16 15:30:10 -07:00
Alexander Alekhin
4689426a91
Merge pull request #3208 from vbystricky:oclopt_Filter2D
2014-09-16 13:03:45 +00:00
Alexander Smorkalov
38887e6ea9
Code review fixes.
2014-09-16 14:52:41 +04:00
jormansa
1d2d579bd6
bug fixed
2014-09-15 18:09:44 +02:00
Andrey Pavlenko
80687c8a56
Merge pull request #3219 from mshabunin:png_iccp_strip_24
2014-09-15 13:54:19 +00:00
Dmitry Gribanov
8a1d3929cc
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-15 17:04:08 +04:00
Alexander Smorkalov
343f4b3026
OpenCV version++.
2014-09-15 14:55:25 +04:00
Alexander Smorkalov
3ea8be7292
Several fixes for GStreamer support in OpenCV
...
- Accurate ASYC task handling for both GStreamer generations.
- Correct video duration request for videos.
- More accurate pipeline destruction.
- Correct color space conversion plugin for GStreamer 1.0.
2014-09-15 13:47:09 +04:00
Maksim Shabunin
882426a9b2
Stripped iCCP chunk from png files
2014-09-15 12:48:28 +04:00
Vadim Pisarevsky
c445ce6125
Merge pull request #3218 from berak:docfix_colormap_30
2014-09-15 07:34:16 +00:00
berak
ad20feaca0
small corrections to applyColorMap docs
2014-09-14 21:15:48 +02:00
Vadim Pisarevsky
4057e27539
Merge pull request #3126 from avdmitry:move_KDTree_to_ml
2014-09-14 18:57:23 +00:00
Vadim Pisarevsky
e5ab0ac294
Merge pull request #3201 from PhilLab:patch-3
2014-09-14 18:49:35 +00:00
Vadim Pisarevsky
e810f3052d
Merge pull request #3206 from stonier:parallel_qt
2014-09-14 18:48:51 +00:00
Vadim Pisarevsky
8d61ecbc4d
Merge pull request #3205 from parafin:ximea_unix-3.0
2014-09-14 18:44:41 +00:00
Vadim Pisarevsky
cf15b9e8ad
Merge pull request #3204 from parafin:ximea_unix-2.4
2014-09-14 18:44:23 +00:00
Vadim Pisarevsky
87f0010f42
Merge pull request #3203 from parafin:bug_3858-3.0
2014-09-14 18:44:06 +00:00
Dmitriy Anisimov
a6b29be55b
minor change: moved algorithm type to the end of params
2014-09-13 15:06:07 +04:00
Dmitry Gribanov
ee0da48bd2
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-12 18:07:54 +04:00
Maksim Shabunin
88aea1d52f
Stripped iCCP chunk from png files
2014-09-12 16:30:23 +04:00
Andrey Pavlenko
79f593a429
Merge pull request #3198 from mshabunin:java_test_fix
2014-09-11 16:15:25 +00:00
Alexander Karsakov
8c08714b8c
Remove two "set" kernel call
2014-09-11 18:11:23 +04:00
vbystricky
b0bf8478e5
Optimization OpenCL version of Filter2D
2014-09-11 12:59:51 +04:00
Maksim Shabunin
39874ef742
Fixed some failing java tests
...
- fixed lena.png extension
- fixed getTextSize wrapper
- added junit html report generation
2014-09-11 11:56:05 +04:00
GregoryMorse
b9d5f3f6e9
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
...
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Successful test - samples are grabbed
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
VS 2013 support and cleanup consistency plus C++/CX new object fixed
VS 2013 Update 2 library bug fix integrated
Various minor cleanup
Create agile_wrl.h
a-wi's changes integrated
Update cap_msmf.hpp
Update cap_msmf.cpp
Regression test fixes and simplifications
2014-09-10 17:21:38 +08:00
GregoryMorse
b5a4159efc
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
...
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Successful test - samples are grabbed
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
VS 2013 support and cleanup consistency plus C++/CX new object fixed
Conflicts:
modules/highgui/src/cap_msmf.cpp
modules/highgui/src/cap_msmf.hpp
modules/highgui/src/ppltasks_winrt.h
Fix merge conflicts
VS 2013 Update 2 library bug fix integrated
a-wi's changed integrated
2014-09-10 17:05:52 +08:00
Vadim Pisarevsky
2e950eb41b
Merge pull request #3196 from PhilLab:patch-4
2014-09-10 07:56:13 +00:00
Daniel Stonier
d3ad26926d
fixed support for parallelised imshows with qt via the gui receiver.
2014-09-10 03:29:17 +09:00
Igor Kuzmin
ed402c5be6
XIMEA cam support: allow on OS X too
2014-09-09 19:25:14 +04:00
Igor Kuzmin
4d45a2c43f
XIMEA cam support: use correct library for 64 bit Linux
2014-09-09 19:24:16 +04:00
Igor Kuzmin
74827c35ff
fix for issue 3858 (remove unneeded #include's)
...
also use correct include path on Linux
2014-09-09 19:22:20 +04:00
Igor Kuzmin
0421da78b3
XIMEA cam support: allow on OS X too
2014-09-09 19:17:13 +04:00
Igor Kuzmin
b027a84fa1
XIMEA cam support: use correct library for 64 bit Linux
2014-09-09 19:15:03 +04:00
Igor Kuzmin
fbbf4e380f
fix for issue 3858 (remove unneeded #include's)
...
also use correct include path on Linux
2014-09-09 19:10:05 +04:00
Philipp Hasper
62c704d1e9
Updated PnP parameter documentation
2014-09-09 12:24:05 +02:00
Andrey Pavlenko
a8db3df8f6
typo: rect -> roi
2014-09-09 12:25:14 +04:00
Vadim Pisarevsky
faed8f43d6
Merge pull request #3194 from stonier:2.4
2014-09-09 06:33:15 +00:00
Maksim Shabunin
93c03ef05b
Fixed android java test build
2014-09-08 19:21:32 +04:00
Maksim Shabunin
b3bae170ed
Fixed java tests build
...
- disabled xfeature2d dependency for java wrappers
- fixed java wrappers build after cmake rerun
- disabled opencv_ml tests temporarily
- fixed Imgproc usage in java tests
2014-09-08 18:30:03 +04:00
Andrey Pavlenko
43714b9d03
disabling java bindings for xfeatures2d module due to build errors
2014-09-08 18:30:03 +04:00
Alexander Smorkalov
35768ed638
Python tests added to -tests deb package.
2014-09-08 18:11:12 +04:00
Philipp Hasper
cc7aa5890d
Fixing documentation links
2014-09-08 14:41:29 +02:00
Alexander Karsakov
c942c6539a
Remove mul24 since id can be larger 2^23
2014-09-08 13:11:58 +04:00
Daniel Stonier
161f50962d
make sure children are included in the moveToThread
2014-09-08 04:31:37 +09:00
Daniel Stonier
e638b9e805
support invokation of cv windows from parallel threads to an external qt application.
2014-09-08 03:19:56 +09:00
Dmitriy Anisimov
dfaf75f502
moving algorithm type to param
2014-09-06 09:29:32 +04:00
Alexander Karsakov
39b27a19be
Refactoring and optimization
2014-09-05 12:20:29 +04:00
Alexander Karsakov
d59a6fa518
Optimization for getLines
2014-09-05 11:37:16 +04:00
Vadim Pisarevsky
618c75fe3d
Merge pull request #3182 from berak:videowriter_docfix_30
2014-09-04 17:09:18 +00:00
Vadim Pisarevsky
26c284b225
Merge pull request #3167 from akarsakov:ocl_rm_clFinish
2014-09-04 17:00:10 +00:00
berak
5f9d5c483c
adding fourcc to VideoWriter docs
...
underline
2014-09-04 16:09:22 +02:00
Alexander Karsakov
fee8f29f48
Refactoring, minor optimization
2014-09-04 16:31:30 +04:00
Vadim Pisarevsky
ffd1df0cb5
Merge pull request #3186 from akarsakov:ocl_fixes
2014-09-04 08:54:24 +00:00
Vadim Pisarevsky
64a53de27d
Merge pull request #3185 from ElenaGvozdeva:ocl_norm
2014-09-04 08:53:47 +00:00
Ilya Lavrenov
98e7d4ceec
changed optimal vector width for Intel
2014-09-04 11:59:41 +04:00
Elena Gvozdeva
9fe11db7e2
disabled IPP acceleration for 3-channel norms and for CV_8S only for APPLE
2014-09-04 10:38:45 +04:00
Alexander Karsakov
07d57db91c
Fixed calculation of l_stack_size
2014-09-03 17:40:17 +04:00
Alexander Karsakov
7d91b8efcd
Removed redundant clFinish() after clEnqueueUnmapMemObject()
...
sss
2014-09-03 14:54:05 +04:00
Alexander Karsakov
f57a4bf87b
Disabled minMaxIdx for 32FC1 since it occasionally fails on AMD devices (e.g. A10-6800K)
2014-09-03 14:36:51 +04:00
Vadim Pisarevsky
0276cc90c2
Merge pull request #3184 from ilya-lavrenov:arm
2014-09-03 05:40:19 +00:00
E Braun
bdb82d181f
fix for bug 3172
2014-09-02 18:05:23 +02:00
Alexander Alekhin
7dd666e444
Merge pull request #3181 from akarsakov:ocl_mul_scale_test_fix
2014-09-02 13:46:46 +00:00
Alexander Karsakov
ec827bed8e
Changed check to NORM_RELATIVE for OCL.Mat_Scalar_Scale tests
2014-09-02 16:05:50 +04:00
E Braun
89833853fa
Revert "fix for bug 3172"
...
This reverts commit ed2cdb71e5
2014-09-02 13:56:13 +02:00
Alexander Karsakov
a48c1c8248
Added workaround for Nvidia: take into account that 3-channel vector type takes 4*elem_size in local memory.
2014-09-02 12:38:02 +04:00
Alexander Karsakov
214dab39f6
Fixed BORDER_REFLECT and BORDER_REFLECT_101 extrapolation for case x > 2*maxV
2014-09-02 11:53:31 +04:00
Vadim Pisarevsky
a125cd6c6d
Merge pull request #3169 from znah:py_wrap
2014-09-01 18:01:12 +00:00
Ilya Lavrenov
5d3a128cd3
NEON impl on cv::convertScaleAba CV_32f
2014-09-01 17:04:36 +00:00
Vadim Pisarevsky
3bafe64666
Merge pull request #3170 from ElenaGvozdeva:ocl_fix
2014-09-01 10:40:02 +00:00
Vadim Pisarevsky
3e574cd26a
Merge pull request #3173 from rokm:cuda-6.5
2014-09-01 10:38:43 +00:00
Vadim Pisarevsky
1f85ffa11b
Merge pull request #3166 from akarsakov:ocl_native_sqrt
2014-09-01 10:36:50 +00:00
Alexander Mordvintsev
c1032b6232
remove structured_edge_detection.hpp from blacklist
...
don't discard pure virtual methods in hdr_parser.py (was broken anyway)
2014-09-01 13:55:41 +04:00
Maksim Shabunin
66ed9ddbe3
Added Ptr<T> support to Java wrappers
2014-09-01 11:24:44 +04:00
Adrian Clark
fcc481e751
Fixed crash in SSE implementation of FREAK descriptor when number of pairs is set to something other than 512.
...
See http://code.opencv.org/issues/3889 for more details
2014-09-01 09:37:33 +12:00
Dmitriy Anisimov
5f3ee657ce
removed kdtree declaration from interface
2014-08-31 21:39:47 +04:00
Philipp Hasper
e310added4
Fixing Matx ostream operator
...
cv::Matx could not be converted to c::Mat automatically
2014-08-31 14:37:43 +02:00
Rok Mandeljc
eb3cb77296
Fixes for compiling with CUDA 6.5
...
Based on commit feb74b125d
2014-08-29 23:09:02 +02:00
Alexander Alekhin
4d474d40e7
Merge pull request #3171 from akarsakov:amd_fft_fix
2014-08-29 16:28:31 +00:00
Ilya Lavrenov
71ec6144bd
attempt to fix compilation of OpenCL cv::transpose for AMD
2014-08-29 16:59:30 +04:00
Alexander Karsakov
d4e6812be2
Added check AmdFft version to be sure that AmdFft binaries are available
2014-08-29 14:23:18 +04:00
Elena Gvozdeva
31ac73c315
fix for cv::memopTypeToStr
2014-08-29 14:18:52 +04:00
Alexander Alekhin
57fec2f2da
OCL: enable clAmdFftGetVersion
2014-08-29 13:45:04 +04:00
Vadim Pisarevsky
6ccb7e169d
Merge pull request #3163 from StevenPuttemans:fix_nonfree_items
2014-08-29 08:08:52 +00:00
Alexander Karsakov
491bf41356
Disabled native_sqrt for double, since it may be not implemented and gives compilation error.
2014-08-28 17:01:49 +04:00
StevenPuttemans
d27e440b2a
continue fixing nonfree elements
...
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
2014-08-28 13:30:47 +02:00
Vladislav Vinogradov
eaaa2d27d5
fix CUDA LUT implementation
...
In CUDA 6.0 there was a bug in NPP LUT implementation (invalid results when
src == 255). In CUDA 6.5 the bug was fixed.
Replaced NPP LUT call with own implementation (ported from master branch)
to be independant from CUDA Toolkit version.
2014-08-28 14:47:26 +04:00
Vadim Pisarevsky
21f1a0ee49
Merge pull request #3161 from ElenaGvozdeva:ocl_perf_gemm
2014-08-28 10:41:11 +00:00
Alexander Alekhin
b332152bef
Merge pull request #2956 from ilya-lavrenov:tapi_accumulate
2014-08-28 09:08:51 +00:00
Alexander Karsakov
6b6c7ccfea
Added accuracy tests with real and generated data
2014-08-27 17:58:48 +04:00
Alexander Karsakov
f7aadd07f6
Added getLines, fill_accum_local kernels
2014-08-27 17:57:22 +04:00
Vadim Pisarevsky
d66815978a
Merge pull request #3117 from KruchDmitriy:canny_opt
2014-08-27 10:07:55 +00:00
Vadim Pisarevsky
4d9d7e6ded
Merge pull request #3160 from akarsakov:ocl_dft_double_support
2014-08-27 10:06:34 +00:00
Alexander Karsakov
a89ff402fc
Refactoring of OCL_FftPlan class
2014-08-27 10:33:25 +04:00
Vadim Pisarevsky
b5d073ad3f
Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes
2014-08-26 16:03:53 +00:00
Vadim Pisarevsky
7189112308
Merge pull request #3152 from PhilLab:VideoCaptureFix
2014-08-26 16:02:46 +00:00
Vadim Pisarevsky
89605fac04
Merge pull request #3155 from vbystricky:ocloptLaplacian
2014-08-26 16:01:44 +00:00
Elena Gvozdeva
46b6a095a2
changed perf test for ocl_gemm
2014-08-26 15:05:36 +04:00
VBystricky
9ee0789174
Fix issues
2014-08-26 14:39:11 +04:00
PhilLab
a0e4600364
VideoCapture did not detect an unopened camera
2014-08-26 09:42:46 +02:00
Alexander Alekhin
6d253a2068
Merge pull request #2921 from ilya-lavrenov:tapi_memop
2014-08-26 06:34:20 +00:00
StevenPuttemans
564a8ed208
adapted all nonfree header inclusion since it doesn't exist anymore as a module
2014-08-25 21:31:34 +02:00
Vadim Pisarevsky
b1d01dc757
Merge pull request #3157 from PhilLab:pnpFix
2014-08-25 18:11:10 +00:00
Vadim Pisarevsky
5301fe729e
Merge pull request #3154 from PhilLab:patch-4
2014-08-25 18:09:27 +00:00
Vadim Pisarevsky
2211cfe783
Merge pull request #3151 from PhilLab:orbNoKeypoints
2014-08-25 17:10:45 +00:00
PhilLab
e95c33dd18
PnP solver: fixed element-wise access
2014-08-25 17:06:17 +02:00
Alexander Karsakov
3ae95150c7
Added double support for OCL version of DFT
2014-08-25 18:08:43 +04:00
vbystricky
e75cd74f5a
Optimize OpenCL version of Laplacian filter for kernel size great than 3
2014-08-25 17:56:09 +04:00
Philipp Hasper
30742d21d8
CUDA optical flow stubs: missing parameter
2014-08-25 14:49:21 +02:00
Alexander Karsakov
038bfb98ec
Added fill_accum kernel
2014-08-25 13:55:09 +04:00
Ilya Lavrenov
7017b1250a
used new stratehy in cv::accumulate**
2014-08-25 11:25:54 +04:00
Ilya Lavrenov
2c6b7a52e9
improved cv::ocl::predictOptimalVectorWidth
2014-08-25 11:25:01 +04:00
Ilya Lavrenov
a350b76738
optimization of cv::accumulate**
2014-08-25 11:25:01 +04:00
Ilya Lavrenov
2f46cf5ddb
changed base types for cv::memopTypeToStr
2014-08-25 11:23:46 +04:00
Philipp Hasper
9b1136518c
ORB.cl : fixed redefinition of val
2014-08-23 19:07:14 +02:00
Dmitriy Anisimov
9ddb23e025
first implementation KNearest wrapper on KDTree
2014-08-23 18:41:32 +04:00
PhilLab
92826a0436
ORB crashed with no keypoints present
2014-08-23 14:02:15 +02:00
Alexander Karsakov
5c1f71de51
Added make_point_list kernel
2014-08-22 16:50:01 +04:00
Vadim Pisarevsky
e7539bd2c8
Merge pull request #3144 from ElenaGvozdeva:ocl_morphSmall
2014-08-22 12:14:06 +00:00
Vadim Pisarevsky
f624f92e7a
Merge pull request #3142 from akarsakov:fix_cvtcolor_luv_rgb_master
2014-08-22 07:24:21 +00:00
Vadim Pisarevsky
6eb26c1519
Merge pull request #3109 from jet47:gpu-test-fixes
2014-08-22 07:22:23 +00:00
U-KruchininD-ПК\KruchininD
6ed168d3af
New optimization for canny
...
new hysteresis
delete whitespaces
fix problem with mad24
Dynamic work group size
dynamic work group size
Fix problem with warnings
Fix some problems with border
Another one fix
Delete trailing whitespaces
some changes
fix problem with warning
2014-08-22 11:22:15 +04:00
Vadim Pisarevsky
887a950243
Merge pull request #3116 from shubhra:master
2014-08-22 07:15:40 +00:00
Vadim Pisarevsky
0eb1c7edb1
Merge pull request #3127 from GravityJack:size-math-ops
2014-08-22 07:14:13 +00:00
Vadim Pisarevsky
b56933d9dc
Merge pull request #3131 from znah:python_namespaces
2014-08-22 07:12:31 +00:00
Vadim Pisarevsky
1efc3cff36
Merge pull request #3124 from f-morozov:optim_pr
2014-08-22 07:04:43 +00:00
Elena Gvozdeva
7ad6b47bc9
fixed ocl_boxFilter
2014-08-22 10:31:13 +04:00
Marc Rollins
17e8d51124
Fixing uninitialized temporary.
2014-08-21 11:41:12 -07:00
Marc Rollins
703921e2fd
Reverting pass-by-value changes to arithmetic operators.
2014-08-21 10:37:36 -07:00
Alexander Alekhin
d47a2988a9
Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix
2014-08-21 15:48:10 +00:00
Alexander Mordvintsev
c23d6b67ee
blacklisted 'tracking' due to some linking problem
2014-08-21 18:45:50 +04:00
Alexander Mordvintsev
2a9e252f77
fix namespace conflicts (like cv::inpaint and cv::xphoto::inpaint)
...
whitespace fix
2014-08-21 17:33:21 +04:00
Alexander Karsakov
3d222d313b
Fixed range for 'v' channel for 8U images
2014-08-21 17:22:06 +04:00
Elena Gvozdeva
5302e56071
fix for ocl_morphSmall
2014-08-21 16:31:24 +04:00
Alexander Mordvintsev
74c77d826f
base class name resolution
...
fixed find_obj.py
2014-08-21 14:51:03 +04:00
Vladislav Vinogradov
ebe36d6e7c
fix CUDA cvtColor after corresponding change in CPU version
...
see https://github.com/Itseez/opencv/pull/3137
2014-08-21 14:14:06 +04:00
Vadim Pisarevsky
de2a8d3706
Merge pull request #3135 from thorikawa:fix-arithmetic-exception-with-ipp
2014-08-21 05:41:18 +00:00
Vadim Pisarevsky
d68e62c968
Merge pull request #3137 from akarsakov:fix_cvtcolor_luv_rgb
2014-08-21 05:39:18 +00:00
f-morozov
0ae89fe2be
AKAZE optimizations
2014-08-21 09:34:52 +04:00
Vadim Pisarevsky
5afaa6b1e7
Merge pull request #3129 from PhilLab:patch-2
2014-08-21 05:30:17 +00:00
Shubhra Pandit
7b2a1d15cc
Doc changes for feature changes 1544 and 1557
2014-08-20 20:49:50 -04:00
Vadim Pisarevsky
44e04da79c
Merge pull request #2942 from ernest-galbrun:tvl1_chambolle
2014-08-20 14:21:08 +00:00
Vadim Pisarevsky
b2cd954f24
Merge pull request #3042 from edgarriba:master
2014-08-20 13:18:37 +00:00
Alexander Karsakov
b027eac173
Fixed range for 'v' channel for 8U images.
2014-08-20 11:09:21 +04:00
Poly Takahiro Horikawa
cb0ab87646
Fix arithmetic exception when pass an empty mat with IPP option on.
2014-08-19 19:19:53 -07:00
Vadim Pisarevsky
57a1343f10
Merge pull request #3133 from bmagyar:patch-1
2014-08-19 22:23:59 +00:00
Vadim Pisarevsky
a223479107
Merge pull request #3099 from f-morozov:akaze_tutorial
2014-08-19 22:22:23 +00:00
Bence Magyar
04b2d9a453
Fix color table
...
Apart from not displaying the table, it breaks the doc build of https://github.com/Itseez/opencv_contrib/pull/70 .
2014-08-19 18:00:13 +02:00
Alexander Mordvintsev
40d0f853d6
removing modules from blacklist
2014-08-19 19:19:11 +04:00
Alexander Mordvintsev
c4c731c0aa
fixing warnings
...
keep old const names for compatibility
2014-08-19 16:57:37 +04:00
Alexander Mordvintsev
c22dcb04af
fixing warnings
2014-08-19 16:40:09 +04:00
Alexander Mordvintsev
e74cddfbd1
put consts into python submodules
...
maintain set of visited namespaces in CppHeaderParser
WARNING: REMOVED const name conversion (SomeConstName -> SOME_CONST_NAME), discussion needed
2014-08-19 16:40:09 +04:00
Alexander Mordvintsev
6d1c02ffed
unified namespace population with 'init_submodule'
2014-08-19 16:40:08 +04:00
Alexander Mordvintsev
4a519a25f3
nested classes support
2014-08-19 16:40:08 +04:00
Alexander Mordvintsev
5ad7f9910f
function namespaces partially work
2014-08-19 16:40:07 +04:00
Alexander Mordvintsev
e85e83f491
handling namespaces on parsing functions
...
submodule method tables generation
2014-08-19 16:40:06 +04:00
f-morozov
886319c81d
AKAZE fixes and tracking tutorial
2014-08-19 16:35:20 +04:00
PhilLab
e09adc4fde
Clarified parameter useExtrinsicGuess in solvePnP
2014-08-19 11:08:16 +02:00
Vadim Pisarevsky
8658aef3bf
Merge pull request #3104 from dkanafeev:new_ipp_func_master
2014-08-19 09:06:45 +00:00
Vadim Pisarevsky
24163eb929
Merge pull request #3122 from akarsakov:cvtcolor_perf_test_fix
2014-08-19 09:01:35 +00:00
Vadim Pisarevsky
70679b49fc
Merge pull request #3121 from akarsakov:ocl_dft_opt
2014-08-19 08:57:53 +00:00
Ernest Galbrun
2f077fcd99
fixed failing test in opencv_video
2014-08-19 10:00:03 +02:00
Alexander Smorkalov
f38ebba34d
Build fix for NVIDIA Tegra optimizations integration.
2014-08-19 11:40:25 +04:00
edgarriba
deec233519
cleaned dls code
2014-08-19 00:56:13 +02:00
edgarriba
15704c384e
cleaned dls code
2014-08-19 00:52:09 +02:00
edgarriba
2653d745fd
updated sanity data
2014-08-19 00:35:22 +02:00
edgarriba
6ea73a5bff
updated dls perf test
2014-08-19 00:22:08 +02:00
edgarriba
7e2bb63378
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-18 22:30:00 +02:00
edgarriba
620387fbe1
Update perf_pnp && ransac model points
2014-08-18 21:46:16 +02:00
Marc Rollins
8fc1848918
Simplifying arithmetic and comparison operator implementation.
...
Implementing + and - in terms of += and -=.
Implementing != in terms of ==.
2014-08-18 12:25:48 -07:00
Marc Rollins
d3d9b538c7
Implementing division operators.
2014-08-18 11:48:38 -07:00
Marc Rollins
d7a8166720
Implementing *= operator. Implementing * in terms of it.
2014-08-18 11:42:10 -07:00
Dmitriy Anisimov
37b1a7560c
first version of moving KDTree from core to ml
2014-08-18 22:40:31 +04:00
Vadim Pisarevsky
2ed24876af
Merge pull request #3120 from StevenPuttemans:fix_bug3863
2014-08-18 15:39:30 +00:00
Maksim Shabunin
108caae216
Modified logistic regression module according to comments
...
- Reworked documentation to reflect actual code
- Removed some unused variables
- Removed unnecessary 'cv::' modifiers
2014-08-18 19:13:59 +04:00
Maksim Shabunin
4667e18831
Updated logistic regression example
...
- Extracted common operations to separate functions.
- Activated first parameters set.
- Some output formatting.
- Fixed loop break condition in mini_batch_gradient function.
2014-08-18 19:06:58 +04:00
Maksim Shabunin
3e26086f82
Reworked ML logistic regression implementation, initial version
2014-08-18 19:06:58 +04:00
Maksim Shabunin
71770eb790
Fixed ML module build after merge
2014-08-18 19:06:58 +04:00
Rahul Kavi
a23836231f
fixed warnings in type conversions
...
fixed warnings in type conversions from size_t to int (in getting size of number of unique classes in a training problem).
2014-08-18 19:06:58 +04:00
Rahul Kavi
d20b2a5a97
removed extra comments in train method
2014-08-18 19:06:58 +04:00
Rahul Kavi
ae02ecec60
removed a couple of unnecessary comments in Logistic Regression training method
2014-08-18 19:06:58 +04:00
Rahul Kavi
f20db35b78
fixed logistic regression documentation warnings
2014-08-18 19:06:58 +04:00
Rahul Kavi
21de04b4a2
fixed default constructor for LogisticRegression class declaration
2014-08-18 19:06:58 +04:00
Rahul Kavi
65eb52a247
removed default value from LogisticRegression constructor function definition
2014-08-18 19:06:57 +04:00
Rahul Kavi
e7f14f3d0e
fixed missing semicolon in logistic regression documentation
2014-08-18 19:06:57 +04:00
Rahul Kavi
3622de2621
updated mini_batch_size description for LogisticRegressionParams in documentation
2014-08-18 19:06:57 +04:00
Rahul Kavi
e4ef0e0ca8
fixed indentation in logistic regression documentation
2014-08-18 19:06:57 +04:00
Rahul Kavi
7c97dbc196
fixed indentation in logistic regression documentation
2014-08-18 19:06:57 +04:00
Rahul Kavi
aa35835cfc
fixed white space in logistic regression prototype
2014-08-18 19:06:57 +04:00
Rahul Kavi
8995921cc5
fixed white space in logistic regression classifier
2014-08-18 19:06:57 +04:00
Rahul Kavi
a9df50eefc
updated test for logistic regression
2014-08-18 19:06:57 +04:00
Rahul Kavi
b3b4e83aed
updated logistic regression definition
2014-08-18 19:06:57 +04:00
Rahul Kavi
95ea09c3dc
updated prototype for logistic regression classifier
2014-08-18 19:06:57 +04:00
Rahul Kavi
bf2ee3c58a
updated prototype for logistic regression classifier
2014-08-18 19:06:52 +04:00
Rahul Kavi
3a6deb3ed3
updated documentation to reflect new api changes for logistic regression
2014-08-18 19:06:52 +04:00
Rahul Kavi
af88f0c067
updated documentation to do reflect changes to logistic regression class
2014-08-18 19:06:52 +04:00
Rahul Kavi
1652b2a443
fixed trailing whitespaces in LogisticRegression code.
2014-08-18 19:06:52 +04:00
Rahul Kavi
5bb43f69ab
removed trailing whitespaces from predict function
2014-08-18 19:06:52 +04:00
Rahul Kavi
50031ffb15
removed trailing whitespaces from updated logistic regression definition
2014-08-18 19:06:52 +04:00
Rahul Kavi
78f3b0ad1f
removed unnecessary semicolon in LogisticRegression class documentation
2014-08-18 19:06:52 +04:00
Rahul Kavi
56d715b091
fixed typedef for LogisticRegression. Updated LogisticRegression prototype with newer C++ API
2014-08-18 19:06:52 +04:00
Rahul Kavi
e4a90c19cc
updated documentation to reflect newer changes to LogisticRegression class
2014-08-18 19:06:48 +04:00
Rahul Kavi
64aaa6e1ae
updated test for logistic regression after changes to LogisticRegression class
2014-08-18 19:06:48 +04:00
Rahul Kavi
d5ad4f3255
added updated logistic regression prototype with newer C++ API
2014-08-18 19:06:48 +04:00
Rahul Kavi
0e13f33193
rewrote the code to update API, removed inheritance from CvStatModel.
2014-08-18 19:06:48 +04:00
Rahul Kavi
6c74439d56
fixed trailing white-space in logistic regression class
2014-08-18 19:06:48 +04:00
Rahul Kavi
6ae43a2243
added logistic regression classifier
2014-08-18 19:06:48 +04:00
Rahul Kavi
fcfeb2451b
added logistic regression prototype
2014-08-18 19:06:48 +04:00
Rahul Kavi
3039ed7682
added test for logistic regression
2014-08-18 19:06:36 +04:00
Rahul Kavi
3bf6c3c2aa
added documentation for logistic regression classifier
2014-08-18 19:06:36 +04:00
Rahul Kavi
b9902f39b7
added reference to logistic regression document
2014-08-18 19:06:36 +04:00
Alexander Karsakov
cf1ae3513f
Fixed getConversionInfo() for YUV2RGBA_* conversions
2014-08-18 18:34:44 +04:00
Alexander Karsakov
fa818d03b8
Changed twiddle buffer creation to use OCL buffer pool (if possible)
2014-08-18 18:22:52 +04:00
Ernest Galbrun
6207d338dd
merged new master branch
...
changed tests for tvl1 optflow
correction of a bug preventing compilation with cuda (fmin changed to fminf)
2014-08-18 15:29:45 +02:00
Vadim Pisarevsky
b08a6ccd9d
Merge pull request #3118 from akarsakov:fix_cvtcolor_perf
2014-08-18 12:45:35 +00:00
StevenPuttemans
d558260a8e
fixing GT and GE comparison symbol
2014-08-18 13:33:40 +02:00
Alexander Karsakov
023a42ba55
Fixed getConversionInfo() for YUV2RGBA_* conversions
2014-08-18 13:01:19 +04:00
Vadim Pisarevsky
0ffc53bafe
Merge pull request #3107 from vpisarev:fixed_win_build
2014-08-18 09:00:54 +00:00
Ernest Galbrun
fae69df9a9
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
...
Conflicts:
modules/video/doc/motion_analysis_and_object_tracking.rst
2014-08-17 22:08:12 +02:00
Shubhra Pandit
6ca893be23
Adding feature 1544 and 1557
...
-cv::findHomography added a parameter for RANSAC iterations
-cv::findHomography added a parameter for RANSAC confidence
2014-08-17 13:06:06 -04:00
Vadim Pisarevsky
dea40e5e99
Merge pull request #3086 from fpuja:pragma_warning4127_fixing
2014-08-16 16:50:41 +00:00
Vadim Pisarevsky
e9729a9601
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
2014-08-16 00:29:10 +04:00
Vadim Pisarevsky
740c5234b1
fix compile problems with contributed ximgproc/xphoto
2014-08-15 18:00:41 +04:00
Vladislav Vinogradov
62f27b28ed
fix BGR->BGR5x5 color convertion
2014-08-15 14:10:15 +04:00
Vladislav Vinogradov
599f5ef51b
use downscaled frames in FGDStatModel test
2014-08-15 13:42:25 +04:00
Vladislav Vinogradov
86e12b6074
increase epsilon for ResizeSameAsHost test
2014-08-15 13:42:06 +04:00
Vladislav Vinogradov
5dff283b39
increase epsilon for TVL1 sanity test
2014-08-15 13:41:47 +04:00
Leszek Swirski
341c3d5933
Fix reallocation of D buffer in gemm
...
Conflicts:
modules/core/src/matmul.cpp
2014-08-15 09:57:46 +01:00
dkanafeev
1b0f0d7ead
Intel Summer School 2014
...
Switch branch to master.
New IPP func - ippiCopy
Conv: YUV2GRAY_420
2014-08-15 12:54:31 +04:00
Vadim Pisarevsky
daaa5a1824
removed duplicated Hershey fonts
2014-08-15 12:09:16 +04:00
Vadim Pisarevsky
dfbeaddc72
Merge pull request #3106 from LeszekSwirski:fix-gemm-buf-allocate
2014-08-15 05:44:54 +00:00
jaco
dbb0fcdc7a
#pragma warning4127 fixation modified 2
2014-08-14 19:27:53 +02:00
Roman Donchenko
fb9a143429
Set status to alpha
2014-08-14 19:17:29 +04:00
Leszek Swirski
de806330fd
Fix reallocation of D buffer in gemm
2014-08-14 15:54:54 +01:00
Alexander Alekhin
52ac61d87c
Merge pull request #3088 from vbystricky:ocl_enableNormEtc
2014-08-14 14:34:40 +00:00
vbystricky
942ff5be57
Disable OpenCL version of minMaxIdx with mask on AMD devices
2014-08-14 17:39:41 +04:00
Vadim Pisarevsky
95a4943762
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
2014-08-14 13:39:01 +00:00
Vadim Pisarevsky
ed8a7fa541
Merge pull request #3101 from akarsakov:ipp_thresh_fix
2014-08-14 11:42:14 +00:00
Vadim Pisarevsky
0e46b4cd03
Merge pull request #3102 from akarsakov:ocl_denoising_fix
2014-08-14 10:59:32 +00:00
Vadim Pisarevsky
75487d43f5
fixed trailing whitespaces
2014-08-14 14:53:02 +04:00
Vadim Pisarevsky
9a5aa4b23c
trying to solve compile problems; temporarily disabled some tests for just added optimization algo's
2014-08-14 14:37:30 +04:00
Alexander Alekhin
cf4a536440
Merge pull request #3098 from jet47:fix-cuda-compilation
2014-08-14 10:05:49 +00:00
Vadim Pisarevsky
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
Vadim Pisarevsky
4530c7ad08
trying to fix builds
2014-08-14 13:18:04 +04:00
Vadim Pisarevsky
f7243be79c
Merge pull request #3090 from akarsakov:ocl_reduce_fix
2014-08-14 08:52:18 +00:00
Vadim Pisarevsky
5240a03217
Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios
2014-08-14 08:51:44 +00:00
Vadim Pisarevsky
257463719b
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
2014-08-14 12:50:07 +04:00
vbystricky
aab6f6c56f
Set sync=true in ocl_minMaxIdx kernel call. For tests
2014-08-14 12:14:56 +04:00
Alexander Karsakov
75ede6e17c
Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU.
2014-08-14 12:14:33 +04:00
Alexander Karsakov
8760a344ec
Fixed incorrect pointer conversion for in-place threshold
2014-08-14 11:02:55 +04:00
Vadim Pisarevsky
6f86c9f118
another mac-related fix, let's squeeze it in this PR too
2014-08-14 10:45:47 +04:00
Vadim Pisarevsky
5d8098a2c3
avoid compiler warnings
2014-08-14 10:06:10 +04:00
VBystricky
c5632d412e
Change epsilon for NORM_INF_2args accuracy tests
2014-08-13 23:50:32 +04:00
Vadim Pisarevsky
a602185fb6
Merge pull request #3097 from mshabunin:gdal-support
2014-08-13 19:26:10 +00:00
Vadim Pisarevsky
5f590ebed0
Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
2014-08-13 18:28:51 +00:00
Vadim Pisarevsky
71ff228ad3
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
2014-08-13 18:09:42 +00:00
Vadim Pisarevsky
a37876ab95
fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge
2014-08-13 19:59:26 +04:00
jaco
b81dcbdf2a
#pragma warning4127 fixation modified
...
Now use cleaner approach:
#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
2014-08-13 17:59:16 +02:00
Vladislav Vinogradov
9786e0a760
fix cudabgsegm module compilation
2014-08-13 19:20:23 +04:00
vbystricky
1fe403f461
Enable OpenCL version of norm and convertScaleAbs or 32F data
...
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
2014-08-13 18:33:01 +04:00
mshabunin
3ed89a8879
Merge with master and fix conflicts
2014-08-13 18:24:11 +04:00
Vadim Pisarevsky
988555a5d9
Merge pull request #3093 from asmorkalov:ocv_array_bound_fix
2014-08-13 14:08:51 +00:00
Alexander Smorkalov
e11333dd83
GCC 4.8 warning array subscript is above array bounds fixed.
2014-08-13 17:12:08 +04:00
Vadim Pisarevsky
af2434c547
Merge pull request #2827 from Alexander-Petrikov-ELVEES-NEOTEK:neon-stereobm
2014-08-13 13:04:02 +00:00
Adil Ibragimov
9ac06a9333
fix for gcc
2014-08-13 16:34:18 +04:00
Vadim Pisarevsky
d97f9fc477
now the tests pass with loop_times==30
2014-08-13 16:32:01 +04:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
30111a786a
Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum
2014-08-13 10:51:46 +00:00
Vadim Pisarevsky
3cd7941098
Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem
2014-08-13 10:50:51 +00:00
Vadim Pisarevsky
01bd4961e3
Merge pull request #3081 from akarsakov:small_fixes
2014-08-13 10:50:33 +00:00
Alexander Karsakov
c3100eeb19
Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes.
2014-08-13 12:03:06 +04:00
Adil Ibragimov
dfd0b297ce
datastart must be non-const in CUDA.
2014-08-13 11:11:33 +04:00
Alexander Alekhin
28f3a44e33
Merge pull request #3080 from ElenaGvozdeva:ocl_stich
2014-08-12 16:52:41 +00:00
edgarriba
3c3d695d4d
Perf test update
2014-08-12 18:29:43 +02:00
edgarriba
12f8d8069d
removed old code
2014-08-12 16:49:19 +02:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
edgarriba
de2861e7a9
DLS performance modifications
2014-08-12 16:20:22 +02:00
edgarriba
d1f4f6f4b8
DLS performance modifications
2014-08-12 16:15:19 +02:00
Alexander Karsakov
713ddb89bd
Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes
2014-08-12 18:02:29 +04:00
Vadim Pisarevsky
c97c0be4f2
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
2014-08-12 13:56:59 +00:00
Vadim Pisarevsky
5505aa28ce
Merge pull request #3078 from vpisarev:refactor_features2d_take3
2014-08-12 13:56:17 +00:00
jaco
58b3bc2d7e
#pragma warning4127 fixed for cvstd.inl.hpp
2014-08-12 15:28:39 +02:00
Nick D'Ademo
91676de638
Change decimation enum values so they can be used in resolution calculations.
...
BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
2014-08-12 15:18:11 +02:00
Alexander Karsakov
b4d3b34acf
Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension
2014-08-12 16:38:11 +04:00
Elena Gvozdeva
1c7ee88b84
fixed test for ocl PlaneWarperTest
2014-08-12 16:37:34 +04:00
Alexander Karsakov
3deea1c3ce
Added check required local memory size for non-inplace transpose kernel
2014-08-12 16:26:08 +04:00
Vadim Pisarevsky
5119564579
Merge pull request #3033 from nathanjackson:clahe_datatypes
2014-08-12 10:45:29 +00:00
Vadim Pisarevsky
1629d50999
removed some more trailing whitespaces
2014-08-12 14:33:18 +04:00
Alexander Karsakov
5898dcae4a
Added ROUNDING_EPS for identical rounding after dividing on different platforms
2014-08-12 14:28:48 +04:00
Alexander Alekhin
da806cc3e7
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
2014-08-12 10:21:41 +00:00
Elena Gvozdeva
8124d10526
fixed Erode and Dilate in case of kernel = Mat()
2014-08-12 12:19:13 +04:00
vbystricky
6fb282aa39
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result
2014-08-12 11:25:23 +04:00
Alexander Karsakov
10b3d00fd1
Increased epsilon for passing test with IPPICV
2014-08-12 10:42:42 +04:00
Vadim Pisarevsky
bca4eb5e00
fixed more doc builder warnings
2014-08-12 10:40:23 +04:00
Alexander Karsakov
f3dfdfef8a
Fixed warning with "uninitialized local variable"
2014-08-12 10:35:15 +04:00
Nathan Jackson
563200fbf6
CPU (non-OpenCL) CLAHE now supports CV_16UC1.
2014-08-11 18:25:08 -04:00
Vadim Pisarevsky
d119afafdb
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:30:06 +04:00
Vadim Pisarevsky
fe7b48aa8f
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
2014-08-12 00:29:56 +04:00
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
f937f4d951
Merge pull request #3077 from kenlck:master
2014-08-11 16:41:30 +00:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
edgarriba
dccc10ff12
DLS perf
2014-08-11 17:53:43 +02:00
edgarriba
2666da892f
DLS perf update
2014-08-11 17:09:26 +02:00
Alexander Alekhin
8fd61c9aa6
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
2014-08-11 15:02:53 +00:00
Alexander Alekhin
73115233bb
Merge pull request #3074 from ElenaGvozdeva:ocl_lut
2014-08-11 15:01:25 +00:00
edgarriba
cc81b4a5cd
SOLVEPNP_* flags whitespace
2014-08-11 16:31:28 +02:00
edgarriba
afdb67b462
SOLVEPNP_* flags
2014-08-11 16:28:09 +02:00
Vadim Pisarevsky
8202ab37d8
Merge pull request #3072 from nickdademo:pvapi_decimation_binning
2014-08-11 14:04:38 +00:00
Alexander Alekhin
b7d1a70919
Merge pull request #3063 from akarsakov:ocl_warps_check
2014-08-11 13:20:11 +00:00
Low Chin Kian
911e1bd1e4
Allow full range IPv4 support, up to 255.255.255.255
...
Signed-off-by: Low Chin Kian <kenlck1990@gmail.com>
2014-08-11 21:08:37 +08:00
Elena Gvozdeva
b73b28ab9c
fix for ocl_lut
2014-08-11 16:21:55 +04:00
Aleksandr Petrikov
0a531815c5
fix bug 3733 for imgproc/filter.cpp
2014-08-11 16:00:21 +04:00
vbystricky
dfe5fff2f5
Restore OpenCL branch for minmaxLoc on float data
2014-08-11 15:57:29 +04:00
Alexander Karsakov
498da24b8b
Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests
...
with test_loop_times=30
2014-08-11 15:52:53 +04:00
Alexander Karsakov
835b5e2179
Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30.
2014-08-11 15:50:06 +04:00
Alexander Karsakov
6b0e63b652
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
2014-08-11 15:37:05 +04:00
Nick D'Ademo
2b94bcffb9
Added get and set for additional PVAPI properties: DecimationHorizontal, DecimationVertical, BinningX, BinningY
2014-08-11 13:30:36 +02:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
edgarriba
90b3086f4a
RANSAC test confidence 0.99
2014-08-11 12:31:10 +02:00
Vadim Pisarevsky
07744af790
Merge pull request #3066 from vpisarev:minor_fixes
2014-08-11 10:27:30 +00:00
edgarriba
6c8b11afee
DLS test
2014-08-11 11:31:18 +02:00
edgarriba
d7f0b9de25
DLS test
2014-08-11 11:02:00 +02:00
Vadim Pisarevsky
0f66e2757b
Merge pull request #3069 from vpisarev:refactor_video
2014-08-11 08:47:59 +00:00
edgarriba
c7f6c0cb9f
Fixed warnings + RANSAC confidence to double
2014-08-11 10:17:42 +02:00
edgarriba
213241c06a
DLS test update
2014-08-11 09:44:24 +02:00
Vadim Pisarevsky
8368d54d36
Merge pull request #3061 from ElenaGvozdeva:ocl_resize
2014-08-11 06:41:48 +00:00
Vadim Pisarevsky
9ef373f6a5
Merge pull request #3038 from yury-gorbachev:core_arithm_neon
2014-08-10 20:20:04 +00:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
4de4ff5682
Merge pull request #3067 from vpisarev:minor_fixes2
2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
edgarriba
2d26f60192
test dls
2014-08-09 21:54:22 +02:00
edgarriba
3780de9d98
test for DLS
2014-08-09 21:26:38 +02:00
edgarriba
67eb6dde75
warning removed
2014-08-09 20:55:18 +02:00
Yury Gorbachev
9a233999a9
Fixed review comment from Vadim Pisarevsky
2014-08-09 13:37:53 +04:00
Vadim Pisarevsky
09907eeb62
Merge pull request #2639 from kazuki-ma:cv_mat_foreach
2014-08-09 08:25:05 +00:00
Vadim Pisarevsky
0224a20ff6
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
2014-08-08 22:33:40 +04:00
Vadim Pisarevsky
99eed2d885
Merge pull request #3057 from Adil-Ibragimov:adding-constness
2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
62f90219fc
Merge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur
2014-08-08 17:16:38 +00:00
PhilLab
efc1c39315
Fixed self-assignment in cv::Ptr::operator =
...
A self-assignment leads to a call of release() with refcount being 2. In the release() method, refcount is decremented and then successfully checked for being 1. As a consequence, the underlying data is released. To prevent this, we test for a self-assignment
2014-08-08 17:39:12 +02:00
Vadim Pisarevsky
74457cd3b5
Merge pull request #3055 from akarsakov:copyto_UMat_fix
2014-08-08 14:20:02 +00:00
Vadim Pisarevsky
ce0297ed61
Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg
2014-08-08 14:06:49 +00:00
Vadim Pisarevsky
88672f414b
Merge pull request #3056 from akarsakov:ocl_setIdentity_fix
2014-08-08 14:03:46 +00:00
Vadim Pisarevsky
951014803b
Merge pull request #3060 from akarsakov:ocl_dft_fix
2014-08-08 14:03:27 +00:00
Elena Gvozdeva
7cba3ac4f8
small fix for GaussianBlur ocl test
2014-08-08 17:47:57 +04:00
edgarriba
f8c5acee4c
modified number test points
2014-08-08 15:20:38 +02:00
Alexander Karsakov
7849c35de1
Changed check condition in tests for warpAffine and warpPerspective
2014-08-08 17:14:38 +04:00
Maksim Shabunin
f908c2b0e3
Revert "Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors."
...
This reverts commit e85bacff7b
2014-08-08 16:59:24 +04:00
Maksim Shabunin
032c363ea0
Revert "Fix a heap issue with static on Windows"
...
This reverts commit 8e93c19de3
2014-08-08 16:59:13 +04:00
Maksim Shabunin
0be18aca81
Revert "Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances"
...
This reverts commit e63d7de87c
2014-08-08 16:58:35 +04:00
Maksim Shabunin
4c54b287e4
Revert "Fix local variable shadowing"
...
This reverts commit 2f8b5731da
2014-08-08 16:55:10 +04:00
Elena Gvozdeva
b7899c3d5c
small fix for ocl_resize
2014-08-08 16:12:10 +04:00
Alexander Alekhin
03435c0d74
fix IOS framework
2014-08-08 15:57:54 +04:00
edgarriba
8b732e086d
updated ransanc model
2014-08-08 13:52:15 +02:00
Elena Gvozdeva
b5f251c815
fixed test ocl_MatchTemplate for sparse matrix
2014-08-08 13:37:18 +04:00
Alexander Karsakov
6ad4521b78
Fixed typos
2014-08-08 13:11:35 +04:00
Alexander Alekhin
d0f789dc90
Merge pull request #3044 from akarsakov:fix_ocl_tests
2014-08-07 20:14:17 +00:00
Adil Ibragimov
8dab2ffce7
fixing error, wrong template method param.
2014-08-07 17:43:32 +04:00
Adil Ibragimov
6b05ca589d
fixing Mac build
2014-08-07 17:06:22 +04:00
edgarriba
e5a91a8be8
Modification Ransac model points
2014-08-07 14:59:01 +02:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Karsakov
c5ad6de596
Fixed choice of kercn and rowsPerWI for non-Intel device.
2014-08-07 15:37:26 +04:00
Elena Gvozdeva
7dd7dd97cd
fixed nDiffs for CalcBackProject
2014-08-07 15:36:00 +04:00
Elena Gvozdeva
c9b5d8cf4c
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
2014-08-07 15:36:00 +04:00
edgarriba
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
Alexander Karsakov
00221e96fd
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
2014-08-07 13:16:02 +04:00
Alexander Karsakov
44fbfb2cf6
Fixed extrapolation in pyrDown
2014-08-07 10:39:25 +04:00
Alexander Karsakov
2a0b39d30a
Fixed calculate_histogram kernel
2014-08-07 10:39:24 +04:00
Alexander Karsakov
eb9fdb0164
Fixed rounding in remap INTER_LINEAR mode
2014-08-07 10:39:24 +04:00
Alexander Karsakov
fec21239c8
Revert optimization for warpAffine INTER_NEAREST mode
2014-08-07 10:39:18 +04:00
Vadim Pisarevsky
d30729a816
Merge pull request #3047 from prattmic:python2and3
2014-08-07 06:38:37 +00:00
Vadim Pisarevsky
44f24efad4
Merge pull request #3054 from zillatrooper:master
2014-08-07 06:34:31 +00:00
arc
3d0a270a66
Merge branch 'master' into python2and3
2014-08-07 01:04:26 -04:00
Michael Pratt
e9ccadebed
Support Python 2 and 3 in test script
...
Add Python 3 support to the Python test.py script.
The print function is used in place of the print statement.
The urlopen function has been moved to urllib.request in Python 3, so
attempt to import it from either location.
TestCase.assert_() has been deprecated in place of
TestCase.assertTrue().
The tests all pass in both Python 2 and 3.
2014-08-07 00:51:48 -04:00
Michael Pratt
7d41ce23a7
Build Python 3 bindings in subdirectory
...
Build the Python 3 cv2 module in lib/python3/, to avoid potential naming
conflicts with the Python 2 bindings.
The Python 2 bindings are placed directly in lib/, where they are
required for the Buildbot to successfully execute the Python tests.
2014-08-07 00:21:42 -04:00
Michael Pratt
d921cde4d2
Add opencv_matlab to Python ignored modules
...
Requested by @vpisarev in #3047 .
2014-08-07 00:16:49 -04:00
Vadim Pisarevsky
0428ce4703
Merge pull request #3037 from PhilLab:pnpPatch
2014-08-06 20:21:05 +00:00
Björn Wöldecke
f3aa4bdf59
fix misinterpretation of empty window name
...
The documentation states, that a NULL or an empty window name can be used
to refer to the control panel. But the string parameters of the C++ frontend
methods cannot be NULL and converting an empty string to a const char* by
c_str() doesn't produce a NULL pointer, but an empty string. Unfortunately,
the const char* pointer is just passed on to the standard C functions in
the QT backend, which doesn't check for the empty string case.
There are two places where the empty string check could have been introduced:
inside the frontend or inside the backend. As long as the documentation only
mentions this as a special case for the QT backend, the best place seems to
be there.
2014-08-06 19:02:48 +02:00
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
bab5700a09
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
2014-08-06 11:26:07 +00:00
Vadim Pisarevsky
d611684d9e
Merge pull request #3041 from adrians:optimize_split
2014-08-06 09:22:38 +00:00
Michael Pratt
9d9411555f
Place Python library out in dedicated folder
...
Place the built Python module library in a dedicated folder inside of
lib/. This ensures that even if the Python 2 and Python 3 module names
conflict, they will not overwrite one another.
2014-08-06 02:31:30 -04:00
Michael Pratt
976c727eec
Fix a few more PYTHON_NUMPY_INCLUDE_PATH
...
The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.
2014-08-06 02:30:35 -04:00
Michael Pratt
218b12c557
Merge branch 'master' into python2and3
2014-08-06 01:45:07 -04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1
Removed whitespaces
2014-08-05 17:02:06 +02:00
Alexander Alekhin
d2f1c00719
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
2014-08-05 14:52:22 +00:00
StevenPuttemans
34103ef1cb
fixing setting the locale back to what should be expected
...
fix should be applyed for every window interface and generation
2014-08-05 16:20:08 +02:00
Alexander Alekhin
06547120aa
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
2014-08-05 14:17:06 +00:00
vbystricky
774d277c1f
Fix error in OpenCl version of meanstddev for continues src and not continues mask
2014-08-05 17:30:06 +04:00
vbystricky
2637b18b67
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
2014-08-05 16:34:23 +04:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
Elena Gvozdeva
7999fbf765
fixed ocl_integral
2014-08-05 12:01:28 +04:00
Elena Gvozdeva
f32b52ea8d
fixed test for CvtColor RGB -> Luv
2014-08-05 11:54:26 +04:00
Elena Gvozdeva
8c2c3b54d9
fixed ocl tests for BlendLinear, BoxFilter, Integral
2014-08-05 11:41:08 +04:00
Adrian Stratulat
b2acd1f75a
Vectorize split & merge for NEON
2014-08-05 06:51:36 +00:00
Vadim Pisarevsky
a05ce00a65
Merge pull request #2879 from alalek:ocl_runtime_flags
2014-08-04 16:43:01 +00:00
Vadim Pisarevsky
a58767eff8
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
2014-08-04 14:54:12 +00:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Yury Gorbachev
61423a2d47
ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions.
...
NOT verified on target platform, compilation passes with and without NEON.
2014-08-04 16:44:51 +04:00
unknown
3fe4980ce1
Double precision for solvePnPRansac()
2014-08-04 14:20:32 +02:00
vbystricky
2d587ad691
Prevent generating test case with mask filled 0 only
2014-08-04 15:12:36 +04:00
Vladislav Vinogradov
a3da3a01e1
fix test_opencv_imgproc compilation
2014-08-04 12:13:33 +04:00
Vladislav Vinogradov
cdb7b83741
fix python module compilation with enabled CUDA support:
...
filterout all CUDA related headers from python module include headers
2014-08-04 12:12:51 +04:00
Alexander Alekhin
add9ce46c3
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
2014-08-04 08:09:38 +00:00
Vadim Pisarevsky
222f8a3d5e
hopefully fixed test failure on Linux
2014-08-04 01:16:45 +04:00
Vadim Pisarevsky
24b01a8e4f
continuing to debug boost and fix MSVC compile errors
2014-08-03 21:21:11 +04:00
Vadim Pisarevsky
98a1181240
fixed the condition
2014-08-03 13:15:43 +04:00
Vadim Pisarevsky
79b593d8d8
more fixes and more debugging code
2014-08-03 13:08:03 +04:00
Vadim Pisarevsky
eeb786fcfd
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code
2014-08-03 12:46:28 +04:00
Vadim Pisarevsky
9cb79b9abb
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:31 +04:00
Vadim Pisarevsky
8e9d1d9fe6
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:20 +04:00
Vadim Pisarevsky
2520e335d1
removed many extra whitespaces; fixed 1 warning
2014-08-03 03:08:25 +04:00
Vadim Pisarevsky
28ca6ac05e
fixed building html docs
2014-08-03 02:34:47 +04:00
Vadim Pisarevsky
d3cdfefa03
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
2014-08-02 21:52:24 +00:00
Vadim Pisarevsky
c6593d02a6
updated docs
2014-08-03 01:41:30 +04:00
Vadim Pisarevsky
c20ff6ce19
made everything compile and even run somehow
2014-08-03 01:41:09 +04:00
VBystricky
2026094691
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
2014-08-02 13:21:34 +04:00
Alexander Alekhin
c595457ea0
Merge pull request #3011 from vbystricky:oclopt_morthosmall
2014-08-01 17:21:59 +00:00
Alexander Alekhin
11dd36f3aa
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
2014-08-01 17:15:53 +00:00
Alexander Alekhin
b33a093844
Merge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix
2014-08-01 17:15:38 +00:00
Roman Donchenko
74e58ddbb1
Disable the broken fisheye undistortImage test
2014-08-01 19:50:17 +04:00
VBystricky
0f9b79ef64
Change min-max to clamp
2014-08-01 19:45:11 +04:00
vbystricky
aad4104297
Fix accurency test for OpenCL matrix operations
2014-08-01 18:30:20 +04:00
vbystricky
184c5917bf
Fix accurency test of OpenCL merge function.
2014-08-01 17:53:24 +04:00
Vadim Pisarevsky
936536a284
Merge pull request #2671 from syilma:HomographyDecomp
2014-08-01 13:08:20 +00:00
Vadim Pisarevsky
d01ca30f55
Merge pull request #3018 from fradelg:master
2014-08-01 13:06:36 +00:00
Ernest Galbrun
6594d52185
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
2014-08-01 14:54:55 +02:00
vbystricky
b724208510
Fix Luv2RGB function
2014-08-01 16:39:12 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
345b69d5f7
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation
2014-08-01 09:42:40 +00:00
Vadim Pisarevsky
05164bf713
Merge pull request #2608 from Siddharthk:master
2014-08-01 09:13:32 +00:00
Alexander Alekhin
b3e31fb8d6
Merge pull request #3023 from vbystricky:ocl_minMaxLoc
2014-08-01 08:57:37 +00:00
edgarriba
3e2a57ff35
Update for non Eigen users
2014-08-01 10:48:39 +02:00
Vladislav Vinogradov
da9be8231f
fix cv::gpu::resize for INTER_LINEAR, now it produces the same result as CPU version
2014-08-01 11:33:29 +04:00
Fco. Javier Delgado del Hoyo
625fd61313
Removed OpticalFlowBM test from cudaoptflow module
2014-08-01 09:28:19 +02:00
E Braun
ed2cdb71e5
fix for bug 3172
2014-08-01 07:47:59 +02:00
E Braun
bbe48eaac6
regression test for bug 3172
2014-08-01 00:17:17 +02:00
Vadim Pisarevsky
18de8dee62
Merge pull request #3009 from vpisarev:ios_experiments
2014-07-31 18:20:07 +00:00
Alexander Alekhin
f8aecb2a32
Merge pull request #3002 from vbystricky:oclopt_pyrdown
2014-07-31 15:43:18 +00:00
vbystricky
b48e487d53
Enable ocl version of minmaxloc with mask
2014-07-31 19:12:10 +04:00
vbystricky
11a0e3ff78
Fix error in OCL minmaxloc
2014-07-31 19:04:38 +04:00
Ernest Galbrun
7b8bb4248b
Merge branch 'cuda_concurrency' into tvl1_chambolle
2014-07-31 16:08:57 +02:00
Ernest Galbrun
ae26368e78
Merge branch 'master' into cuda_concurrency
2014-07-31 16:03:51 +02:00
Ernest Galbrun
917107e635
removed bm legacy
2014-07-31 16:01:54 +02:00
Vladislav Vinogradov
7030a1f9a2
fix cudabgsegm module compilation
2014-07-31 17:55:59 +04:00
Elena Gvozdeva
9db8592aa8
fixed ocl_flip for cn==3
2014-07-31 16:57:47 +04:00
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
Alexander Alekhin
bab826a381
Merge pull request #3019 from alalek:ocl_fix_pyrUp_test
2014-07-30 13:02:45 +00: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
Alexander Smorkalov
d8187f7518
Merge branch 'fix_androidcamera_preview_usage_bits' into 2.4
2014-07-30 14:35:00 +04:00
Elena Gvozdeva
90ac88cb8e
use std::min,max
2014-07-30 14:28:02 +04:00
Alexander Alekhin
9e83463128
ocl: fix pyrUp perf test
2014-07-30 13:27:36 +04:00
edgarriba
b6b0c2aa8e
MACRO for EIGEN libraries
2014-07-30 11:22:25 +02: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
e98c9a7ce3
Merge pull request #2968 from LeonidBeynenson:bugfix_crash_gpu_feature_matcher_in_stitcher
2014-07-29 13:48:19 +00:00
Vadim Pisarevsky
042892f0d7
hopefully fixed Python tests
2014-07-29 12:27:31 +04:00
Elena Gvozdeva
dbb5993d13
added dft for all platforms
2014-07-29 12:21:52 +04:00
Elena Gvozdeva
dc3c691c8c
new block size for dft
2014-07-29 12:06:20 +04:00
Elena Gvozdeva
e7216a5987
Used float instead of int for CV_8U in sumTemplate
2014-07-29 11:34:39 +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
Ernest Galbrun
5623701acb
performance issue for cuda TVL1 when gamma = 0
2014-07-28 14:24:21 +02: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
edgarriba
4ddc6a4a77
Update for DLS test
2014-07-28 12:03:02 +02:00
edgarriba
0427b70a2f
Filtering solutions with imaginary part
2014-07-28 12:01:39 +02:00
Ernest Galbrun
df8f1a4355
removed legacy header
2014-07-28 10:58:19 +02: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
7cefaa49dd
Merge pull request #2816 from ehren:avcapturesession_leak
2014-07-25 13:18:06 +00:00
Vadim Pisarevsky
fc41e8850b
Merge pull request #2836 from s98felix:2.4
2014-07-25 12:59:41 +00: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
edgarriba
5f35bed5c5
Delete Debug functions
2014-07-25 11:54:41 +02:00
edgarriba
9cad1dfa0d
Update C headers for DLS
2014-07-25 11:49:20 +02:00
edgarriba
5980613317
Update
2014-07-25 11:46:28 +02:00
vbystricky
e49d148d47
Optimize ocl function pyrDown
2014-07-25 13:39:19 +04:00
edgarriba
5f54a22d29
Update documentation for DLS
2014-07-25 11:39:06 +02:00
edgarriba
a4e21c8fa8
Update DLS test
2014-07-25 11:29:34 +02:00
Alexander Karsakov
37d01e2d27
Added license header, using cv::Ptr, small fixes.
2014-07-25 13:27:00 +04:00
edgarriba
a3f065c409
DLS working
2014-07-25 11:01:47 +02: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
edgarriba
48c4a79d2e
DLS full algorithm compiling
2014-07-23 17:26:03 +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
Martijn Liem
9c285da329
Bugfix for bug #3767
...
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
2014-07-23 12:33:51 +02:00
Elena Gvozdeva
4fdd6de8e8
Fixed ippiDFT call
2014-07-23 13:39:31 +04:00
edgarriba
730fe9e582
Hessian+ cayley2rotbar
2014-07-22 17:56:25 +02: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
edgarriba
b1b9a29e48
Extracting Eigenvalues and Eigenvectors
2014-07-21 17:45:54 +02: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
edgarriba
40f6d320c2
last update
2014-07-21 09:31:45 +02:00
Anish Pednekar
d2493393db
added macro guard to enable overriding ENABLE_LOG
2014-07-20 21:06:37 +05:30
VBystricky
cc703b01df
Fix build errors with cap_v4l on Linux
2014-07-20 18:27:14 +04:00
Lars Glud
1242a66119
Openni2 support
2014-07-20 15:04:11 +02:00
Lars Glud
4dcd37f699
Merge remote-tracking branch 'origin/master' into Openni2Support
...
Conflicts:
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
2014-07-20 14:28:10 +02:00
Vadim Pisarevsky
9a58b1a3a0
Merge pull request #2925 from BloodAxe:osx-framework-script
2014-07-19 18:04:15 +00:00
Vadim Pisarevsky
d7bbafd683
Merge pull request #2948 from PhilLab:patch-1
2014-07-18 10:10:44 +00:00
Vadim Pisarevsky
e90c233551
Merge pull request #2984 from cambyse:2.4
2014-07-18 10:05:22 +00:00
Vadim Pisarevsky
a7006ac21c
Merge pull request #2979 from PhilLab:patch-2
2014-07-18 09:58:07 +00:00
Vadim Pisarevsky
06897dbdb5
Merge pull request #2980 from akarsakov:revert_dft_dst_fix
2014-07-18 09:57:51 +00:00
Vadim Pisarevsky
39020fc9cf
Merge pull request #2898 from PhilLab:2.4
2014-07-18 09:26:50 +00:00
Vadim Pisarevsky
17d69be902
Merge pull request #2933 from ilya-lavrenov:sse_moments
2014-07-18 09:25:22 +00:00
PhilLab
d5489f3a68
Clarified DescriptorExtractor::compute
2014-07-18 10:57:54 +02:00
PhilLab
e82241cba5
Function for drawing arrows
...
Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970 ) To the new InputOutputArray type
2014-07-18 10:04:44 +02:00
Camille
5a5a487612
bug fix 3381
2014-07-18 00:06:31 +02:00
Camille
46775ad186
bug fix 3381
2014-07-17 22:57:31 +02:00
Aaron Denney
4644689d5a
And remove final vestiges.
2014-07-17 09:43:21 -07:00
Aaron Denney
85601e03dd
remove constant memory use in compute_data_cost
2014-07-17 09:43:21 -07:00
Aaron Denney
52516085d9
remove constant memory from init_data_cost
2014-07-17 09:43:21 -07:00
Aaron Denney
1ff270e41c
init_message no longer uses constant memory.
2014-07-17 09:43:21 -07:00
Aaron Denney
9b8002cd43
remove use of constant memory in calc_all_iterations/compute_message/message_per_pixel
2014-07-17 09:43:21 -07:00
Aaron Denney
b792419cde
Remove compute_disp()'s use of constant memory.
2014-07-17 09:43:21 -07:00
Aaron Denney
6d86d63ac5
Last of csbp load_constants() gone.
2014-07-17 09:43:21 -07:00
Aaron Denney
9bc71f4cb6
Deconstify minimum disparity.
2014-07-17 09:43:21 -07:00
Aaron Denney
eed5cbc5db
More constant removal.
2014-07-17 09:43:21 -07:00
Aaron Denney
3ab117df04
Change struct with single static function to function.
2014-07-17 09:43:20 -07:00
Aaron Denney
021b0cb4d5
Pass max_disc_term as kernel parameter.
2014-07-17 09:43:20 -07:00
Aaron Denney
0e2ea45c93
ndisp no longer constant
2014-07-17 09:43:20 -07:00
Aaron Denney
2832cfdfe5
No longer use constant memory for image step.
2014-07-17 09:43:20 -07:00
Aaron Denney
d8d946a458
Constify cuda csbp
2014-07-17 09:43:20 -07:00
Aaron Denney
2982e77495
Pass in images and scratch space so that multiple copies can run concurrently.
2014-07-17 09:43:20 -07:00
Aaron Denney
fe29ed461c
Move shared interface to header file rather than repeating.
2014-07-17 09:43:20 -07:00
Aaron Denney
e532bd50d5
Move shared interface to header file rather than repeating.
2014-07-17 09:43:20 -07:00
Aaron Denney
1533d0448f
cdata_weight always positive; fewer multiplications.
2014-07-17 09:43:20 -07:00
Aaron Denney
d848704b35
cuda::DisparityBilateralFilter no longer uses constant memory for parameters
...
Now multiple filters can be used in the same context without stepping on each other.
2014-07-17 09:43:20 -07:00
Alexander Karsakov
901d9b70b0
Revert changes by PR#2930 since it breaks logic of inverse mode.
2014-07-17 15:11:06 +04:00
Vadim Pisarevsky
8f8450793a
Merge pull request #2964 from vbystricky:highgui_split
2014-07-16 19:29:36 +00:00
Vadim Pisarevsky
0b4e043442
Merge pull request #2970 from PhilLab:patch-3
2014-07-16 19:26:46 +00:00
Lars Glud
8b32235854
Openni2 support
2014-07-16 12:37:53 +02:00
edgarriba
42ab7fd876
dls() no compiles
2014-07-16 00:06:29 +02:00
Petr Glotov
7a77cf584a
added timelapse
2014-07-15 09:32:47 -07:00
unknown
d0c3c4c373
Function for drawing arrows
2014-07-15 14:12:16 +02:00
Vadim Pisarevsky
dbefbbc522
Merge pull request #2910 from ilya-lavrenov:sse2_canny
2014-07-15 09:46:28 +00:00
LeonidBeynenson
8578f9c565
Added a TODO comment about changes which should be done in GpuMatcher::match
2014-07-15 13:27:59 +04:00
Vadim Pisarevsky
40370345c5
Merge pull request #2765 from pradeep-pyro:kullback_leibler
2014-07-15 08:57:31 +00:00
Vadim Pisarevsky
c9c09262f7
Merge pull request #2966 from PhilLab:patch-2
2014-07-15 08:10:33 +00:00
Vadim Pisarevsky
faac7f18c7
Merge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result
2014-07-15 08:10:04 +00:00
Vadim Pisarevsky
b1793e2fb9
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
2014-07-15 08:09:04 +00:00
edgarriba
fb67ab1257
Initial DLS add
2014-07-15 09:58:49 +02:00
pradeep
7171431e7c
Changed cv::log to std::log
2014-07-15 12:32:53 +08:00
VBystricky
ca307669d4
Refresh code. Fix merge conflict
2014-07-14 23:30:50 +04:00
Vadim Pisarevsky
b63a7e66db
Merge pull request #2953 from gongzg:master
2014-07-14 19:21:15 +00:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
Vadim Pisarevsky
8d58b238ca
Merge pull request #2780 from hbadino:Feature_3692_2.4
2014-07-14 19:00:52 +00:00
Vadim Pisarevsky
f773cd9a3e
Merge pull request #2947 from vbystricky:capDShow
2014-07-14 18:53:25 +00:00
Alexander Alekhin
381986d044
Merge pull request #2882 from akarsakov:ocl_pyrDown_opt
2014-07-14 18:48:28 +00:00
Vadim Pisarevsky
b111fb94b7
Merge pull request #2957 from cambyse:2.4
2014-07-14 18:42:49 +00:00
Vadim Pisarevsky
544dd8b130
Merge pull request #2971 from ruslo:docfix
2014-07-14 18:40:39 +00:00
Roman Donchenko
d31a0eab9e
Merge pull request #2815 from Aletheios:Bugfix#3705
2014-07-14 12:19:31 +00:00
Alexander Smorkalov
60a5ada454
Build fixes for CUDA 6.5
2014-07-14 14:26:50 +04:00
Roman Donchenko
3490a5aded
Merge pull request #2962 from alalek:fix_v4l_build
2014-07-14 08:20:54 +00:00
Ruslan Baratov
b030d7e6a1
Doc: fix definition of macro CV_MAKETYPE
...
At least this is how it's defined in core/types_c.h
2014-07-12 19:35:22 +04:00
Alexander Alekhin
e169083fed
Merge pull request #2918 from vbystricky:oclopt_reduce2
2014-07-12 05:00:57 +00:00
Alexander Alekhin
df74a266cf
Merge pull request #2963 from ilya-lavrenov:tapi_bufferpool
2014-07-11 14:55:13 +00:00
Alexander Alekhin
0876ec7a67
Merge pull request #2935 from vbystricky:oclopt_meanStdDev
2014-07-11 14:53:46 +00:00
Roman Donchenko
d262b04d99
Merge pull request #2903 from mmaraya:2.4
2014-07-11 14:15:59 +00:00
Leonid Beynenson
cce2d9927e
Fixed bug which caused crash of GPU version of feature matcher in stitcher
...
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
2014-07-11 16:37:30 +04:00
Leonid Beynenson
79878a57a9
Fixed bug in cv::detail::waveCorrect
...
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
2014-07-11 15:47:41 +04:00
Alexander Alekhin
cbf63b0709
Merge pull request #2851 from ilya-lavrenov:tapi_set_identity
2014-07-11 10:00:16 +00:00
Alexander Alekhin
910d8f8e0b
Merge pull request #2888 from ilya-lavrenov:tapi_remap
2014-07-11 09:59:27 +00:00
Ilya Lavrenov
f2a2467de3
enabled BufferPool
2014-07-11 12:21:10 +04:00
PhilLab
13a0c14e6c
Added publication reference
2014-07-11 09:22:55 +02:00
Alexander Alekhin
6dd3244019
fix build
2014-07-10 18:08:38 +04:00
Ilya Lavrenov
fee3d6931b
corners
2014-07-10 17:17:24 +04:00
Ilya Lavrenov
c949845a6b
fixed perf test
2014-07-10 16:03:31 +04:00
Alexander Alekhin
a0816c6d15
Merge pull request #2927 from ilya-lavrenov:tapi_lut
2014-07-10 09:38:37 +00:00
Vadim Pisarevsky
347eaa8685
Merge pull request #2943 from vbystricky:highgui_imgcodecs
2014-07-10 05:28:44 +00:00
Richard Yoo
c38023f4e7
Modifications to support dynamic vector dispatch.
2014-07-09 16:55:39 -07:00
Camille
cbb5fc0acc
bug fix 3696
2014-07-09 22:35:56 +02:00
edgarriba
9abcd88435
Upate test ransac
2014-07-09 17:39:32 +02:00
edgarriba
a5d40d7674
Test Run OK
2014-07-09 17:27:08 +02:00
Ilya Lavrenov
ecec53f509
fixed docs
2014-07-09 17:48:28 +04:00
unknown
52c05e75cc
Fixed C++11 compatibility warning
2014-07-09 14:19:15 +02:00
edgarriba
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
edgarriba
ba5a8ee299
Solvepnpransac() returns boolean
2014-07-09 10:37:37 +02:00
Zhigang Gong
2e49ca4903
Avoid unmap an umat(ocl) which hasn't been mapped at all.
...
According to opencl 1.2 spec 5.4.2:
enqueues a command to unmap a previously mapped region of a memory object.
...
CL_INVALID_VALUE if mapped_ptr is not a valid pointer returned by
clEnqueueMapBuffer, or clEnqueueMapImage for memobj.
So if the u->data is not from a clEnqueueMapBuffer call, we should not
call clEnqueueUnmapMemObject() unmap it. With this patch, the cases
./opencv_test_video --gtest_filter=OCL_Video/FarnebackOpticalFlow.Mat/*
could work well with beignet 0.9.1, Otherwise, it will get a
CL_INVALID_VALUE at the clEnqueueUnmapMemObject().
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2014-07-09 16:21:20 +08:00
pradeep
0d49f97128
Fixed truncation warning
2014-07-09 15:29:47 +08:00
pradeep
f8b23cff18
Fixed test errors, added support for C data types.
2014-07-09 13:39:40 +08:00
berak
7b160fa3cb
added missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756 )
2014-07-08 18:04:56 +02:00
edgarriba
ce07024a44
Updated solvePnPRansac()
2014-07-08 17:09:55 +02:00
Ilya Lavrenov
e8f5c2fcf6
OpenCL before IPP
2014-07-08 18:51:27 +04:00
edgarriba
b74cfe8c2c
nothing
2014-07-08 16:26:56 +02:00
edgarriba
ac8cce3963
solvepnpransac() confidence added
2014-07-08 16:23:25 +02:00
edgarriba
747c6a2bd2
solvepnpransac() interface changed
2014-07-08 16:07:30 +02:00
Roman Donchenko
71d3654832
Merge pull request #2558 from asmorkalov:ocv_matop_init_fix
2014-07-08 12:14:55 +00:00
PhilLab
2c29ee9e00
Added cast and removed formatting error
2014-07-08 13:24:35 +02:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
PhilLab
aafda43df1
Double precision for solvePnPRansac()
...
solvePnPRansac() and pnpTask() now accept object or image points with double precision.
2014-07-08 11:52:42 +02:00
vbystricky
7fe7facfee
Remove unused variable
2014-07-08 13:29:28 +04:00
vbystricky
eb8366bb0a
DShow camera as IVideoCapture object
2014-07-08 12:28:34 +04:00
Alexander Alekhin
e79ceb4b45
Merge pull request #2936 from ilya-lavrenov:tapi_minmaxloc_opt
2014-07-08 07:30:49 +00:00
Vadim Pisarevsky
d05d235c01
Merge pull request #2669 from Adil-Ibragimov:flann_distance_fix
2014-07-07 13:35:09 +00:00
Vadim Pisarevsky
39127d942e
Merge pull request #2908 from mmaraya:bug_3737
2014-07-07 13:29:38 +00:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Vadim Pisarevsky
e1553d5da3
Merge pull request #2929 from ilya-lavrenov:sse_pow
2014-07-07 11:22:26 +00:00
Vadim Pisarevsky
b068e63618
Merge pull request #2930 from akarsakov:dft_dst_size_fix
2014-07-07 11:21:12 +00:00
Vadim Pisarevsky
b2ab1b758a
Merge pull request #2937 from ilya-lavrenov:sse_patch_nans
2014-07-07 11:20:30 +00:00
Vadim Pisarevsky
41dcd0ac03
Merge pull request #2941 from ilya-lavrenov:sse_inrange
2014-07-07 11:19:54 +00:00
Ernest Galbrun
62fed8b7b2
retry after failure to load from the build bot
2014-07-07 12:55:07 +02:00
Ernest Galbrun
3d8e05d711
documentation formatting
2014-07-07 12:46:59 +02:00
Ernest Galbrun
5c8e679bdc
still a couple tabs and trailing whitespaces...
2014-07-07 12:34:23 +02:00
Ernest Galbrun
ca6fb27ea6
removed some tabs
2014-07-07 09:49:57 +02:00
Ernest Galbrun
eb6c598678
changed nullptr to NULL to avoid c++11 (failed to build on linux)
...
replaces tabs with spaces
2014-07-07 09:32:48 +02:00
Beat Küng
90dce84314
imgproc: fix compiler error for gcc 4.8
...
this bug was introduced in a73809e6
2014-07-05 09:27:11 +02:00
edgarriba
dd52d1b526
New Ransac implementation WORKING
2014-07-04 17:20:17 +02:00
Ernest Galbrun
062e1cbe06
edited documentation to take into account changes in TVL1
2014-07-04 15:45:58 +02:00
Ernest Galbrun
4bd55c6f73
added comments and reference for Chambolle paper
2014-07-04 15:33:34 +02:00
Ernest Galbrun
693c4e5741
debug of cuda_tvl1 => pass tests succesfully
2014-07-04 14:23:09 +02:00
Ilya Lavrenov
e2b86974ae
SSE2 optimization of cv::patchNaNs
2014-07-04 10:27:44 +04:00
Ilya Lavrenov
e04c39b089
SSE2 optimization of cv::inRange
2014-07-04 10:11:18 +04:00
Adi Shavit
b449bd5150
Clarified code.
2014-07-03 22:45:11 +03:00
Adi Shavit
e25dca21d1
Fixed indentation.
2014-07-03 22:29:45 +03:00
Adi Shavit
d44e3c369d
Added documentation.
2014-07-03 22:29:44 +03:00
Adi Shavit
68827072c9
[HighGUI] On Windows: Support Ctrl+C to copy image to clipboard.
2014-07-03 22:29:43 +03:00
David Bradley
b71744082b
cudabgsegm module was not compiling. Changing all references of opencv2/legacy.hpp to opencv2/cudalegacy.hpp seemed to work.
...
I'm new at this so it would be good to have someone familiar with the build system confirm the change.
2014-07-03 15:15:23 -04:00
Adi Shavit
7674f3ddbf
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2014-07-03 22:14:58 +03:00
Ernest Galbrun
32707317fa
Merge branch 'master' into tvl1_ali
2014-07-03 15:30:59 +02:00
Ernest Galbrun
3e577b090e
removed legacy from cmake dependency
...
removed legacy tests in cudaoptflow
2014-07-03 15:26:51 +02:00
Alexander Alekhin
964b260937
Merge pull request #2932 from ilya-lavrenov:tapi_other_vendors
2014-07-03 13:02:41 +00:00
Ilya Lavrenov
55d84cf815
optimization of cv::minMaxLoc - used min/max
2014-07-03 16:56:22 +04:00
vbystricky
690c932d7f
Change groups count for Intel
2014-07-03 15:50:56 +04:00
Ilya Lavrenov
2fe07abf83
use vectors for devices of all vendors
2014-07-03 15:32:34 +04:00
Alexander Karsakov
4b8fb6c246
Fixed dst size
2014-07-03 15:17:51 +04:00
Ilya Lavrenov
8fdbdb131d
SSE4.1 optimiation of cv::Moments CV_16U
2014-07-03 15:04:06 +04:00
edgarriba
e0c4936c99
Input/Output Arrays (DOES NOT COMPILE)
2014-07-03 12:23:03 +02:00
Ernest Galbrun
1ea1cafa00
added modification on cudaoptflow/include/opencv2/cudaoptflow.hpp
2014-07-03 12:07:19 +02:00
Alexander Alekhin
d183554600
Merge pull request #2931 from alalek:mac_fix_master
2014-07-03 09:26:52 +00:00
Alexander Alekhin
e6c305cb75
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
2014-07-03 09:26:05 +00:00
Alexander Alekhin
c5d3c08256
ocl: add try-catch for OpenCL device getter
2014-07-03 12:18:19 +04:00
Ilya Lavrenov
93f8581b69
fixed warnings
2014-07-03 11:10:28 +04:00
Ilya Lavrenov
e5b63d43f2
sse2 optimization of inv_sqrt_64f
2014-07-03 01:33:49 +04:00
Alexander Alekhin
effff27c4e
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
2014-07-02 19:06:46 +00:00
Ilya Lavrenov
46e2216165
fixed cv::warpPerspective
2014-07-02 19:32:10 +04:00
Ernest Galbrun
b66a13183e
added cuda support for chambolle parameter
2014-07-02 17:06:52 +02:00
Ilya Lavrenov
10c772fa7f
minor optimization of cv::LUT
2014-07-02 18:50:21 +04:00
Vadim Pisarevsky
133d861d65
Merge pull request #2915 from SpecLad:core-useless-casts
2014-07-02 14:25:52 +00:00
Vadim Pisarevsky
8539d424b2
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
2014-07-02 14:24:09 +00:00
Vadim Pisarevsky
c3329ff79d
Merge pull request #2856 from sanchom:master
2014-07-02 14:22:56 +00:00
edgarriba
6eb1426ea2
First version Ransac (DOESN'T COMPILE)
2014-07-02 14:53:12 +02:00
Alexander Alekhin
dcf96b2da7
Merge pull request #2922 from ilya-lavrenov:mac_fix
2014-07-02 12:18:11 +00:00
Ernest Galbrun
afb9b9540c
performance issue when gamma=0
2014-07-02 12:01:59 +02:00
Vadim Pisarevsky
0e534b5a25
Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu
2014-07-02 09:56:59 +00:00
Vadim Pisarevsky
d6233b13ba
Merge pull request #2913 from ilya-lavrenov:sse2_precornerdetect
2014-07-02 09:55:51 +00:00
Alexander Alekhin
d65abcaedb
Merge pull request #2830 from mlyashko:moments
2014-07-02 09:14:48 +00:00
Ernest Galbrun
f2e09d048c
changed default value for gamma (now 0 -> no use of gamma)
2014-07-02 10:38:32 +02:00
Alexander Alekhin
b1ac35e14a
ocl: fix mac and superres test
2014-07-02 11:54:20 +04:00
Ilya Lavrenov
43e4946cca
fix for fisheye
2014-07-02 11:53:53 +04:00
vbystricky
a3b9884674
Change global buffer to local
2014-07-02 11:36:25 +04:00
Marvin Smith
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07:00
Ilya Lavrenov
d40cb39616
SSE2 optimization of magnitude calculation
2014-07-02 00:05:55 +04:00
Ievgen Khvedchenia
92ead5fab3
Fix cmake to build OpenCV framework on OSX
2014-07-01 22:31:57 +03:00
Vadim Pisarevsky
1b18ebf28a
Merge pull request #2905 from Jazmann:2.4
2014-07-01 18:41:15 +00:00
Vadim Pisarevsky
15197eb09b
Merge pull request #2911 from ilya-lavrenov:sse2_convert_scale_abs
2014-07-01 17:31:37 +00:00
Vadim Pisarevsky
fe4bdcd71b
Merge pull request #2895 from fradelg:master
2014-07-01 17:16:22 +00:00
Vadim Pisarevsky
f6cf68094f
Merge pull request #2917 from mmaraya:bug_3872
2014-07-01 16:40:08 +00:00
Ilya Lavrenov
070be56e14
fixed warnings
2014-07-01 14:32:16 +04:00
Alexander Alekhin
157257b072
ocl: don't use OpenCL CPU device in default setup
2014-07-01 14:25:31 +04:00
Ernest Galbrun
c45e645d6c
Merge branch 'master' into tvl1_ali
2014-07-01 10:17:07 +02:00
Mike Maraya
95550c2582
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782
2014-06-30 22:17:52 -04:00
Ilya Lavrenov
972119bff3
sse2 optimization of cv::convertScaleAbs
2014-07-01 02:21:00 +04:00
Ilya Lavrenov
54e4ef657c
optimized cv::transpose inplace
2014-07-01 00:36:13 +04:00
Ilya Lavrenov
9c8b9fc733
cv::transpose
2014-06-30 19:07:45 +04:00
Alexander Alekhin
cbd0511a56
Merge pull request #2907 from ilya-lavrenov:tapi_perf_transpose
2014-06-30 14:59:36 +00:00
Ilya Lavrenov
978f7eb44a
added perf test for transpose inplace
2014-06-30 18:33:26 +04:00
Roman Donchenko
ebb0255e19
Remove a couple of useless casts in core headers
...
This helps users who compile their code with -Wuseless-cast.
2014-06-30 16:12:04 +04:00
Alexander Alekhin
5c8cd76893
fix bug with invalid signature size (should not be less than signatureLength())
2014-06-30 16:03:20 +04:00
Alexander Alekhin
3a8af7d691
fix python tests
2014-06-30 16:03:07 +04:00
Alexander Alekhin
acbabedac9
Merge pull request #2869 from ilya-lavrenov:tapi_warps
2014-06-30 11:59:13 +00:00
Alexander Alekhin
e0584bb818
Merge pull request #2876 from vbystricky:oclopt_integralsum
2014-06-30 10:06:54 +00:00
Alexander Alekhin
1493160f26
Merge pull request #2899 from ilya-lavrenov:tapi_ex
2014-06-30 10:05:24 +00:00
Alexander Alekhin
b304868d91
Merge pull request #2886 from ilya-lavrenov:tapi_inrange
2014-06-30 10:04:04 +00:00
Alexander Alekhin
667a9328fb
Merge pull request #2829 from ilya-lavrenov:tapi_cvtcolor
2014-06-30 10:02:41 +00:00
Michael Pratt
cac1218eef
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.
2014-06-29 20:08:13 -04:00
Ilya Lavrenov
654bdde8ed
SSE2 optimization of cv::preCornerDetect
2014-06-30 01:51:53 +04:00
Ernest Galbrun
5101a7fc00
replaced tabs by spaces
2014-06-27 15:41:39 +02:00
Mike Maraya
7936faf9a3
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737 )
2014-06-27 08:34:40 -04:00
Mike Maraya
5c85f816c9
Revert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737 )"
...
This reverts commit 56683e6d11
2014-06-27 08:20:22 -04:00
Mike Maraya
56683e6d11
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737 )
2014-06-27 08:02:01 -04:00
Mike Maraya
fbac578c79
Fixes resizeWindow() on OS X (Bug #3200 )
2014-06-27 23:26:09 -04:00
Alexander Karsakov
d5c99a07b6
Use fma only for Intel devices
2014-06-27 12:59:44 +04:00
Ilya Lavrenov
36db85a94d
optimized some operations
2014-06-27 12:52:29 +04:00
Alexander Alekhin
2d81595ed4
Merge pull request #2852 from ilya-lavrenov:tapi_abs
2014-06-27 08:21:06 +00:00
unknown
ade46bd428
Fixed typos in comments
2014-06-26 16:29:45 +02:00
Roman Donchenko
e8850bf84a
Merge pull request #2626 from KayKwon:matlab_formatter
2014-06-26 17:40:26 +04:00
Roman Donchenko
1576e24c93
Merge pull request #2672 from a-wi:findContours
2014-06-26 17:35:08 +04:00
Roman Donchenko
e89e3066e8
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
2014-06-26 17:29:27 +04:00
Roman Donchenko
1138fbb940
Merge pull request #2766 from akarsakov:pyr_border_constant
2014-06-26 17:28:44 +04:00
Roman Donchenko
e9bb750d4e
Merge pull request #2858 from 23pointsNorth:patch-3
2014-06-26 17:24:25 +04:00
Roman Donchenko
b0a70787e1
Merge pull request #2824 from abidrahmank:pylsd
2014-06-26 17:22:54 +04:00
vbystricky
1a73aa1f6a
Change local size
2014-06-26 15:43:40 +04:00
Ilya Lavrenov
16ab6ec534
ported changes from PR #2867
2014-06-26 13:52:44 +04:00
Ilya Lavrenov
a3592cd068
added ocl_** function
2014-06-26 13:18:03 +04:00
Ilya Lavrenov
ad9272e836
reverted to original plain C++ code
2014-06-26 13:13:01 +04:00
mlyashko
6f2fea7ea5
added perftest for moments
2014-06-26 13:05:43 +04:00
vbystricky
730ead44fe
Optimize OpenCL version of sepFilter2D
2014-06-26 12:46:03 +04:00
Andrey Pavlenko
d4f938ed56
Merge pull request #2894 from vpisarev:cleanup_project_tree1
2014-06-25 17:12:20 +00:00
Vadim Pisarevsky
c4fdf71bb3
fixed some more compile warnings on Windows
2014-06-25 20:22:56 +04:00
Roman Donchenko
436342d5f4
Merge pull request #2880 from GravityJack:SparseMatIterator-build-fix
2014-06-25 16:32:18 +04:00
Roman Donchenko
b21b8ff9d7
Merge pull request #2891 from nisargthakkar:dims_zero_on_release
2014-06-25 16:27:33 +04:00
Vadim Pisarevsky
8f2aaff6d7
fixed compile warnings on Windows
2014-06-25 16:17:52 +04:00
Fco. Javier Delgado del Hoyo
47e345bcb6
Change comment according to fix
2014-06-25 11:49:26 +02:00
Fco. Javier Delgado del Hoyo
a73809e6fc
Fix GCC 4.9 compiler warning
2014-06-25 11:46:05 +02:00
Vadim Pisarevsky
66f2e527b6
removed extra whitespaces
2014-06-24 23:05:24 +04:00
Vadim Pisarevsky
07c0d50edf
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.
2014-06-24 21:16:09 +04:00
Alexander Alekhin
ea2228774d
Merge pull request #2881 from mlyashko:moments_opt
2014-06-24 16:19:52 +00:00
Alexander Alekhin
ea1b14ee95
Merge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate
2014-06-24 16:12:42 +00:00
Vadim Pisarevsky
3858f2291d
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.
2014-06-24 19:18:51 +04:00
vbystricky
09bcc061dd
Change kernel for optimization. Remove restriction to align data
...
Fix kernel compilation errors on AMD system
Fix licanse information in cl file
Support CV_64F destination type
Change build options of the kernel
Optimize sum of square
Remove separate kernel for integral square
Increase epsilon for perfomance tests
Increase epsilon for perfomance tests
Test double support on AMD devices
Fix some issues
Try to fix problems with AMD device
Try to solve problem with AMD device
Fix error of destination size in kernel
Fix warnings
2014-06-24 18:32:52 +04:00
Jasper
f45da9866a
Fix for VTK6.2 issue.
2014-06-24 11:52:56 +01:00
Nisarg Thakkar
98421e5970
Fix for Bug#3757: All dimension values are 0 after release is called
2014-06-23 20:15:23 +05:30
Alexander Alekhin
6d4c4dcd94
Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix
2014-06-23 14:27:10 +00:00
Alexander Alekhin
4f1d06d14a
Merge pull request #2874 from vbystricky:ocl_LUTAMDfix
2014-06-23 14:23:26 +00:00
Ilya Krylov
84bb77e914
Fixed android and windows x64 build issues
2014-06-23 17:06:40 +04:00
Ilya Lavrenov
87f4b47a4f
optimized INTER_LINEAR mode
2014-06-23 16:25:05 +04:00
Ilya Lavrenov
e89cee35e5
optimized cv::inRange
2014-06-23 13:12:08 +04:00
Ilya Lavrenov
0528d2e2b3
added 32s to 32u conversion
2014-06-23 13:09:54 +04:00
Elena Gvozdeva
c23da52564
Fixed core for CCORR and SQDIFF. Used float instead of int for CV_8U. Fixed conditions for call dft.
2014-06-23 11:37:47 +04:00
Alexander Petrikov
6882970248
Add CV_Assert (ndisp % 8 == 0) to NEON version
2014-06-23 11:08:51 +04:00
mlyashko
44ffa42064
replaced factors computation by precomputed values, added kernel for
...
binary mode
2014-06-23 11:04:39 +04:00
Ilya Lavrenov
007593cab7
cvtColor - optimized index calculations; usage of build-in functions
2014-06-23 02:10:42 +04:00
Ilya Lavrenov
863784efc6
added extra condition
2014-06-22 19:18:14 +04:00
Alexander Alekhin
6952b90ed0
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
2014-06-20 13:49:14 +00:00
Alexander Karsakov
eeddda4701
Optimization of cv::pyrDown for 8UC1.
2014-06-20 16:46:51 +04:00
Alexander Alekhin
01a98fae93
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
2014-06-20 08:49:36 +00:00
Alexander Alekhin
6e0d77469a
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter
2014-06-20 08:47:51 +00:00
Alexander Alekhin
07446ec954
Merge pull request #2847 from ilya-lavrenov:tapi_pow
2014-06-20 08:47:18 +00:00
Alexander Alekhin
7688a18264
Merge pull request #2840 from ilya-lavrenov:tapi_calchist
2014-06-20 08:46:32 +00:00
Marc Rollins
05e0b3b7e6
Fixing build error when using post-increment operator.
2014-06-19 14:14:10 -07:00
vbystricky
655465d9f8
Increase epsilon for pass sanity check
2014-06-19 18:52:25 +04:00
vbystricky
eb54c83985
Fix error
2014-06-19 18:09:23 +04:00
Alexander Alekhin
d9daa0cbaa
ocl: added runtime flags for debugging
2014-06-19 17:52:46 +04:00
vbystricky
6d6ad1b1d9
Change threshold
2014-06-19 17:45:04 +04:00
vbystricky
b32fbe72f6
Add peromance tests for OCL integral sum of square
2014-06-19 17:07:09 +04:00
Roman Donchenko
6a94862fef
Merge pull request #2870 from 23pointsNorth:patch-5
2014-06-19 16:52:00 +04:00
Roman Donchenko
cb69a5c29a
Merge pull request #2868 from neo008:2.4
2014-06-19 16:51:37 +04:00
Andrey Pavlenko
75742fcd01
Merge pull request #2843 from berak:f_export_bow_24
2014-06-19 09:08:32 +00:00
Roman Donchenko
acebfcd24f
Merge pull request #2832 from BRAINSia:20140605_Upstream
2014-06-19 11:57:52 +04:00
Alexander Alekhin
c99ce0f427
Merge pull request #2846 from alalek:2.4_fix_python_warnings
2014-06-18 13:19:11 +00:00
Andrey Pavlenko
65953fe39a
Merge pull request #2863 from apavlenko:disable_cuda_stubs_defaults
2014-06-18 16:13:13 +04:00
vbystricky
ea6da6ee95
Change uchar2 to short
2014-06-18 15:44:56 +04:00
vbystricky
9391ccfe35
Move some variables into #ifdef
2014-06-18 15:03:09 +04:00
Hans Johnson
4c7ed03b5f
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.
2014-06-17 15:49:06 -05:00
Ilya Lavrenov
c41a134394
increased number of rows per work-item
2014-06-17 19:24:25 +04:00
Alexander Alekhin
ce5bae1c67
Merge pull request #2871 from vbystricky:oclopt_integral
2014-06-17 18:23:31 +04:00
Alexander Karsakov
06fb5da7c8
Removed storing of zeros in local memory
2014-06-17 17:24:11 +04:00
Elena Gvozdeva
dcaa8735ba
used vector data types for CCORR cn==1
2014-06-17 17:09:39 +04:00
Elena Gvozdeva
13db948023
added dft for CCORR
2014-06-17 17:09:38 +04:00
Elena Gvozdeva
82da445a15
changed CCOEFF cn==1
2014-06-17 17:09:38 +04:00
Elena Gvozdeva
a7036d9668
changed support for 3-channels, changed CCOEFF
2014-06-17 17:06:51 +04:00
Alexander Alekhin
1db9cc3f0d
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
2014-06-17 16:59:00 +04:00
Alexander Alekhin
04628d770c
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
2014-06-17 14:37:52 +04:00
Ilya Lavrenov
93712e913a
optimization of cv::warpAffine INTER_CUBIC
2014-06-17 00:47:19 +04:00
vbystricky
606df0469a
Fix pointer conversion
2014-06-16 18:14:05 +04:00
vbystricky
9bf296eeb0
Small refactoring
2014-06-16 17:17:16 +04:00
Ilya Lavrenov
c424d36041
optimized cv::boxFilter
2014-06-16 17:00:10 +04:00
Daniel Angelov
660d7cd3ae
Updated findHomography docs branch 2.4
...
Updated the documents to give warning to the users of `findHomography` that the function may return an empty matrix in some cases.
The user must take care of checking that.
2014-06-16 13:05:17 +01:00
Ilya Lavrenov
7391df386f
fixed usage of reshape
2014-06-16 15:19:13 +04:00
vbystricky
6550c4f682
Join kernel code for int and float destination types
2014-06-16 15:08:15 +04:00
Neo Alienson
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
Ilya Lavrenov
6dd658a0af
optimized cv::setIdentity
2014-06-16 13:41:43 +04:00
Alexander Alekhin
f269a89792
Merge pull request #2865 from ilya-lavrenov:morph
2014-06-16 13:35:57 +04:00
Alexander Alekhin
758a1eb63d
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
2014-06-16 13:22:03 +04:00
vbystricky
504bc7634a
Remove pre_invalid parameter
2014-06-16 13:07:39 +04:00
Ilya Lavrenov
d5244eb645
invoking OCL before IPP
2014-06-16 12:33:13 +04:00
Andrey Pavlenko
724f5e7f19
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
2014-06-16 11:18:52 +04:00
Daniel Angelov
54292a8376
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.
2014-06-14 18:41:04 +01:00
Sancho McCann
e1e243588e
Bugfix: Memory leak in deletion of er_stack nodes of ERFilter.
2014-06-12 11:02:06 -07:00
Vadim Pisarevsky
45f21e4f12
Merge pull request #2783 from daferna2:master
2014-06-12 21:41:28 +04:00
Vadim Pisarevsky
2c134318f7
Merge pull request #2784 from saree90:bugfix_Simplex
2014-06-12 21:41:10 +04:00
Vadim Pisarevsky
41ceadf9ed
Merge pull request #2799 from 23pointsNorth:patch-1
2014-06-12 21:40:53 +04:00
Vadim Pisarevsky
052c8516a8
Merge pull request #2845 from shaibagon:patch-1
2014-06-12 21:38:56 +04:00
Vadim Pisarevsky
2b2ce3f6e9
Merge pull request #2726 from Ilya-Krylov:2.4
2014-06-12 21:37:47 +04:00
Vadim Pisarevsky
3391caf434
Merge pull request #2779 from pemmanuelviel:kmeansppSquareDist
2014-06-12 21:35:28 +04:00
Ilya Lavrenov
7ccbe10970
fixed cv::warpPerspective
2014-06-12 15:17:24 +04:00
Ilya Lavrenov
316c044e06
used abs in reduction operations
2014-06-11 18:54:43 +04:00
Ilya Lavrenov
f1e24381d1
used abs
2014-06-11 18:33:46 +04:00
Ilya Lavrenov
b2c2aabd04
used built-in functions
2014-06-11 18:32:42 +04:00
Alexander Alekhin
14671e0cd6
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine
2014-06-11 14:41:29 +04:00
berak
3500c940d4
add Bag of Words to python wrapper
2014-06-11 11:50:22 +02:00
Elena Gvozdeva
feeb386bf3
Added support for 3-channels
2014-06-11 11:49:22 +04:00
Daniel Fernandes
b3655233f1
Changing #include to generic video.hpp
...
Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590
2014-06-11 02:00:21 -05:00
Alexander Alekhin
88ceee05c6
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
2014-06-10 22:21:09 +04:00
Ilya Lavrenov
33239fca70
cv::equalizeHist
2014-06-10 19:32:46 +04:00
Alexander Alekhin
96ce9810a9
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow
2014-06-10 19:32:03 +04:00
Ilya Lavrenov
c9528b3952
optimized histogram merging
2014-06-10 19:32:01 +04:00
Ilya Lavrenov
eeaa4b3665
eliminated convertTo
2014-06-10 19:32:01 +04:00
Ilya Lavrenov
c072c28e28
optimized cv::calcHist
2014-06-10 19:32:00 +04:00
Alexander Alekhin
071daa1d8f
Merge pull request #2839 from ilya-lavrenov:tapi_fix
2014-06-10 19:30:26 +04:00
Alexander Alekhin
bf39f694ea
Merge pull request #2835 from ilya-lavrenov:defects
2014-06-10 19:29:47 +04:00
Ilya Lavrenov
03f665e870
some optimizaions of cv::pow
2014-06-10 18:37:35 +04:00
Shai
91201b225a
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.
2014-06-10 17:31:18 +03:00
Alexander Alekhin
4d0848b3e8
fix -Wmaybe-uninitialized warning (initialize pointers to NULL)
2014-06-10 18:12:38 +04:00
Ilya Lavrenov
9edd24fe51
changed power in cv::pow test to test actual kernel
2014-06-10 17:41:43 +04:00
Ilya Lavrenov
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
Roman Donchenko
1f4ddbe5b6
Merge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info
2014-06-10 12:24:56 +04:00
Roman Donchenko
e0f40a7f4a
Merge pull request #2841 from SpecLad:merge-2.4
2014-06-10 11:50:12 +04:00
Alexander Alekhin
8681b52dba
Merge pull request #2838 from ilya-lavrenov:tapi_warnings
2014-06-09 20:25:28 +04:00
Ilya Lavrenov
634da9f3bf
added norm_inf support to minmaxloc kernel
2014-06-09 20:05:26 +04:00
Roman Donchenko
659d21332e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/spinimages.cpp
2014-06-09 18:03:03 +04:00
Ilya Lavrenov
0b2cafb08b
bixed cv::boxFilter
2014-06-09 17:09:44 +04:00
Ilya Lavrenov
cf72d2695c
fixed possible runtime error
2014-06-09 16:48:59 +04:00
Roman Donchenko
278616bada
Merge pull request #2813 from 23pointsNorth:patch-2
2014-06-09 15:58:24 +04:00
Ilya Lavrenov
ff6f5d4d24
fixed warnings
2014-06-09 15:54:10 +04:00
Roman Donchenko
ed1c56e063
Merge pull request #2817 from bf:patch-1
2014-06-09 15:06:07 +04:00
Roman Donchenko
150dd39b08
Merge pull request #2822 from timedia:akaze-java
2014-06-09 14:27:51 +04:00
Andrey Pavlenko
02b32d86d3
moving FaceRecognizer2 from public header to .cpp
2014-06-09 13:26:45 +04:00
Ilya Lavrenov
7f2662b310
fixes
2014-06-09 00:50:14 +04:00
Ilya Lavrenov
5403bdd228
optimized cv::norm with NORM_RELATIVE
2014-06-07 21:26:40 +04:00
Ilya Lavrenov
2040995801
optimized cv::norm with 2 args
2014-06-07 20:45:28 +04:00
berak
fc610979bb
export BOW to script wrappers
2014-06-07 16:34:53 +02:00
Richard Yoo
11a09ef5cc
Changes to support Intel AVX/AVX2 in cvResize().
2014-06-06 15:39:09 -07:00
atinfinity
f08d88fa78
fixed calculation method of "cv::TickMeter"
2014-06-07 07:29:22 +09:00
Ilya Lavrenov
1a7a262f74
optimized cv::norm with NORM_INF
2014-06-06 19:34:26 +04:00
Alexander Alekhin
e430ab1a58
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
2014-06-06 18:53:14 +04:00
Alexander Alekhin
ea417ac04a
Merge pull request #2755 from vbystricky:oclopt_LUT
2014-06-06 18:52:40 +04:00
Ilya Lavrenov
fd5a8b3e97
minmaxloc
2014-06-06 18:39:08 +04:00
Alexander Alekhin
f30301d171
Merge pull request #2801 from ilya-lavrenov:tapi_reduction
2014-06-06 18:38:22 +04:00
Konstantin Matskevich
59c8edfd98
facerec2
2014-06-06 15:57:11 +04:00
VBystricky
5d924b7a75
If lut table has one channel and src aligned to 4, work with src as with one channel matrix
2014-06-05 19:31:31 +04:00
VBystricky
0c0ebca855
Read 4 pixel for aligned data with 1 channel
2014-06-04 23:50:23 +04:00
VBystricky
8a5f2781fc
Fix kernel by comments
2014-06-04 20:13:42 +04:00
Alexander Alekhin
3f485d58bb
Merge pull request #2808 from ilya-lavrenov:tapi_normalize_mask
2014-06-04 18:10:13 +04:00
Alexander Alekhin
a42259421c
Merge pull request #2794 from mletavin:pullreq/140516-median
2014-06-04 16:36:37 +04:00
Ilya Lavrenov
405f12fe80
optimized cv::flip (CV_8UC1)
2014-06-04 14:21:42 +04:00
Alexander Alekhin
6d3413bc6a
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
2014-06-04 12:23:36 +04:00
Alexander Alekhin
c2ca059baf
Merge pull request #2798 from ilya-lavrenov:tapi_copymakeborder
2014-06-04 12:22:52 +04:00
Alexander Alekhin
ab9dff12d5
Merge pull request #2812 from arkunze:pullreq/140520-filter2D
2014-06-04 12:20:54 +04:00
Alexander Alekhin
ee8adc10a1
Merge pull request #2821 from ilya-lavrenov:tapi_reduce
2014-06-04 12:18:30 +04:00
Alexander Alekhin
a49ea6d066
Merge pull request #2826 from ilya-lavrenov:tapi_perf_warp
2014-06-04 12:11:54 +04:00
Roman Donchenko
85edb9e9b1
Merge pull request #1552 from Exocoder:gtk3
2014-06-04 12:07:17 +04:00
Aleksandr Petrikov
1a1cd9b4e9
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
2014-06-04 12:06:33 +04:00
Ilya Lavrenov
108527c951
added missed INTER_CUBIC
2014-06-03 21:46:30 +04:00
Alexander Alekhin
607cd37b48
Merge pull request #2750 from ilya-lavrenov:tapi_convertto
2014-06-03 16:36:48 +04:00
Ilya Lavrenov
2cc4cf3644
optimized cv::warpAffine
2014-06-03 13:45:22 +04:00
Muto Masayuki
518d0df201
Add AKAZE support for the Java wrapper
2014-06-03 18:41:58 +09:00
Alexander Alekhin
93af92c878
Merge pull request #2795 from ilya-lavrenov:tapi_setto
2014-06-03 13:21:05 +04:00
Alexander Alekhin
5e8a3cde94
Merge pull request #2757 from ElenaGvozdeva:ocl_flip
2014-06-03 13:19:42 +04:00
Ilya Lavrenov
26b73a7bbd
merged 2 kernels
2014-06-03 13:14:51 +04:00
abidrahmank
530fc99947
Issue #3709 - PyBindings for LSD
...
Corrected crashing in Python bindings while using LSD_REFINE_NONE flags
Corrected not drawing lines in drawSegments and compareSegments in Python bindings
2014-06-03 14:25:33 +05:30
Alexander Alekhin
72385979c4
Merge pull request #2761 from ilya-lavrenov:tapi_warpers
2014-06-02 20:37:17 +04:00
Roman Donchenko
c836613bad
Merge pull request #2819 from SpecLad:merge-2.4
2014-06-02 17:12:07 +04:00
mletavin
e224e72bbc
Added condition to use optimized kernels for images of size that multiple of 4 only
2014-06-02 15:58:59 +04:00
Ilya Lavrenov
ab428c9dbd
optimized cv::copyMakeBorder
2014-06-02 15:46:44 +04:00
Ilya Lavrenov
67bb1c6a70
optimized UMat::setTo
2014-06-02 15:39:36 +04:00
Ilya Lavrenov
17956a5ae5
optimized cv::normalize in case of mask
2014-06-02 15:33:19 +04:00
Alexander Alekhin
fc2f79701d
Merge pull request #2778 from vbystricky:oclopt_reduce
2014-06-02 13:57:57 +04:00
Alexander Alekhin
a049c16ca7
Merge pull request #2751 from akarsakov:ocl_thresh_opt
2014-06-02 13:54:31 +04:00
Roman Donchenko
33087f9eaa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-06-02 13:43:28 +04:00
Benjamin Flesch
62533d0d26
perspectiveTransform simplify assert() for better debuggin
...
When using perspectiveTransform in rather complicated settings, it would be easier for developers to have two separate assertions for each part of the boolean expression in order to pinpoint problems more efficiently. In my case I am struggling in Python2.7 with finding out whether scn+1 == m.cols or the depth == CV_32F || depth == CV_64F is making a problem, which is kind of hard.
2014-06-02 00:27:32 +02:00
Ehren Metcalfe
cd3aa0184a
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389 )
2014-05-31 19:41:16 -04:00
Alexander Alekhin
abe37659cc
Merge pull request #2811 from arkunze:pullreq/140516-erode
2014-06-01 02:30:39 +04:00
Alexander Alekhin
78badcd651
Merge pull request #2781 from ilya-lavrenov:tapi_meanstddev
2014-05-31 22:50:44 +04:00
Alexander Alekhin
89e4118b30
Merge pull request #2809 from ilya-lavrenov:tapi_copy_perf
2014-05-31 22:49:34 +04:00
Alexander Alekhin
17d6083e01
Merge pull request #2787 from ilya-lavrenov:tapi_repeat
2014-05-31 22:46:21 +04:00
aletheios
1020a93fa3
Bugfix #3705 : params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
2014-05-31 18:44:32 +02:00
Daniel Angelov
ce1b6e2137
Fixed inconsistency with flag names
...
Fixed inconsistency with flag names for solvePnP.
The default value for the function lacks the CV_ prefix. The code checks against "ITERATIVE". The suggested values for the parameters *include* the prefix.
Even though the enum CV_ITERATIVE (+ CV_P3P, CV_EPNP) = ITERATIVE (& P3P, EPNP), lets show to the users only one of them.
Now the user sees only {ITERATIVE, P3P, EPNP}.
2014-05-30 23:59:32 +01:00
Alexander Alekhin
d4a1936c2d
Merge pull request #2807 from alalek:disable_tests_KAZE
2014-05-30 19:11:08 +04:00
Ilya Lavrenov
80470f9cf6
added performance test
2014-05-30 18:34:04 +04:00
Ilya Lavrenov
7f818e9bc3
optimized UMat::copyTo with mask
2014-05-30 18:27:55 +04:00
Alexander Alekhin
6126788535
Merge pull request #2800 from krodyush:pullreq/140516-opticalflow-imgext-fix
2014-05-30 16:35:23 +04:00
krodyush
2e2ca58b70
fix according review
2014-05-30 15:44:51 +04:00
Alexander Alekhin
d210132b99
Merge pull request #2638 from mlyashko:floodfill_perftest
2014-05-30 00:42:42 +04:00
Alexander Alekhin
316e6a8f2b
Merge pull request #2804 from ilya-lavrenov:tapi_perf
2014-05-30 00:38:11 +04:00
Alexander Alekhin
776728ef2a
KAZE: disable tests (too many crashes)
2014-05-29 23:12:48 +04:00
Ilya Lavrenov
d156f5af6d
added missed tests for cv::norm, cv::normalize
2014-05-29 16:00:38 +04:00
Roman Donchenko
67e9708621
Merge pull request #2773 from abidrahmank:pycascade
2014-05-29 14:51:45 +04:00
Roman Donchenko
9a5e9d3442
Merge pull request #2771 from SpecLad:pvs-checks-opencv
2014-05-29 14:50:42 +04:00
Roman Donchenko
f57f39276a
Merge pull request #2782 from HapeMask:py3_flann
2014-05-29 14:40:38 +04:00
mlyashko
f0e3940558
perftest for floodfill
2014-05-29 13:36:13 +04:00
Ilya Lavrenov
c52a77b90f
optimized cv::UMat::dot
2014-05-29 13:16:16 +04:00
Ilya Lavrenov
579499d900
optimized cv::sum (CV_8UC1)
2014-05-28 19:46:08 +04:00
Ilya Lavrenov
002a79bfc4
optimized cv::countNonZero
2014-05-28 18:42:42 +04:00
Ilya Lavrenov
7804d57f8b
optimized index calculation
2014-05-28 18:01:03 +04:00
Ilya Lavrenov
33173d900a
optimized cv::meanStdDev
2014-05-28 17:55:30 +04:00
Elena Gvozdeva
437927b7bb
optimized index access
2014-05-28 16:27:08 +04:00
Alexander Alekhin
5a268dd27c
Merge pull request #2797 from ElenaGvozdeva:ocl_MT
2014-05-28 13:39:48 +04:00
mletavin
68883775fb
Adding explicit variable conversion in ocl_medianFilter() to suppress build errors on Linux & Mac
2014-05-28 13:30:50 +04:00
Alexander Alekhin
0ea572d772
Merge pull request #2796 from berak:b_3674_24
2014-05-28 13:28:30 +04:00
berak
2bacd8b702
2 fixed unassigned reshapes in em ( #3674 )
2014-05-28 10:37:16 +02:00
krodyush
153ac43d3b
opencl opticaflow fix that enables buffer2image extension
2014-05-28 10:34:11 +04:00
Daniel Angelov
3ab3367310
Updating missed defines in documentation
...
Updating missed defines in documentation. The new defines (in imgproc.hpp) state they have a prefix of COLOR instead of CV.
2014-05-27 18:09:12 +01:00
Alexander Alekhin
c9db91ace5
Merge pull request #2788 from alalek:icv_public
2014-05-27 18:52:02 +04:00
mletavin
df9c75b270
Moved new kernels under conditional compilation to disable their build for 3-channel images; added condition to use new kernels only for images that are big enough
2014-05-27 16:16:00 +04:00
Elena Gvozdeva
40eea303ec
OCL: matchTemplate: changed perf test
2014-05-27 14:31:11 +04:00
Alexander Karsakov
8e54845049
Removed useless multiplication by 4
2014-05-27 10:52:20 +04:00
vbystricky
b4498d1d48
Fix some errors
2014-05-26 16:55:31 +04:00
vbystricky
63584bffda
fix code in the kernel
2014-05-26 16:54:26 +04:00
vbystricky
04433b2d2b
Change buffer cols count from 64 to 32
2014-05-26 16:54:25 +04:00
vbystricky
169351b01d
Optimize openCL version of reduce function
2014-05-26 16:54:25 +04:00
vbystricky
cfabf32492
Fix some errors
2014-05-26 16:53:01 +04:00
vbystricky
48d82fd911
Fix some errors
2014-05-26 16:53:01 +04:00
vbystricky
a8bfab3cb7
Optimize OpenCL LUT function
2014-05-26 16:53:00 +04:00
vbystricky
6667cea0f4
Optimize OpenCL LUT function
2014-05-26 16:53:00 +04:00
vbystricky
72727111c7
Use 4 pixels for one unit. Some ocl code refactoring
2014-05-26 16:52:59 +04:00
vbystricky
47b092e527
Optimize OpenCL LUT function
2014-05-26 16:52:59 +04:00
mletavin
4a37ac303a
Added new Intel-optimized 3x3 and 5x5 kernels to medianFilter.cl file and corresponding code to host in smooth.cpp
...
Only Intel platform and 1 channel images are supported.
2014-05-26 15:54:18 +04:00
Alexander Alekhin
e6f6905868
run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag
2014-05-26 14:32:52 +04:00
Ilya Lavrenov
50fa809a96
fixed cv::mixChannels
2014-05-26 14:20:16 +04:00
Alexander Karsakov
5022a0fae3
Added new border types for pyrDown
2014-05-26 13:57:03 +04:00
Alexander Alekhin
766600529b
run.py: added --android_env parameter
2014-05-26 13:27:31 +04:00
Ilya Lavrenov
ec3c68c8ea
fix
2014-05-26 12:19:07 +03:00
Ilya Lavrenov
bd5e4c6c49
other kernels now use row scheme
2014-05-26 12:19:06 +03:00
Ilya Lavrenov
15738bf7ef
multiple rows in KF kernel
2014-05-26 12:19:06 +03:00
Ilya Lavrenov
5ee398bfd6
multiple rows per work-item
2014-05-26 12:19:05 +03:00
Roman Donchenko
0a2d22bf31
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-05-26 12:32:14 +04:00
Alexander Alekhin
ab2749d648
Merge pull request #2709 from alalek:icv_update_binary_pack
2014-05-23 15:09:43 +04:00
Alexander Karsakov
4910242732
Unroll pyrUp kernel
2014-05-23 14:58:34 +04:00
Alexander Alekhin
52ba76143c
icv: fix test eps on Mac for failed perf test
2014-05-23 14:54:09 +04:00
Ilya Lavrenov
c83455d8a4
optimized cv::repeat
2014-05-23 13:16:27 +03:00
Alexander Alekhin
c43e32854a
Merge pull request #2713 from alalek:icv_enable_fns
2014-05-23 13:35:45 +04:00
Roman Donchenko
09f9b35bc6
Merge pull request #2742 from StevenPuttemans:feature_3176
2014-05-22 18:03:56 +04:00
Saree90
7f7064e3b9
DownhillSolverImpl::innerDownhillSimplex something looks broken here:
...
Mat_<double> coord_sum(1,ndim,0.0),buf(1,ndim,0.0),y(1,ndim,0.0);
nfunk = 0;
for(i=0;i<ndim+1;++i)
{
y(i) = f->calc(p[i]);
}
y has only ndim elements, while the loop goes over ndim+1
2014-05-22 22:52:37 +10:00
StevenPuttemans
fea4396023
Added more info on the data input variable of kmeans
2014-05-22 12:56:44 +02:00
Alexander Alekhin
7249622ce7
Merge pull request #2772 from akarsakov:ocl_pyramids
2014-05-22 13:23:50 +04:00
Alexander Alekhin
694d7726b5
Merge pull request #2762 from ilya-lavrenov:ipp_sort
2014-05-22 12:30:53 +04:00
Daniel Fernandes
a0459c2352
Merge branch 'master' of https://github.com/Itseez/opencv
2014-05-21 17:59:10 -05:00
Daniel Fernandes
6598b97b96
Fixed MATLAB bridge
...
MATLAB bridge.hpp was missing definition for Ptr<DenseOpticalFlow>
2014-05-21 17:57:35 -05:00
Gabe Schwartz
c19b6ed20e
Fixed pyopencv_to w/FLANN IndexParams in python3.
...
The keys() and values() functions on dictionaries in Python 3 no longer
return lists. pyopencv_to() for flann::IndexParams now iterates over
the dictionary in a way that is version-agnostic.
2014-05-21 15:21:41 -04:00
Alexander Alekhin
d940093fb5
Merge pull request #2723 from ilya-lavrenov:tapi_intel_vector_width
2014-05-21 19:56:00 +04:00
Alexander Alekhin
cf5dd88cf2
Merge pull request #2776 from ilya-lavrenov:tapi_meanstddev
2014-05-21 17:43:29 +04:00
Pierre-Emmanuel Viel
ec99f96c62
Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance)
2014-05-21 13:16:12 +02:00
Pierre-Emmanuel Viel
2f8b5731da
Fix local variable shadowing
2014-05-21 12:27:38 +02:00
Alexander Karsakov
fa1ed5580d
Fixed cv::pyrUp performance test
2014-05-21 14:09:21 +04:00
Ilya Lavrenov
0e1b37675c
added performance test for cv::meanStdDev with mask
2014-05-21 11:50:31 +04:00
Alexander Alekhin
7032a5a46c
Merge pull request #2763 from ilya-lavrenov:tapi_perf_norm_relative
2014-05-21 11:44:25 +04:00
Aaron Kunze
ab1a37d564
Bug fixes for filter2D and associated tests.
2014-05-20 22:30:09 -07:00
Konstantin Matskevich
8d4a76925c
fixed binary compatibility
2014-05-21 09:25:15 +04:00
abidrahmank
31291ced11
Issue #2540 : Python bindings for various "detectMultiScale()"
2014-05-21 08:26:16 +05:30
Pierre-Emmanuel Viel
00367cfb00
Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
2014-05-21 01:31:52 +02:00
Pierre-Emmanuel Viel
e63d7de87c
Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances
2014-05-20 22:52:11 +02:00
Daniel Angelov
3ca7717e17
Fixed scanning bug identified in comments in pull request #1119 .
...
NFA calculations now generate better line segments.
2014-05-20 21:25:31 +01:00
Alexander Karsakov
511ed4388e
Disabled BORDER_CONSTANT for pyramid functions.
2014-05-20 17:28:47 +04:00
Hernan Badino
bcd63766ce
Merge branch '2.4' of https://github.com/Itseez/opencv into Itseez-2.4
2014-05-20 09:27:59 -04:00
Roman Donchenko
7ea1bf3cf0
Fixed several problems found by PVS-Studio.
...
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/ > that are not already fixed and are
not in 3rdparty or the legacy module.
The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
2014-05-20 13:54:00 +04:00
Ilya Krylov
3678020c28
Added license to source files
2014-05-20 12:37:37 +04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Ilya Krylov
0d2fab86b4
Changed documentation for namespace fisheye
2014-05-19 18:16:00 +04:00
Hernan Badino
ca40d635e4
Switched insertion of connected components in filterSpecklesImpl
2014-05-19 10:12:07 -04:00
Ilya Krylov
651b13f72a
Refactored class Fisheye to namespace fisheye
2014-05-19 17:55:32 +04:00
Roman Donchenko
bea46c90b5
Remove a useless loop that copies an array to itself
2014-05-19 17:38:30 +04:00
Vadim Pisarevsky
0b4eb6a964
Merge pull request #2509 from euphrat:mog2_bgimg_gray
2014-05-19 17:36:38 +04:00
Vadim Pisarevsky
c6113c6cb3
Merge pull request #2630 from isarandi:concat_corr
2014-05-19 17:36:20 +04:00
Vadim Pisarevsky
8bd1efa523
Merge pull request #2673 from BloodAxe:kaze
2014-05-19 17:35:22 +04:00
Vadim Pisarevsky
934cb6c452
Merge pull request #2680 from adrians:remove_cv_err
2014-05-19 17:35:03 +04:00
Vadim Pisarevsky
988b108858
Merge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI
2014-05-19 17:34:45 +04:00
Vadim Pisarevsky
44acfc38a1
Merge pull request #2739 from StevenPuttemans:bug_1523
2014-05-19 17:33:36 +04:00
Vadim Pisarevsky
e30939f09b
Merge pull request #2738 from kevmitch:2.4
2014-05-19 17:33:22 +04:00
Vadim Pisarevsky
118b27f5b4
Merge pull request #2744 from jet47:kmeans-fix
2014-05-19 17:33:10 +04:00
Vadim Pisarevsky
165789bfcd
Merge pull request #2764 from hbadino:Feature_3692
2014-05-19 17:30:18 +04:00
Roman Donchenko
eded87de5b
Merge pull request #2754 from thoinvil:patch-1
2014-05-19 15:41:28 +04:00
StevenPuttemans
12207ac763
fix coordinate problem with large images - bug 1523
2014-05-19 13:07:44 +02:00
Roman Donchenko
cba5235f08
Merge pull request #2698 from GregoryMorse:patch-2
2014-05-19 14:52:58 +04:00
Roman Donchenko
f77aa45cfb
Merge pull request #2735 from StevenPuttemans:bug_2000
2014-05-19 14:25:47 +04:00
StevenPuttemans
7fc764f5e5
added documentation for findContours
2014-05-19 11:44:25 +02:00
Roman Donchenko
f0b0d4e867
Merge pull request #2685 from znah:ocl_control_py
2014-05-19 13:38:36 +04:00
Roman Donchenko
06b335b2d7
Merge pull request #2733 from StevenPuttemans:bug_2162
2014-05-19 13:04:54 +04:00
Roman Donchenko
62e0759ba2
Merge pull request #2719 from yashdv:patch-1
2014-05-19 13:00:32 +04:00
Konstantin Matskevich
a46f119fdf
docs fixes
2014-05-19 09:54:15 +04:00
Kazuki Matsuda
fa292c3d8d
Implimentation "cv::Mat::forEach"
...
I propose forEach method for cv::Mat and cv::Mat_.
This is solution for the overhead of MatIterator_<_Tp>.
I runs a test that micro opecode runs all over the pixel of cv::Mat_<cv::Point3_<uint8_t>>.
And this implementation 40% faster than the simple pointer, 80% faster than iterator.
With OpenMP, 70% faster than simple pointer, 95% faster than iterator (Core i7 920).
Above all, code is more readable.
My test code is here.
https://gist.github.com/kazuki-ma/8285876
Thanks.
2014-05-18 11:01:45 +09:00
pradeep
c5b4b99350
Implemented Kullback-Leibler divergence
2014-05-17 23:44:31 +08:00
Hernan Badino
9a371de93b
Switched insertion of connected components in filterSpecklesImpl
2014-05-16 18:49:45 -04:00
Ilya Lavrenov
1e46a99d9f
added performance test for cv::norm with NORM_RELATIVE
2014-05-16 14:15:31 +04:00
Ilya Lavrenov
eb1dd1900b
fixed conditions
2014-05-16 12:18:35 +04:00
Elena Gvozdeva
c7dc884855
T-API: optimized ocl_flip
2014-05-16 11:01:10 +04:00
Alexander Karsakov
8ecb8c6a3d
Optimized memory access by using stride pattern
2014-05-16 10:22:03 +04:00
Aaron Kunze
033aebe668
A more efficient workaround for erode
2014-05-15 16:31:24 -07:00
Ilya Lavrenov
f3440888ef
optimized stitching warpers
2014-05-15 16:28:34 +04:00
Elena Gvozdeva
ce0b808e3c
IPP: fixed ipp_matchTemplate
2014-05-15 13:05:27 +04:00
Vladislav Vinogradov
746185652a
add additional tests for different input cases
2014-05-15 12:08:38 +04:00
Vladislav Vinogradov
f16503743f
use more accurate reshape
2014-05-15 12:08:01 +04:00
thoinvil
ea038436e6
Added condition to 1st test in cv::GaussianBlur
...
Consistent with the test made in cv::boxFilter, it adjusts the kernel size to the source size only if the border is not BORDER_CONSTANT and if BORDER_ISOLATED is set. Otherwise, the source has to be considered possibly in a larger image (i.e. the source being a ROI) in witch the kernel should apply.
2014-05-15 08:40:13 +02:00
Ilya Krylov
c30fef1f9d
Fixed build issues
2014-05-14 18:58:39 +04:00
Alexander Mordvintsev
a52979c37f
exposed TVL1 optical flow to python
2014-05-14 17:45:21 +04:00
Alexander Mordvintsev
2756ae2051
exposed OpenCL-control functions to python
2014-05-14 17:42:21 +04:00
Roman Donchenko
cafcfc4d0f
Merge pull request #2749 from jet47:fix-bug-3678
2014-05-14 17:25:19 +04:00
Roman Donchenko
55bff44810
Merge pull request #2747 from jet47:gpu-resize-stream-fix
2014-05-14 16:34:48 +04:00
Vladislav Vinogradov
f1e44fa5ca
fix bug #3678 (cuda::integral failures)
2014-05-14 12:48:12 +04:00
Roman Donchenko
f13e05cdcb
Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix
2014-05-14 12:40:19 +04:00
Roman Donchenko
75a1743f35
Merge pull request #2745 from yashdv:patch-3
2014-05-14 12:38:43 +04:00
Alexander Alekhin
46d672dcc3
Merge pull request #2663 from ilya-lavrenov:ipp_slow
2014-05-14 12:30:05 +04:00
Vladislav Vinogradov
7e2f7f45d7
fix bug #3690
...
removed invalid condition, it is always false
2014-05-14 10:47:28 +04:00
Vladislav Vinogradov
1f72873c55
fix cv::gpu::resize function
...
add missing stream parameter to call_resize_linear_glob
2014-05-14 10:31:28 +04:00
Ievgen Khvedchenia
12e1d7fc2b
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 21:07:30 +03:00
Roman Donchenko
ed5d71b45f
Merge pull request #2724 from znah:python_autowrap
2014-05-13 19:50:01 +04:00
Yash Vadalia
7e56cfafbc
fixed a syntax error in cap_giganetix.cpp
...
Ticket 3458 (http://code.opencv.org/issues/3458 )
2014-05-13 19:59:37 +05:30
Yash Vadalia
6ecd553810
Added doc for LinearPolar Transform
2014-05-13 19:36:43 +05:30
Vladislav Vinogradov
55a714c83b
fix cv::kmeans function
...
reshape input matrix, since the function works with data
as with [N x dims] matrix
2014-05-13 18:00:17 +04:00
Alexander Mordvintsev
dd67ea0210
find -> rindex
2014-05-13 17:55:57 +04:00
Alexander Karsakov
4612b4b827
Added clamp() for THRESH_TRUNC mode
2014-05-13 15:21:47 +04:00
Ilya Lavrenov
d16e0b377f
disabled IPP functions that slower than OpenCV
2014-05-13 15:06:38 +04:00
Roman Donchenko
4a24ecd176
Merge pull request #2731 from StevenPuttemans:bug_2626
2014-05-13 14:21:36 +04:00
Ilya Lavrenov
f64dfeb222
fix for cv::norm (norm_inf)
2014-05-13 14:21:07 +04:00
Roman Donchenko
2cf6cea90f
Merge pull request #2730 from StevenPuttemans:bug_2740
2014-05-13 14:19:42 +04:00
Roman Donchenko
c607dadc49
Merge pull request #2729 from StevenPuttemans:bug_3252
2014-05-13 14:17:09 +04:00
Ievgen Khvedchenia
87972d0d7c
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 13:15:24 +03:00
Kevin Mitchell
63e508abd2
doc: update/clarify behaviour of mask in floodFill
...
Clarify how the mask parameter is set on output and how this is
affected by the flags parameter.
resolves Feature #2942
2014-05-13 02:26:59 -07:00
StevenPuttemans
006956c324
Fixing as suggested in bug 2626, made naming same for both C, C++ and python API
2014-05-13 11:02:01 +02:00
Roman Donchenko
ff2d76ec0d
Merge pull request #2699 from GregoryMorse:patch-1
2014-05-13 11:58:25 +04:00
Roman Donchenko
bc7b21609a
Merge pull request #2692 from 1Hyena:2.4
2014-05-13 11:56:12 +04:00
Roman Donchenko
f0547e5e05
Merge pull request #2727 from StevenPuttemans:bug_3484
2014-05-13 11:55:17 +04:00
Roman Donchenko
ea5b411c0f
Merge pull request #2725 from SpecLad:merge-2.4
2014-05-13 11:53:30 +04:00
1Hyena
6c118ebc51
Changed ostringstream to ostream for new print_params and added the old
...
version of print_params for backwards compatibility.
2014-05-12 23:01:44 +03:00
StevenPuttemans
a0a8fb4fd9
fixed bug 2626
2014-05-12 16:43:07 +02:00
Roman Donchenko
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
StevenPuttemans
e96de8821c
bug 2740 added fix
2014-05-12 15:26:56 +02:00
StevenPuttemans
b382984810
fix bug 3252
2014-05-12 15:01:15 +02:00
StevenPuttemans
2b4241c10b
fixed bug 3484
2014-05-12 14:40:12 +02:00
Ilya Lavrenov
1e5694e082
heuristic for Intel
2014-05-12 16:08:39 +04:00
Alexander Mordvintsev
120b3a1e77
Work on python wrapped generation automation:
...
- all parsed headers are included into "cv2.cpp" with "pyopencv_generated_include.h"
- types starting with "Ptr_" converted to "Ptr<...>" form (avoids many typedefs in "cv2.cpp")
2014-05-12 15:49:54 +04:00
Alexander Alekhin
1f638a3e5b
icv: enable functions
2014-05-12 15:38:38 +04:00
Ilya Krylov
e4a9c0f184
Fixed review comments
2014-05-12 15:37:47 +04:00
Alexander Alekhin
e1b5a547cc
Merge pull request #2722 from ilya-lavrenov:tapi_luv_eps
2014-05-12 13:03:36 +04:00
Alexander Alekhin
7ac5c367e9
Merge pull request #2715 from akarsakov:fix_corner_min_eigen
2014-05-12 13:03:19 +04:00
Ilya Lavrenov
e2558e5ee5
increased eps to pass tests
2014-05-12 11:54:15 +04:00
Konstantin Matskevich
d67c9aabff
docs
2014-05-12 10:09:39 +04:00
Luis Zarrabeitia
bb5a22c504
highgui: fix segfault on CvCapture_GStreamer::retrieveFrame
...
CvCapture_GStreamer::retrieveFrame assumes that RGB videos are 24BPP.
This is not necesarily the case, unless we explicitly tell GStreamer
that we want 24BPP RGB streams.
Adding bpp=(int)24 to the appsink caps.
2014-05-11 19:00:14 -04:00
Ievgen Khvedchenia
03db61b33b
FixFix documentation warnings
2014-05-10 23:06:23 +03:00
Ievgen Khvedchenia
029a8c443a
Remove GSURF descriptor from KAZE algorithm
2014-05-10 20:57:37 +03:00
Ievgen Khvedchenia
a068ccbf51
Fix "Title underline too short" warning
2014-05-09 22:53:28 +03:00
Ievgen Khvedchenia
616c348536
Fix documentation warnings
2014-05-09 22:31:20 +03:00
Ievgen Khvedchenia
3a8e15fad9
Fix documentation warnings
2014-05-09 22:21:26 +03:00
Ievgen Khvedchenia
c4e49463a9
Initial commit of the KAZE & AKAZE docs
2014-05-09 19:35:41 +03:00
Ievgen Khvedchenia
b42c268164
Temporary remove of CV_WRAP
2014-05-09 19:34:54 +03:00
Ievgen Khvedchenia
1a5fcd715d
Refactor of KAZE and AKAZE:
...
1) Clean-up from the unused code
2) Remove of SURF extraction method
3) Enabled threading for KAZE extraction
4) Exposed new properties for runtime configuration
2014-05-09 18:46:00 +03:00
Alexander Alekhin
eba1be711c
Merge pull request #2710 from ilya-lavrenov:ipp_threshold
2014-05-08 17:33:27 +04:00
Alexander Karsakov
4e7f62fd24
Fixed ipp check for cornerMinEigenVal
2014-05-08 17:32:21 +04:00
Alexander Alekhin
c74fed1fcf
Merge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings
2014-05-08 17:04:18 +04:00
Alexander Alekhin
a82dd8ce48
Merge pull request #2700 from ilya-lavrenov:tapi_cvtColor
2014-05-08 17:01:38 +04:00
Alexander Alekhin
eb240cc206
Merge pull request #2697 from PhilLab:master
2014-05-08 16:57:50 +04:00
Konstantin Matskevich
aa76ef9a98
fixes
2014-05-08 15:55:55 +04:00
Ilya Lavrenov
11b01cd8b9
added ipp threshold inplace
2014-05-08 13:51:25 +04:00
Ilya Lavrenov
19a2495067
fixed IPP related warnings
2014-05-08 13:31:27 +04:00
Vladislav Vinogradov
77275031ab
finally fix cv::subtract
2014-05-08 13:11:42 +04:00
Ilya Krylov
349ff631a5
Added sample of work of Fisheye::undistortImage and its description to documentation. Removed readPoints and readExtrinsic (useless)
2014-05-07 20:53:07 +04:00
thoinvil
e50ef2dab5
Bugfix #3668 removed the comment
2014-05-07 18:27:08 +02:00
Vladislav Vinogradov
629461c836
fix output matrix allocation in cv::subtract
2014-05-07 19:52:35 +04:00
Alexander Alekhin
35eb972e9a
fix compilation on MSVS 2010
2014-05-07 15:20:29 +00:00
Alexander Alekhin
72e095b8a5
Merge pull request #2665 from ilya-lavrenov:ipp_filter2d
2014-05-07 19:17:57 +04:00
Alexander Alekhin
07d5f56707
Merge pull request #2679 from alalek:ippicv_update
2014-05-07 18:24:41 +04:00
Ilya Lavrenov
3ccaa5294e
added OpenCL RGB <-> Luv conversions
2014-05-07 18:09:57 +04:00
Alexander Alekhin
9c780260c2
Merge pull request #2605 from akarsakov:ipp_min_eigen_val
2014-05-07 18:01:44 +04:00
Alexander Alekhin
849228ac6a
Merge pull request #2684 from ElenaGvozdeva:ippiDFT
2014-05-07 17:57:17 +04:00
Alexander Alekhin
9e47672b2b
Merge pull request #2658 from akarsakov:ipp_hough
2014-05-07 17:07:22 +04:00
Alexander Alekhin
e2c7adc7c4
Merge pull request #2703 from jet47:subtract-create-dst-mat
2014-05-07 16:50:50 +04:00
Alexander Alekhin
d54aa307fd
Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur
2014-05-07 16:49:59 +04:00
Konstantin Matskevich
36afd4ef55
added additionalInfo in faceRecognition
2014-05-07 16:29:55 +04:00
Ilya Lavrenov
abf905154f
cv::fitler2D
2014-05-07 15:47:10 +04:00
Ilya Lavrenov
1ad69aba35
changes sigma in perf tests
2014-05-07 14:59:03 +04:00
Alexander Alekhin
0e1bf58195
Merge pull request #2634 from ElenaGvozdeva:ippiDCT
2014-05-07 14:49:13 +04:00
Vladislav Vinogradov
4c66614e07
fix cv::subtract function:
...
call dst.create(...) before using it
2014-05-07 13:15:19 +04:00
Alexander Alekhin
b1a28a52fa
Merge pull request #2693 from mvukad:bugfix_ippmorphop
2014-05-07 13:15:09 +04:00
GregoryMorse
38db7a78df
WinRT core compatibility fixes
...
Update system.cpp
Update system.cpp
Update system.cpp
Update matching.cpp
Update matching.cpp
2014-05-07 06:17:37 +08:00
GregoryMorse
b1443bc1bc
WinRT core compatibility fixes
...
Update system.cpp
Update system.cpp
Update ocl.cpp
Update matching.cpp
Update ocl.cpp
Update matching.cpp
2014-05-07 06:15:54 +08:00
Thierry Hoinville
5efd2056f0
Bugfix #3668 in FilterEngine::apply(), use the ROI properly
2014-05-06 15:33:07 +02:00
Alexander Karsakov
f6a8ac2f6c
Changed check condition in tests in case ipp disabled.
2014-05-06 15:24:54 +04:00
Elena Gvozdeva
12279e2631
fixed
2014-05-06 14:49:03 +04:00
Alexander Alekhin
01f31dc007
Merge pull request #2687 from ilya-lavrenov:tapi_norm_inf_234cn
2014-05-06 13:27:03 +04:00
Elena Gvozdeva
e362c3fb38
fixed
2014-05-06 13:09:45 +04:00
Alexander Alekhin
03b1d133df
Merge pull request #2660 from arkunze:pullreq/140423-filter2D
2014-05-06 12:59:03 +04:00
Ilya Krylov
1f94b7dfc9
minor
2014-05-06 11:17:10 +04:00
Ilya Krylov
ef01044b2f
Added documentation for Fisheye::stereoCalibrate
2014-05-06 11:09:22 +04:00
Ievgen Khvedchenia
220de14077
Clean-up from the dead code
2014-05-05 21:48:54 +03:00
PhilLab
4ffeb01cfd
Update solvepnp.cpp
...
Clarified assert message for allowed PnP flags
2014-05-05 17:44:59 +02:00
Alexander Alekhin
e9be486534
Merge pull request #2694 from rokm:matlab
2014-05-05 19:24:07 +04:00
Alexander Alekhin
787815fd00
Merge pull request #2619 from GregoryMorse:patch-3
2014-05-05 18:00:40 +04:00
Alexander Alekhin
59cf62ad9e
Merge pull request #2636 from atrebbi:#3653
2014-05-05 18:00:18 +04:00
Ilya Krylov
50b291995a
Added tests for stereoCalibrate
2014-05-05 17:23:03 +04:00
Alexander Alekhin
a5378186e5
Merge pull request #2688 from akarsakov:ipp_disable_resize_8u
2014-05-05 15:21:13 +04:00
Alexander Alekhin
d9d9de75db
Merge pull request #2686 from vbystricky:ippicv_integral
2014-05-05 15:20:47 +04:00
Alexander Alekhin
347d5b96f3
Merge pull request #2635 from akarsakov:gaussian_float_intel
2014-05-05 15:20:20 +04:00
Alexander Karsakov
eda084e123
Used AutoBuffer instead ippsMalloc
2014-05-05 14:40:59 +04:00
Ilya Krylov
c2341fd446
Added stereoCalibrate for Fisheye camera model
2014-05-05 14:21:24 +04:00
Rok Mandeljc
c35fd55b0e
Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}"
2014-05-03 17:37:48 +02:00
Rok Mandeljc
fa075c50a1
Matlab bindings: fixed the functional template to perform an explicit cast to the type of an input option that is expected. This avoids issues with ternary operator not having the same type in rvalue and lvalue, such as in the case below:
...
Ptr_FeatureDetector blobDetector = inputs[3].empty() ? makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();
Which after the patch, would be:
Ptr_FeatureDetector blobDetector = inputs[3].empty() ? (Ptr_FeatureDetector) makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();
2014-05-03 17:37:48 +02:00
Rok Mandeljc
2d47dd7038
Matlab bindings: added missing compound type declarations from photo module
2014-05-03 17:37:47 +02:00
Ievgen Khvedchenia
e7e00201f1
Enabled parallel processing of the nld_step_scalar function
2014-05-02 14:07:30 +03:00
Ievgen Khvedchenia
9fc90f4069
Merged nldiffusion functions into one module with removal of duplicate functions
2014-05-01 22:24:15 +03:00
Michael Vukadinovic
c1aee0c312
Fixed bug in IPPMorphOp function when looping over elements of the morphology kernel.
2014-05-01 11:52:49 -07:00
1Hyena
dfdb09386f
Autotuned_index now prints all info into logger instead of couting it.
2014-05-01 20:55:49 +03:00
Ievgen Khvedchenia
2df7242646
Prepare to merge KAZE and AKAZE nldiffusion_functions source files (work in progress).
2014-05-01 18:27:24 +03:00
Ievgen Khvedchenia
30f73623ce
Replace runtime checks with assertions
2014-05-01 18:24:13 +03:00
Jüri Aedla
6fb83f869c
Android camera qcom HAL doesn't like it when no consumer usage bits are set. Set a usage bit for preview BufferQueue.
2014-05-01 16:03:39 +03:00
Ievgen Khvedchenia
3e51da38fb
Removed Feature_Suppression_Distance function that is not used anywhere.
2014-05-01 10:58:34 +03:00
Alexander Alekhin
71f871fafd
replaced sanity check condition for stitching perf test
2014-04-30 18:02:06 +04:00
Alexander Karsakov
4ebe76098e
Disabled IPP resize for CV_8U
2014-04-30 17:28:35 +04:00
Ilya Lavrenov
c80faff42f
added cn>1 support to cv::norm (NORM_INF)
2014-04-30 14:59:37 +04:00
vbystricky
c9103730b6
Disable ipp integral in IPPICV version
2014-04-30 12:55:34 +04:00
Ievgen Khvedchenia
ab1ef08f0e
Rename file config.h to KAZEConfig.h
2014-04-29 22:17:18 +03:00
Ievgen Khvedchenia
4509fe55c2
Clean-up of getters/setters that are not needed by OpenCV
2014-04-29 21:39:27 +03:00
Ievgen Khvedchenia
2daa14e3c7
Clean-up from dead code.
2014-04-29 21:07:53 +03:00
Alexander Alekhin
e8d3ebecc7
fix IPPDerivSobel condition
2014-04-29 15:36:45 +04:00
Alexander Alekhin
b62e59aac0
icv: enable functions
2014-04-29 15:36:43 +04:00
Alexander Alekhin
5658ba0002
icv: update package
2014-04-29 15:35:27 +04:00
Alexander Alekhin
dacf63a888
Merge pull request #2682 from ElenaGvozdeva:ippiDFT
2014-04-29 15:34:01 +04:00
Alexander Alekhin
0f22df2b0d
Merge pull request #2667 from akarsakov:ipp_otsu
2014-04-29 15:15:33 +04:00
Alexander Alekhin
06746ba645
Merge pull request #2677 from ilya-lavrenov:ipp_compilation
2014-04-29 12:26:49 +04:00
Elena Gvozdeva
043b917c7d
IPP: cv::dft fixed
2014-04-29 12:23:23 +04:00
Ilya Krylov
e6aa8ce932
Corrected notes
2014-04-29 10:24:39 +04:00
Adrian Stratulat
cbf3c1fbf1
remove unused macros
2014-04-28 19:40:11 +00:00
Ievgen Khvedchenia
a134e068ef
Fix wrong checking of returned descriptor type
2014-04-28 22:25:27 +03:00
Ievgen Khvedchenia
c1bf453266
Wrapped nldiffusion functions with details::kaze or details::amaze namespace to avoid collision of function names
2014-04-28 20:41:44 +03:00
Ievgen Khvedchenia
c68cbfced3
Fix size_t to int conversion
2014-04-28 19:32:29 +03:00
Ievgen Khvedchenia
0e3bbd7026
Fix "conditional expression constant" warning
2014-04-28 19:32:04 +03:00
Ievgen Khvedchenia
a941d25f6d
Fix size_t to int conversion
2014-04-28 16:46:09 +03:00
Ievgen Khvedchenia
5662294319
Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it)
2014-04-28 16:34:35 +03:00
Ievgen Khvedchenia
599bcfb591
Fix size_t to int conversion
2014-04-28 16:24:35 +03:00
Ievgen Khvedchenia
cc0a94c536
Fix "conditional expression constant" warning
2014-04-28 16:23:58 +03:00
Elena Gvozdeva
507ea95265
fixed
2014-04-28 16:46:11 +04:00
Ievgen Khvedchenia
2162aab0e9
Remove AKAZEFeatures desctructor
2014-04-28 15:17:09 +03:00
Ievgen Khvedchenia
f9d3c49023
Bugfix: wrong variable name
2014-04-28 15:14:03 +03:00
Ievgen Khvedchenia
f9422f60a6
Fix Fix casting from/to int/float that caused lot of compiler warnings.
2014-04-28 15:13:42 +03:00
Elena Gvozdeva
16629bff4c
Added parallel version for DCT_ROWS
2014-04-28 16:05:19 +04:00
Elena Gvozdeva
6880dbfd95
IPP: cv::dct
2014-04-28 16:05:19 +04:00
Ievgen Khvedchenia
3c596184e4
Added copyright headers for KAZE and AKAZE wrappers
2014-04-28 15:01:42 +03:00
Ievgen Khvedchenia
f97e38d8a6
Fix casting from/to int/float that caused lot of compiler warnings.
2014-04-28 15:00:14 +03:00
Ilya Krylov
f0f741b796
Added documentation
2014-04-28 15:27:30 +04:00
Alexander Alekhin
649935596e
Merge pull request #2653 from alalek:ipp_lut
2014-04-28 15:15:11 +04:00
Alexander Alekhin
0e5b0677c9
Merge pull request #2654 from ElenaGvozdeva:ipp_DFT
2014-04-28 15:14:40 +04:00
Alexander Alekhin
5d50917961
Merge pull request #2674 from akarsakov:ocl_hog_fix_epsilon
2014-04-28 15:06:05 +04:00
Ilya Lavrenov
59876cfb34
fixed compilation
2014-04-28 14:04:41 +04:00
Roman Donchenko
c6e91e4736
Merge pull request #2675 from SpecLad:merge-2.4
2014-04-28 13:51:44 +04:00
Ilya Lavrenov
55bbca2d09
added more types to cv::GaussianBlur
2014-04-28 13:50:28 +04:00
Roman Donchenko
47d903d968
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-04-28 12:08:21 +04:00
Ilya Krylov
05ee15f108
Added FisheyeTest
2014-04-28 12:01:27 +04:00
Ievgen Khvedchenia
61f79c2632
Fix line ending at EOF
2014-04-28 10:53:09 +03:00
Ievgen Khvedchenia
3cfc22ae4e
Fix initialisation order of parallel loop classes for AKAZE descriptor extraction
2014-04-28 10:52:05 +03:00
Ievgen Khvedchenia
f3f0e06c4d
Fix parenthesis in assert statements
2014-04-28 10:51:09 +03:00
Ievgen Khvedchenia
0e243541f9
Fix shadowed variable warnings
2014-04-28 10:50:46 +03:00
Alexander Karsakov
b046210296
Changed epsilon for hog test, because hog detector is sensible to resize accuracy.
2014-04-28 11:37:46 +04:00
Ievgen Khvedchenia
ba5bec1de2
Fix mutable compilation error
2014-04-27 23:07:48 +03:00
Ievgen Khvedchenia
eada0f4b48
Fix shadowed i variable warning
2014-04-27 23:04:31 +03:00
Ievgen Khvedchenia
503bd38963
Enable multithreaded extraction of features using cv::parallel_for_
2014-04-27 22:28:18 +03:00
Artur Wieczorek
59250e8288
cv::findContours: Check if type of output data structure is right to store contours (vector<vector<Point>>).
2014-04-27 19:22:29 +02:00
Samson Yilma
de55126b69
Fixed warnings and parameter name mismatches, added #include needed in some platforms.
2014-04-27 13:02:36 -04:00
Samson Yilma
e6420bde73
Added function decomposeHomographyMat. New files added are homography_decomp.cpp and test_homography_decomp.cpp.
...
Modified files calib3d.hpp and camera_calibration_and_3d_reconstruction.rst.
2014-04-26 20:13:27 -04:00
Ievgen Khvedchenia
d37220e8ff
Clean-up of the iostream manipulator in AKAZEConfig.
2014-04-26 23:34:38 +03:00
Ievgen Khvedchenia
d8c9bb777e
Fix return value of descriptorType()
2014-04-26 23:34:07 +03:00
Istvan Sarandi
4bf1df7da3
Suppress warning in constructor.
2014-04-26 00:42:26 +02:00
Alexander Karsakov
7bd9b2ac26
Added setIppErrorStatus()
2014-04-25 20:24:37 +04:00
Ilya Krylov
35e1b322cb
Added test for jacobians
2014-04-25 18:36:48 +04:00
Adil Ibragimov
3bd364fce3
fixing accum_dist and operator() mismatching for HellingerDistance and KL_Divergence
2014-04-25 17:37:31 +04:00
vbystricky
a13e6ab79f
Fix problem with sanity check of transform ecc with ipp resize
2014-04-25 17:33:38 +04:00
Alexander Karsakov
232c37e827
Added ippiComputeThreshold_Otsu to cv::threshold
2014-04-25 17:31:45 +04:00
Ilya Krylov
9c7e0bfd33
Added fisheye camera model
2014-04-25 14:49:36 +04:00
Alexander Alekhin
7ee1d5f69b
ipp: added LUT optimization
2014-04-25 12:09:06 +04:00
Elena Gvozdeva
10d1b3a534
Added parallel version for DFT_ROWS
2014-04-25 11:39:19 +04:00
Ievgen Khvedchenia
86888bdf77
Replace swap with clear (more efficient)
2014-04-24 22:01:45 +01:00
Ievgen Khvedchenia
3e24822fff
Bugfix: clear input vector of key points for detection stage
2014-04-24 22:01:29 +01:00
Ievgen Khvedchenia
33b9e4b4a3
Added missing operator()
2014-04-24 22:00:51 +01:00
Ievgen Khvedchenia
36db97068c
Added missing operator()
2014-04-24 22:00:37 +01:00
Alexander Alekhin
32b25de583
Merge pull request #2656 from ilya-lavrenov:ipp_copymakeborder
2014-04-24 20:30:34 +04:00
Alexander Karsakov
dc91be86b2
Disabled ippiHoughLine_Region for cv::HoughLines
2014-04-24 18:00:03 +04:00
Alexander Karsakov
5580d08c6e
Added setIppErrorStatus()
2014-04-24 16:48:46 +04:00
Ilya Lavrenov
46e8d9d02d
cv::copyMakeBorder
2014-04-24 14:27:51 +04:00
Alexander Karsakov
1909978f7d
Added ippiHoughProbLine to cv::HoughLinesP
2014-04-24 12:28:23 +04:00
vbystricky
82a198a8f2
Fix epsilon calculation for sanity check in x32 build
2014-04-24 10:48:32 +04:00
Istvan Sarandi
c20cab9ec1
Added test for concatenation with empty matrices.
2014-04-24 03:09:07 +02:00
Ievgen Khvedchenia
6d500cc6f7
Merge KAZE and AKAZE features with most recent version
2014-04-23 23:02:02 +01:00
Ievgen Khvedchenia
d27ed856f2
Replace config with AKAZEConfig.h
2014-04-23 22:44:03 +01:00
Adrian Stratulat
4fb5680d91
Documentation - minor fix-ups
2014-04-23 17:30:27 +00:00
Aaron Kunze
1f8b41f390
Optimizes filter2D for Intel GPUs
2014-04-23 10:20:09 -07:00
Alexander Alekhin
dcc4d3640b
Merge pull request #2651 from ilya-lavrenov:ipp_minmaxidx_3cn
2014-04-23 20:06:55 +04:00
Andrey Pavlenko
8114e071c2
Merge pull request #2655 from akarsakov:ipp_fix_pyramid
2014-04-23 16:27:33 +04:00
Elena Gvozdeva
2d71c094b3
IPP: CV::dft
2014-04-23 15:52:05 +04:00
Andrey Pavlenko
d93161812b
Merge pull request #2620 from ilya-lavrenov:ipp_integration
2014-04-23 15:12:45 +04:00
Alexander Karsakov
f3d1001c5d
Changed tests for support intersection between expected and actual lists of lines.
2014-04-23 13:18:47 +04:00
Alexander Karsakov
751264f88a
Added ippiHoughLine_Region to cv::HoughLines
2014-04-23 11:59:36 +04:00
Alexander Alekhin
9badfa1f83
Merge pull request #2646 from ilya-lavrenov:ipp_remap
2014-04-23 11:51:01 +04:00
Alexander Alekhin
ba0ab8edb0
Merge pull request #2647 from vbystricky:ipp_norm
2014-04-23 11:50:13 +04:00
Alexander Alekhin
c2319285a9
Merge pull request #2649 from ilya-lavrenov:gabor_eps
2014-04-23 11:49:43 +04:00
Alexander Karsakov
92f855f0c3
Added checking destination size for pyrUp, pyrDown.
2014-04-23 11:47:15 +04:00
Alexander Karsakov
01123aaa36
Changed integer operations to float for Intel devices
2014-04-23 11:00:32 +04:00
Ilya Lavrenov
493679dc56
cv::minMaxIdx for cn > 1
2014-04-22 23:47:04 +04:00
Alexander Alekhin
e42057c487
Merge pull request #2648 from ilya-lavrenov:ipp_dist
2014-04-22 19:00:02 +04:00
Andrey Pavlenko
cd01d705c9
Merge pull request #2627 from akarsakov:ipp_pyramids
2014-04-22 17:19:27 +04:00
Ilya Lavrenov
5c0a4878d7
changes eps
2014-04-22 15:49:17 +04:00
vbystricky
dfe6adebb9
Fix error in arguments of ipp function
2014-04-22 15:07:03 +04:00
Alexander Alekhin
580559e1e6
Merge pull request #2618 from vbystricky:ipp_Scharr
2014-04-22 15:02:13 +04:00
Ilya Lavrenov
640c9667c7
fix for IPP ICV
2014-04-22 14:55:28 +04:00
Ilya Lavrenov
51e2a8ec96
fixes
2014-04-22 14:51:39 +04:00
vbystricky
e68a55cca2
Fix error in ipp function call
2014-04-22 14:35:27 +04:00
Ilya Lavrenov
46e40343f2
cv::remap
2014-04-22 14:33:55 +04:00
Alexander Alekhin
caf3ed284d
Merge pull request #2645 from vbystricky:ipp_Convert
2014-04-22 13:45:31 +04:00
vbystricky
9cdb330452
Change test conditions
2014-04-22 13:27:20 +04:00
Roman Donchenko
4211d8fbd9
Merge pull request #2641 from SpecLad:merge-2.4
2014-04-22 12:01:03 +04:00
Andrey Pavlenko
6b986489ec
Merge pull request #2643 from vbystricky:ipp_GaussianBorder
2014-04-22 11:55:06 +04:00
Andrey Pavlenko
34afc72c23
Merge pull request #2642 from vbystricky:ipp_resize
2014-04-22 11:53:26 +04:00
Andrey Pavlenko
6823b36974
Merge pull request #2624 from ElenaGvozdeva:ipp_DistanceTransform
2014-04-22 11:48:25 +04:00
vbystricky
f5c729396d
Fix call of ippiConvert.
2014-04-22 10:50:35 +04:00
Andrey Pavlenko
7c3d5b056a
Merge pull request #2612 from grkutty:pullreq/140319-bilateral-b
2014-04-22 09:32:39 +04:00
Artur Wieczorek
f27a886314
Fix for issue #3645 ( http://code.opencv.org/issues/3645 ).
...
Implement missing features in CvCaptureCAM_VFW class.
Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.
2014-04-21 17:10:58 +02:00
vbystricky
bb12293251
Convert opencv border type to ipp border. Check supported border before call ipp function
2014-04-21 18:32:53 +04:00
vbystricky
42079b899c
Fix error in call of ippResize
2014-04-21 17:26:03 +04:00
Elena Gvozdeva
3d7872b904
fixed
2014-04-21 16:59:55 +04:00
Roman Donchenko
4db12032dc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
No conflicts! Amazing!
2014-04-21 16:47:35 +04:00
Elena Gvozdeva
b4830d896c
added ippiTrueDistanceTransform_8u32f_C1R
2014-04-21 15:17:56 +04:00
Elena Gvozdeva
0265247504
Added ippiDistanceTransform for cv::distanceTransform, maskSize=3,5
2014-04-21 15:17:55 +04:00
vbystricky
d9ef5bb5a7
Fix compile warnings
2014-04-21 15:02:38 +04:00
vbystricky
f52126725f
Disable scharr in icv only configuration
2014-04-21 14:43:56 +04:00
vbystricky
d97f7da7a9
Fix setIppErrorStatus placement
2014-04-21 14:19:25 +04:00
Ilya Lavrenov
fe644ede19
cv::multiply
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db
fixed warnings
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
76c415ff49
cv::filterSpeckles
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
04abffeb16
cv::cornerHarris
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8603c58f37
Mat::setTo(with mask)
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
0b678c2451
Mat::setTo(Scalar::all(0))
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3bd8211a72
Mat::copyTo
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
f7ec4a5c47
Mat::copyTo with mask
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8d24a83c9c
cv::flip inplace
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
5ca3d855a2
cv::transpose inplace
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8da0e2b707
cv::accumulate
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
d453a598f8
cv::min/cv::max CV_64F
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3e173b701e
cv::Laplacian
2014-04-21 13:14:54 +04:00
Ernest Galbrun
6a6f24b170
adding new ali's feature
2014-04-18 16:36:34 +02:00
Alessandro Trebbi
3d25d70627
fix for compiling 2.4 opencv with xcode 5.1
2014-04-18 13:42:47 +02:00
vbystricky
650762419c
Add setIppErrorStatus()
2014-04-18 15:13:34 +04:00
vbystricky
d17f40dc1f
Fix error in code
2014-04-18 15:04:46 +04:00
vbystricky
32394df42d
Add constant border fix call ipp function
2014-04-18 15:04:46 +04:00
vbystricky
79384beb60
Fix warning
2014-04-18 15:04:45 +04:00
vbystricky
160c964e4b
Fix error
2014-04-18 15:04:45 +04:00
vbystricky
baa6ab1967
Change Scharr filter to new ipp functions
2014-04-18 15:04:45 +04:00
Andrey Pavlenko
82c67abbfa
Merge pull request #2622 from ilya-lavrenov:ipp_sort
2014-04-18 14:47:06 +04:00
Ilya Lavrenov
9a109440df
cv::reduce sum/avg
2014-04-18 14:44:12 +04:00
Ilya Lavrenov
aa5767421a
cv::reduce (min/max to single column)
2014-04-18 14:39:33 +04:00
Ilya Lavrenov
1f6b719776
added ippisFlip to cv::sort
2014-04-18 14:37:46 +04:00
Ilya Lavrenov
26e8c6216f
cv:;sortIdx
2014-04-18 14:31:27 +04:00
Ilya Lavrenov
d5513f522b
cv::sort
2014-04-18 14:31:27 +04:00
Andrey Pavlenko
cb8743f9aa
Merge pull request #2628 from ilya-lavrenov:ipp_error_handling
2014-04-18 13:37:35 +04:00
Alexander Karsakov
4f4a95299a
Added setIppErrorStatus
2014-04-18 09:04:25 +04:00
Alexander Karsakov
6202f54a18
Fixed sanity check for integer type
2014-04-17 19:02:56 +04:00
Ilya Lavrenov
05a47d9014
cmd option
2014-04-17 18:06:14 +04:00
Ilya Lavrenov
87eb1b8fcc
fixes in imgproc
2014-04-17 14:51:59 +04:00
Ilya Lavrenov
6f9ca3d77c
fixed some errors
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
ce0941160e
added status check
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
2cd7a913ed
verbose errors
2014-04-17 11:07:01 +04:00
Ilya Lavrenov
f3c56f8310
first attemp
2014-04-17 11:07:01 +04:00
Istvan Sarandi
e18224110c
Removed emptiness check from cv::hconcat and cv::vconcat. Sometimes you want to concatenate with an empty matrix.
2014-04-17 02:41:52 +02:00
Maks Naumov
3e5a69d8ba
remove unused variables in OCL_PERF_TEST_P()
2014-04-17 00:19:04 +03:00
Maks Naumov
dba0f9fc8f
remove unused variable in erGrouping()
2014-04-17 00:16:07 +03:00
Maks Naumov
9e10c09f2d
remove unused variable in LineSegmentDetectorImpl::compareSegments()
2014-04-17 00:14:13 +03:00
Alexander Karsakov
a7d12aabab
Added epsilon for tests with float data type
2014-04-16 18:07:24 +04:00
Alexander Karsakov
793e980876
Added IPP Pyramid API functions to cv::buildPyramid
2014-04-16 17:10:20 +04:00
Andrey Pavlenko
e11d998cfb
Merge pull request #2623 from alalek:icv_fix_color
2014-04-16 15:56:09 +04:00
Alexander Karsakov
ef2f5999ed
Added perf test for cv::buildPyramid
2014-04-16 13:01:49 +04:00
Alexander Karsakov
8230f1fd68
Added ippiPyrUp_Gauss5x5 to cv::pyrUp
2014-04-16 11:59:32 +04:00
Alexander Karsakov
f218dffce6
Added ippiPyrDown_Gauss5x5 to cv::pyrDown
2014-04-16 11:39:10 +04:00
Alexander Karsakov
10cb660240
Fixed condition
2014-04-16 10:28:24 +04:00
KayKwon
e13e3be16e
Merge branch 'master' into matlab_formatter
2014-04-16 11:13:02 +09:00
KayKwon
84257b57d0
Fix for (Bug #2789 )
...
Add MatlabFormatter for matlab style output.
See http://code.opencv.org/issues/2789
2014-04-16 10:56:27 +09:00
unknown
c2f540d090
White space fixes
2014-04-15 09:32:34 -07:00
Andrey Pavlenko
80ef1f6753
Merge pull request #2621 from arkunze:pullreq/140319-resize-b
2014-04-15 19:56:56 +04:00
Andrey Pavlenko
a26bed16e6
Merge pull request #2617 from ElenaGvozdeva:ipp_matchTemplate
2014-04-15 19:56:38 +04:00
Andrey Pavlenko
dab8e920b0
Merge pull request #2565 from apavlenko:tapi_stitching
2014-04-15 19:56:11 +04:00
Andrey Pavlenko
7ba4212529
Merge pull request #2544 from alalek:perf_report_regressions
2014-04-15 16:17:39 +04:00
Alexander Alekhin
3bb6db522d
ICV: mark missed functions
2014-04-15 15:55:44 +04:00
GregoryMorse
aa3c36f545
Update cap_msmf.cpp
...
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Update cap_msmf.cpp
Successful test - samples are grabbed
Update ppltasks_winrt.h
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
Support VS 2013 and consistency cleanup and C++/CX object creation fixed
2014-04-15 18:32:23 +08:00
Vadim Pisarevsky
6a5a0fe803
Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist
2014-04-15 13:31:48 +04:00
Vadim Pisarevsky
7942494fb6
Merge pull request #2233 from palindromoroz:BGSubtract_KNN_new_code
2014-04-15 13:22:43 +04:00
Vadim Pisarevsky
20aaa8fe77
Merge pull request #2560 from akarsakov:gaussianblur_integer
2014-04-15 13:21:25 +04:00
Vadim Pisarevsky
92db6786a9
Merge pull request #2578 from akrynski:patch-1
2014-04-15 13:21:08 +04:00
Vadim Pisarevsky
9cdd15e141
Merge pull request #2615 from krodyush:pullreq/140319-PyrLKOpticalFlow-fix
2014-04-15 13:19:45 +04:00
Roman Donchenko
534f9623f2
Merge pull request #2616 from SpecLad:merge-2.4
2014-04-15 12:06:13 +04:00
Elena Gvozdeva
3553e9379b
fixed
2014-04-15 11:41:33 +04:00
unknown
36d33dd6c2
Review comments
2014-04-14 16:10:11 -07:00
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
2014-04-14 16:09:17 -07:00
Andrey Pavlenko
8176e893c0
Merge pull request #2609 from alalek:tests_fixes
2014-04-14 18:54:01 +04:00
Andrey Pavlenko
5ff59af09d
Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor
2014-04-14 18:52:07 +04:00
Alexander Karsakov
53bc93730c
Added suppressing deprecation for ippiMulC_32f_C1IR
2014-04-14 16:38:59 +04:00
Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
Ilya Lavrenov
884b706b3a
fixed warning
2014-04-14 14:40:40 +04:00
Ilya Lavrenov
ad7f2311c0
cv::Laplacian
2014-04-14 14:34:28 +04:00
Ilya Lavrenov
2a051a124f
cvtColor
2014-04-14 14:29:36 +04:00
Andrey Pavlenko
5522c14efc
Merge pull request #2607 from ilya-lavrenov:warn_sup
2014-04-14 14:15:12 +04:00
krodyush
57992e0169
replace IPatchLocal[][] into *IPatchLocal to fix compilation error on some devices.
2014-04-14 13:23:12 +04:00
Tony
65f63421fa
Change quotes around GTK headers for angle brackets
...
The linux buildbots have started to fail compilation due to not
finding the gtk headers. The quotes have been changed to angle brackets
to indicate to the compiler that these are system includes.
2014-04-13 11:07:38 +01:00
Tony
1638341270
Use GTK_VERSION_MAJOR to switch between GTK+ version two and three
...
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.
The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
modified: cmake/templates/cvconfig.h.in
modified: modules/highgui/src/window.cpp
modified: modules/highgui/src/window_gtk.cpp
2014-04-13 11:04:56 +01:00
Tony
befdef9685
Merge remote-tracking branch 'upstream/master'
...
Rebase to lates upstream
2014-04-13 10:39:32 +01:00
unknown
d2b4ee1e9b
More intendation fixes
2014-04-11 21:44:12 -07:00
unknown
06df383675
Indent fixes
2014-04-11 19:14:01 -07:00
Alexander Alekhin
3a1a3da782
fix tests
2014-04-11 16:11:05 +04:00
Andrey Pavlenko
f104d5be8c
Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist
2014-04-11 15:18:04 +04:00
Andrey Pavlenko
fd90efc9dd
Merge pull request #2593 from arkunze:pullreq/140319-color
2014-04-11 15:16:33 +04:00
Roman Donchenko
df8e28283f
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
2014-04-11 14:15:26 +04:00
Roman Donchenko
4c2db3d6e7
Merge pull request #2579 from maksqwe:test_operations_fix
2014-04-11 14:14:33 +04:00
Roman Donchenko
8ab224746b
Merge pull request #2603 from maksqwe:unused_fix_2.4
2014-04-11 14:14:04 +04:00
Ilya Lavrenov
19d470749b
added macro for denoting region for suppression of "Wdeprecated-declarations"
2014-04-11 13:45:20 +04:00
Andrey Pavlenko
925178749a
removing SuppressWarning and CV_OPENCL_RUN
2014-04-11 13:09:19 +04:00
Alexander Alekhin
3578f0afe9
ocl: workaround for synchronization issue in ::map()
2014-04-11 13:09:18 +04:00
Alexander Alekhin
588658d1a3
tapi: stitching: fix documentation
2014-04-11 13:09:17 +04:00
Alexander Alekhin
026b13b3db
TAPI: stitching: blender: fix OpenCL path & adjust test condition
2014-04-11 13:09:16 +04:00
Alexander Alekhin
e6cc1be7e8
stitching: allow to use dynamic DescriptorMatcher
2014-04-11 13:01:13 +04:00
Alexander Alekhin
06738468af
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
2014-04-11 13:01:12 +04:00
Alexander Alekhin
c22d92c1cb
stitching: extend logging
2014-04-11 13:01:11 +04:00
Alexander Alekhin
a7f69a37e3
stitching: use BORDER_CONSTANT in warp
2014-04-11 13:01:10 +04:00
Alexander Alekhin
c4a31a1ab1
TAPI: stitching: optimize compare operation
2014-04-11 13:01:10 +04:00
Alexander Alekhin
7a5c1babde
TAPI: stitching: optimize exposure
2014-04-11 13:01:09 +04:00
Alexander Alekhin
2737e3c99b
TAPI: stitching: workaround for problem getUMat() call
2014-04-11 13:01:08 +04:00
Alexander Alekhin
c1ea6f3c42
TAPI: stitching: improve warpers
2014-04-11 13:01:07 +04:00
Alexander Alekhin
89e3e448f5
features2d: workaround for 'utrainDescCollection' issue (PR #2142 )
2014-04-11 13:01:07 +04:00
Alexander Alekhin
1d9808e5d5
TAPI: stitching, replaced Mat->UMat/_Array
2014-04-11 13:01:06 +04:00
Alexander Alekhin
8b6c5ade0e
TAPI: added perf test for stitching
2014-04-11 13:01:05 +04:00
Andrey Pavlenko
6bfbcf02cb
Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate
2014-04-11 12:47:25 +04:00
Andrey Pavlenko
f7f4593936
Merge pull request #2581 from vbystricky:ipp_moments
2014-04-11 12:45:13 +04:00
Andrey Pavlenko
7ae547a208
Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero
2014-04-11 12:43:24 +04:00
unknown
e032b5f5d5
Resolving conflicts after rebasing from public
2014-04-10 12:28:37 -07:00
Aaron Kunze
b59c517f98
Optimizations to OpenCL bilateral filter.
2014-04-10 12:15:13 -07:00
Ilya Lavrenov
b970ec7dae
parallel version
2014-04-10 19:39:00 +04:00
Elena Gvozdeva
43c29a6751
fixed
2014-04-10 17:26:38 +04:00
Alexander Karsakov
7369cfd9ec
Added perf test for cornerMinEigenVal
2014-04-10 16:09:48 +04:00
Vadim Pisarevsky
f417c79d16
Merge pull request #1932 from seth-planet:master
2014-04-10 13:36:14 +04:00
Vadim Pisarevsky
a0bf7f82ba
Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser
2014-04-10 13:33:29 +04:00
Vadim Pisarevsky
dae04aacc3
Merge pull request #2575 from rold2007:Bugfix_1437
2014-04-10 13:31:33 +04:00
Vadim Pisarevsky
b66adc81a4
Merge pull request #2599 from maksqwe:test_calibration_2.4
2014-04-10 13:30:37 +04:00
Vadim Pisarevsky
b5755b1228
Merge pull request #2588 from vpisarev:fix_samples_n_unused
2014-04-10 13:30:20 +04:00
Ilya Lavrenov
b2379b51b5
cv::countNonZero
2014-04-10 13:21:52 +04:00
Tony
34984328fd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
CMakeLists.txt
2014-04-10 08:07:02 +01:00
Alexander Karsakov
d9556a998f
Added ippiMinEigenVal_ to cv::cornerMinEigenVal
2014-04-10 11:00:08 +04:00
Maks Naumov
eb89f5207c
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()
2014-04-09 23:07:48 +03:00
Maks Naumov
29d1bce85f
remove unused variable in TEST_P()
2014-04-09 23:06:06 +03:00
Maks Naumov
79eb3c5cde
remove unused variable in OCL_PERF_TEST_P()
2014-04-09 23:04:29 +03:00
Maks Naumov
befbe89bdf
remove unused variable in ocl_moments()
2014-04-09 23:01:49 +03:00
Maks Naumov
eb45cf0c93
remove unused variable in findCorners_caller()
2014-04-09 22:59:52 +03:00
Maks Naumov
9b52b61451
remove unused variable in HOGDescriptor::groupRectangles()
2014-04-09 22:56:19 +03:00
Maks Naumov
a01659825c
remove unused variable in loadFromXML()
2014-04-09 22:53:36 +03:00
Ilya Lavrenov
18ef25ec30
cv::calcHist
2014-04-09 21:46:09 +04:00
Aaron Kunze
785acc1834
Fixes global size issue, adds #pragma unroll to loops
2014-04-09 08:42:55 -07:00
Andrey Pavlenko
7b366df822
Merge pull request #2589 from alalek:icv_update
2014-04-09 18:23:35 +04:00
Andrey Pavlenko
cd02a7002b
Merge pull request #2596 from ilya-lavrenov:tapi_setto
2014-04-09 18:23:15 +04:00
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
2014-04-09 18:20:49 +04:00
Alexander Alekhin
0d477ffea1
ipp: some functions are not available in the ICV package
2014-04-09 18:20:49 +04:00
Alexander Alekhin
1461ab41bc
ipp: added support for updated ICV package
2014-04-09 18:20:49 +04:00
Maks Naumov
b033a63e63
fix typo in test_cameracalibration
2014-04-09 14:41:16 +03:00
vbystricky
b6d58d1d3b
Fix ipp ifdef
2014-04-09 14:53:59 +04:00
vbystricky
d9013a85f1
Fix IPP version ifdef
2014-04-09 14:49:37 +04:00
vbystricky
8899ec1586
Add IPP version of Moments calculattion of image
2014-04-09 14:49:36 +04:00
Andrey Pavlenko
ced81b9121
Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
2014-04-09 14:25:12 +04:00
Andrey Pavlenko
e9bc737485
Merge pull request #2584 from akarsakov:ipp_threshold
2014-04-09 14:17:48 +04:00
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
2014-04-09 14:16:25 +04:00
Ilya Lavrenov
bcd7151867
added UMat::setTo accuracy test
2014-04-09 14:15:22 +04:00
Andrey Pavlenko
e013f04669
Merge pull request #2583 from ilya-lavrenov:ippicv
2014-04-09 14:14:14 +04:00
Ilya Lavrenov
4a63b3dd90
cv2cvtest part2
2014-04-09 13:08:51 +04:00
Alexander Karsakov
a66db67b83
Attempt to improve performance
2014-04-09 11:54:09 +04:00
Alexander Karsakov
35494f81ef
Added ippiThreshold to cv::threshold
2014-04-09 11:41:35 +04:00
Elena Gvozdeva
6119ae0ea9
fixed
2014-04-09 11:09:51 +04:00
David Rolland
cb8ddb1179
Corrected bug #1437 . Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.)
...
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx .
2014-04-09 18:24:21 +12:00
Aaron Kunze
629ddf0bf8
Resolves bug #3450 (Improperly cleaning up resources in DllMain)
2014-04-08 16:21:33 -07:00
Aaron Kunze
bea2515f0e
Optimizations for OpenCL color conversion.
2014-04-08 15:58:04 -07:00
Ilya Lavrenov
444ab0ef0d
fixed (IppiSize&)sz
2014-04-09 00:19:56 +04:00
Ilya Lavrenov
c735594178
cv::scaleAdd
2014-04-09 00:12:48 +04:00
Ilya Lavrenov
fd3a6f0db7
cv::blur
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
a624ec167d
cv::Mat::convertTo
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
b72b256fda
cv::pow (added ippiSqr_32f_C1R for power=2)
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
b56b9c43dc
cv::updateMotionHistory
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
77723db034
cv::flip
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
f2a35d6388
cv::boxFilter
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
c6f208e1c8
cv::medianBlur
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
ed1ca00bf6
cv::magnitude
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
bf860dbb31
cv::pow
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
49d1691a3e
cv::sqrt
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
c224cfa628
cv::accumulateSquare && cv::acumulateProduct
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
2c0c887f70
cv::accumulateWeighted
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
5ddff235bb
cv::polarToCart
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
46cb4e0cbc
cv::transpose
2014-04-09 00:11:26 +04:00
Ilya Lavrenov
f1b38c4198
cv::warpPerspective and cv::warpAffine
2014-04-09 00:11:26 +04:00
Ilya Lavrenov
e090aa07db
disabled some IPP funcs
2014-04-08 22:30:18 +04:00
Tony
3cd50739ef
Merge remote-tracking branch 'upstream/master'
2014-04-08 19:14:05 +01:00
Anatoly Baksheev
3f95818252
Added cloud shading support - additional normals array is used
2014-04-08 20:31:28 +04:00
Andrey Pavlenko
5600bc54f4
Merge pull request #2585 from ilya-lavrenov:norm
2014-04-08 18:01:24 +04:00
Andrey Pavlenko
ac92d4c701
Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow
2014-04-08 17:58:16 +04:00
Vadim Pisarevsky
1b339eb0d4
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions
2014-04-08 17:54:08 +04:00
Firat Kalaycilar
990295644e
made a performance improvement.
...
changed the way the mean value for each pixel is assigned in the output image.
2014-04-08 16:10:32 +03:00
Elena Gvozdeva
42d45e0b02
Added ippiSqrDistanceNorm and ippiCrossCorrNorm to cv::matchTemplate
2014-04-08 16:51:15 +04:00
Firat Kalaycilar
9eb0e7d99b
Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_bgimg_gray
2014-04-08 14:58:32 +03:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Andrey Pavlenko
a6ef45aa13
Merge pull request #2582 from vbystricky:ipp_fix
2014-04-08 14:30:48 +04:00
vbystricky
9828cd6086
Remove defined(HAVE_IPP)
2014-04-08 13:05:23 +04:00
vbystricky
f23134ce01
Add IPP_VERSION_X100 define
2014-04-08 12:43:57 +04:00
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
Martin Chodakowski
267241b889
Fix typos in old python wrapper documentation(Bug #3628 )
...
Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
2014-04-08 00:55:08 -04:00
Elena Gvozdeva
f9c5289483
fixed
2014-04-07 18:53:07 +04:00
Roman Donchenko
6f055d7a76
Merge pull request #2580 from SpecLad:merge-2.4
2014-04-07 18:29:51 +04:00
krodyush
616ec74beb
fix previous merge error
2014-04-07 17:32:39 +04:00
vbystricky
7badc85b60
Fix for pullrequest comment
2014-04-07 17:06:02 +04:00
vbystricky
2d54581971
Fix ifdef for IPP version greater 8.1
2014-04-07 16:45:35 +04:00
Roman Donchenko
4f2b126b7b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
vbystricky
dbdc476b79
Check results of ipp function
2014-04-07 14:31:34 +04:00
vbystricky
38913bf5f6
Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
2014-04-07 14:31:34 +04:00
vbystricky
67484e027b
Fix function names (log, exp)
2014-04-07 14:31:33 +04:00
vbystricky
566f783968
Fix errors
2014-04-07 14:31:33 +04:00
vbystricky
23e1b50837
Check 8.1 ipp version for color convertion functions, which not exists in versions before this.
2014-04-07 14:31:33 +04:00
vbystricky
06acb8b0ee
Check 8.1 ipp version for gaussian functions, which not exists in versions before this.
2014-04-07 14:31:32 +04:00
vbystricky
be29d628d3
Check 8.1 ipp version for morphology functions, which not exists in versions before this.
2014-04-07 14:31:32 +04:00
vbystricky
4512d06484
Fix const src matrix in IPPresizeInvoker
2014-04-07 14:31:31 +04:00
vbystricky
824ed8a3ae
Fix errors
2014-04-07 14:31:31 +04:00
vbystricky
1b3651d8ee
Undo changes ipp to ippicv prefix of function names
2014-04-07 14:30:03 +04:00
vbystricky
eb8c531791
Add preprocessor check for IPP version greater 8.1 on some code
2014-04-07 14:26:51 +04:00
vbystricky
188c506237
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
2014-04-07 14:26:51 +04:00
vbystricky
ec6f977783
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
2014-04-07 14:26:50 +04:00
vbystricky
a9a0ea3706
Fix error not initialized IppStatus before ipp functions call
2014-04-07 14:26:50 +04:00
vbystricky
c321330777
Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test
2014-04-07 14:26:50 +04:00
vbystricky
ad23ef2a42
Remove unused #include "ippverdion.h"
2014-04-07 14:26:49 +04:00
vbystricky
9d138b2bbe
Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test
2014-04-07 14:26:49 +04:00
vbystricky
c29583eacc
Change Canny input image description, we can use multichannel image now
2014-04-07 14:26:48 +04:00
vbystricky
ee2df645f4
Canny uncommented, prefix of ipp function changed. Ipp version of Canny called only for images with one channels
2014-04-07 14:26:48 +04:00
vbystricky
9b6feee1a5
Change sanity check for perfomance test of dft
2014-04-07 14:26:47 +04:00
vbystricky
a6b53489e6
Change sanity check for perfomance test of bilateral filter
2014-04-07 14:26:47 +04:00
vbystricky
aece433b15
Check ippStsNoErr as result of ipp function instead >=0
2014-04-07 14:26:47 +04:00
vbystricky
c65e5a1e7b
Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests
2014-04-07 14:26:46 +04:00
vbystricky
b3db990daa
Remove unused code
2014-04-07 14:26:46 +04:00
vbystricky
07e84c635a
Remove unused code
2014-04-07 14:26:45 +04:00
vbystricky
06434bedfd
Change deprecated function ippicviMulC_32f_C1IR to ippicviMulC_32f_C1R. Check results of ipp function, if error was return run opencv branch of code
2014-04-07 14:26:45 +04:00
vbystricky
3b03044047
Fix warning
2014-04-07 14:26:44 +04:00
vbystricky
58de8bc917
Change deprecated functions to valid
2014-04-07 14:24:06 +04:00
vbystricky
01a66a2938
Prepare codes for ippicv library
2014-04-07 14:24:05 +04:00
Andrey Pavlenko
c2f859569c
Merge pull request #2563 from alalek:ipp_builds
2014-04-07 13:03:11 +04:00
Maks Naumov
8271bd5f14
fix condition in CV_OperationsTest::operations1()
2014-04-07 11:24:27 +03:00
Andrey Pavlenko
def4f5e2a3
Merge pull request #2499 from mlyashko:back_proj_fix1
2014-04-07 10:57:21 +04:00
Vladislav Vinogradov
d822d6f101
disable GeneralizedHough tests on gcc 4.7
2014-04-07 09:49:17 +04:00
akrynski
1dba47b77b
Update crop_face.py
...
I propose some changes, to automate file cropping
2014-04-06 18:48:38 +02:00
Tony
572e4f5255
Merge remote-tracking branch 'upstream/master'
2014-04-06 11:49:23 +01:00
Ievgen Khvedchenia
5848e75168
Clean-up from unused utils.h/utils/cpp
2014-04-05 15:25:59 +03:00
Ievgen Khvedchenia
17f305140b
Added unit-tests for KAZE and AKAZE features
2014-04-05 10:25:59 +03:00
Ievgen Khvedchenia
137ff7eccb
Added KAZE and AKAZE wrappers
2014-04-05 10:25:46 +03:00
Ievgen Khvedchenia
703e012a5b
Prepare KAZE and AKAZE sources for integration
2014-04-05 10:24:27 +03:00
Ievgen Khvedchenia
7a59435490
KAZE and AKAZE integration initial commit
2014-04-04 14:25:38 +03:00
Andrey Pavlenko
d1710a8547
Merge pull request #2562 from akarsakov:gftt_fix
2014-04-04 13:34:31 +04:00
krodyush
4ca695cab0
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
...
Conflicts:
modules/video/src/opencl/pyrlk.cl
2014-04-04 11:26:08 +04:00
Vladislav Vinogradov
f8d922ad3e
disable gpu::GeneralizedHough compilation on gcc 4.7
2014-04-04 10:31:33 +04:00
Andrey Pavlenko
5a3200d513
Merge pull request #2567 from apavlenko:fix_compare_scalar
2014-04-03 22:08:18 +04:00
Andrey Pavlenko
9a3895d842
Merge pull request #2556 from DeanF:master
2014-04-03 17:07:06 +04:00
Alexander Karsakov
c747426fc1
Enabled integer arithmetic for filterSepSinglePass
2014-04-03 16:53:57 +04:00
Andrey Pavlenko
271f60ba7a
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
2014-04-03 16:21:04 +04:00
Alexander Alekhin
bfc546d23c
enable IPP ICV support
2014-04-03 15:05:38 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Alexander Karsakov
fc10ffefb8
Enabled integer arithmetic for row_filter_C1_D0
2014-04-03 13:31:06 +04:00
Alexander Karsakov
2cf3a6e26c
Fixed error in case corners not found
2014-04-03 10:30:55 +04:00
Alexander Karsakov
a3825acee4
Small refactoring
2014-04-02 16:38:32 +04:00
Andrey Pavlenko
2aab7b2926
Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix
2014-04-02 13:01:08 +04:00
Roman Donchenko
c165f07319
Merge pull request #2550 from SpecLad:merge-2.4
2014-04-02 12:00:01 +04:00
Alexander Smorkalov
0c30b18769
Bug #3611 Initializing static cv::Mat with cv::Mat::zeros causes segmentation fault fixed.
2014-04-01 18:00:44 -07:00
Ilya Lavrenov
2cd51c04e4
fixed condition in cv::FNLM
2014-04-01 23:18:07 +04:00
DeanF
48df67a9c5
Fixed trailing whitespace
2014-04-01 22:04:58 +03:00
DeanF
bdc91c66c9
Fixed problem with compilation without HAVE_OPENCL
...
When compiling without OpenCL, some classes from its namespace are still used in code.
2014-04-01 21:20:13 +03:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Andrey Pavlenko
6ef94b52ad
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
2014-04-01 12:54:07 +04:00
Roman Donchenko
a8cb5c3983
Merge pull request #2554 from asmorkalov:ocv_249_version
2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Andrey Pavlenko
0d5ffec521
Merge pull request #2553 from ilya-lavrenov:typo
2014-03-31 23:21:07 +04:00
Andrey Pavlenko
aa3c4ae5d2
Merge pull request #2552 from ilya-lavrenov:tapi_compare
2014-03-31 21:22:00 +04:00
Andrey Pavlenko
97eac3f394
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
2014-03-31 21:21:27 +04:00
Ilya Lavrenov
31f864a22b
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
2014-03-31 20:25:53 +04:00
Andrey Pavlenko
bb3c0c066c
Merge pull request #2548 from jet47:gpu_mog2_test
2014-03-31 20:19:21 +04:00
Ilya Lavrenov
9b9769169f
doc typos
2014-03-31 19:57:05 +04:00
Andrey Pavlenko
d170faeb5c
Merge pull request #2549 from ilya-lavrenov:tapi_laplacian
2014-03-31 19:36:44 +04:00
Andrey Pavlenko
6c2d77079f
Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb
2014-03-31 18:17:50 +04:00
Ilya Lavrenov
322b15a459
compare with scalar (cn > 1)
2014-03-31 17:50:16 +04:00
Ilya Lavrenov
7df92bbb77
fixed C4505
2014-03-31 17:30:15 +04:00
Alexander Karsakov
10a52220f0
Added integer arithmetic to sepFilter2D
2014-03-31 16:45:15 +04:00
Alexander Alekhin
eeed9ce247
perf report: summary.py: added custom --regressions map
2014-03-31 16:04:18 +04:00
Andrey Pavlenko
1f4586f3dd
Merge pull request #2541 from JinoBetti:2.4
2014-03-31 15:48:45 +04:00
Ilya Lavrenov
c53398a438
performance tests for FAST
2014-03-31 15:03:00 +04:00
mlyashko
5acd178790
copyright fix
2014-03-31 14:57:03 +04:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Ilya Lavrenov
e1efed1914
added support of ksize >= 5 to cv::Laplacian
2014-03-31 13:17:58 +04:00
mlyashko
4c5de04efb
bug fix
2014-03-31 10:58:15 +04:00
Vladislav Vinogradov
6d368dc1e7
increase epsilon for MOG2::getBackgroundImage test:
...
it uses float arithmetics
2014-03-30 18:02:03 -07:00
Andrey Pavlenko
51530d4d8e
Merge pull request #2543 from apavlenko:24_haar_revert
2014-03-28 23:17:08 +04:00
Alexander Karsakov
d17142b83d
Prototype OCL version of gaussian blur with integer arithmetic
2014-03-28 21:46:03 +04:00
unknown
75534a4828
Python typdef fixed. Reverted the example to MOG2. Not time to make the command line switch for now.
2014-03-28 14:23:10 +01:00
Andrey Pavlenko
3747d2643f
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
...
This reverts commit 3dcddad88a
2014-03-28 16:08:11 +04:00
Andrey Pavlenko
7d82171af4
- fix test
2014-03-28 16:06:39 +04:00
Andrey Pavlenko
e6e817e613
Revert "Merge pull request #1779 from perping:integral_2.4"
...
This reverts commit 54ea5bbac728e0d3d771
2014-03-28 16:05:04 +04:00
Roman Donchenko
0469c18726
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
2014-03-28 12:45:39 +04:00
Roman Donchenko
d6b54ff9d1
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
2014-03-28 12:17:16 +04:00
Roman Donchenko
e055b68ceb
Merge pull request #2403 from hbristow:issue-3451
2014-03-28 12:13:14 +04:00
Roman Donchenko
0b4534d4c9
Merge pull request #2379 from ngryman:optimize_jpeg
2014-03-28 12:08:55 +04:00
Roman Donchenko
4382970739
Merge pull request #2540 from mjul:fixtypos_2.4
2014-03-28 11:58:11 +04:00
Koji Miyazato
1ab8060b62
corrected some style errors found by review.
2014-03-28 10:45:33 +09:00
Alexander Smorkalov
d17740ec87
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
2014-03-28 04:56:31 +04:00
Tony
41b8ab086b
Merge remote-tracking branch 'upstream/master'
2014-03-27 19:32:05 +00:00
Nicolas Gryman
da34f1d58c
added jpeg with optimized coding support.
2014-03-27 13:34:33 -04:00
JinoBetti
91511c1521
Update out.cpp
...
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row
see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
2014-03-27 16:28:40 +01:00
Roman Donchenko
2e3e106676
Merge pull request #2537 from ilya-lavrenov:doc_fix
2014-03-27 17:43:02 +04:00
mlyashko
4b71921526
both tests by picture and rand mat
2014-03-27 17:08:05 +04:00
Martin Jul
a1798cb28e
Fixed typo in BFMatcher in docs.
2014-03-27 13:52:49 +01:00
Ilya Lavrenov
80df44bd75
doc fix
2014-03-27 16:30:29 +04:00
Andrey Pavlenko
e34a7caabc
Merge pull request #2535 from akarsakov:stereobm_fix
2014-03-27 15:22:45 +04:00
Alexander Karsakov
4ceaf44fa0
Fixed incorrect calculation of best_disp
2014-03-27 11:21:32 +04:00
Hilton Bristow
61c22d5899
removed experimental slots
2014-03-27 14:58:53 +10:00
Hilton Bristow
fc696a9ff3
Improved standalone importing behaviour and creation of nested directories
2014-03-27 14:52:23 +10:00
Hilton Bristow
6f190bb907
Generalized todict implementation
2014-03-27 14:51:17 +10:00
Hilton Bristow
068b1bc3d0
More generic todict
2014-03-27 11:34:20 +10:00
Alexander Alekhin
3488fdcb43
disable failed tests
2014-03-26 19:29:59 +04:00
Alexander Alekhin
569e1346f2
UMat: issue in OpenCLAllocator::unmap()
2014-03-26 19:29:41 +04:00
Andrey Pavlenko
04c857a4e8
Merge pull request #2505 from alalek:umat_unmap_synchronization_test
2014-03-26 19:08:15 +04:00
Andrey Pavlenko
a2f8a93bf5
Merge pull request #2529 from ilya-lavrenov:tapi_filter2D
2014-03-26 19:04:57 +04:00
Andrey Pavlenko
6c12f20395
Merge pull request #2528 from mlyashko:back_proj_fix
2014-03-26 19:04:39 +04:00
Andrey Pavlenko
a1d151924d
Merge pull request #2527 from apavlenko:ocl_surf_24
2014-03-26 19:03:44 +04:00
Andrey Pavlenko
fa5705613d
splitting plain and OCL tests for SURF.
2014-03-26 17:18:05 +04:00
Ilya Lavrenov
f7d6d3cff5
improved cv::filter2D
2014-03-26 14:19:59 +04:00
Roman Donchenko
491b84d463
Merge pull request #2478 from clemenscorny:master
2014-03-26 12:19:54 +04:00
Roman Donchenko
a7f9677378
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
2014-03-26 12:18:39 +04:00
Roman Donchenko
d67b450741
Merge pull request #2378 from ngryman:progressive_jpeg
2014-03-26 12:12:02 +04:00
Alexander Karsakov
8c39b4e8b6
Fixed stereoBM for Intel CPU.
2014-03-26 11:53:36 +04:00
Tony
46ba9d30b9
Merge remote-tracking branch 'upstream/master'
2014-03-25 20:44:06 +00:00
Nicolas Gryman
b211e1d989
added jpeg progressive support.
2014-03-25 15:27:24 -04:00
mlyashko
70fdfa0bdb
changed type of sanity check
2014-03-25 16:43:20 +04:00
Andrey Pavlenko
d63a8ba018
Merge pull request #2523 from ilya-lavrenov:tapi_filters
2014-03-25 16:23:02 +04:00
Alexander Alekhin
6bd7a444bc
UMat map-unmap synchronization test
2014-03-25 16:19:52 +04:00
Clemens Korner
f1c8b4b965
FEATURES2D: add DenseFeatureDetector Python wrapper
2014-03-25 12:07:01 +01:00
mlyashko
953aafbd3d
Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
2014-03-25 14:52:39 +04:00
mlyashko
f38fe76025
added perf test for CalcBackProj
2014-03-25 14:50:37 +04:00
Roman Donchenko
da7a605224
Merge pull request #2123 from white-pony:vkysenko/fix-mertens
2014-03-25 14:37:56 +04:00
Andrey Pavlenko
c1acbb02bc
disabling calls to SURF_OCL causing tests failures
2014-03-25 14:09:49 +04:00
Andrey Pavlenko
63a746c6ea
fixing conditional compilation
2014-03-25 13:16:42 +04:00
Andrey Pavlenko
7e03a8b279
fixing check_docs2.py issue
2014-03-25 13:15:56 +04:00
Andrey Pavlenko
c6199fc3c1
Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix
2014-03-25 12:59:10 +04:00
Roman Donchenko
85cf2d9671
Merge pull request #2524 from SpecLad:merge-2.4
2014-03-25 12:13:04 +04:00
Konstantin Matskevich
67926fa028
ocl morphology fix
2014-03-25 10:39:50 +04:00
Aaron Kunze
ede6d4482b
Optimizations to OpenCL bilateral filter.
2014-03-24 13:35:56 -07:00
Andrey Pavlenko
9e1124d24a
Merge pull request #2525 from ilya-lavrenov:tapi_sep
2014-03-24 22:43:34 +04:00
Andrey Pavlenko
ba2eee9cbd
Merge pull request #2522 from ilya-lavrenov:tapi_canny
2014-03-24 19:31:26 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Roman Donchenko
8af175b81b
Merge pull request #2521 from atrebbi:#3620
2014-03-24 18:54:00 +04:00
Andrey Pavlenko
9c5745383f
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
2014-03-24 18:46:01 +04:00
Ilya Lavrenov
061a25447e
eliminated restriction delta == 0 from cv::sepFilter2D
2014-03-24 17:39:07 +04:00
Konstantin Matskevich
c2355d3a12
case-insensitivity
2014-03-24 15:20:00 +04:00
Ilya Lavrenov
e2c6ab0166
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
2014-03-24 14:42:51 +04:00
Ilya Lavrenov
b6833fdde7
added 3-channels support to cv::medianBlur
2014-03-24 14:32:31 +04:00
Ilya Lavrenov
a51ab99a79
added 3-channels support to cv::filter2D, cv::Laplacian
2014-03-24 14:32:31 +04:00
Ilya Lavrenov
e19c42dded
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
2014-03-24 14:31:42 +04:00
Ilya Lavrenov
8f5fd44fb2
added 3 channels support to cv::bilateralFilter
...
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
2014-03-24 14:31:41 +04:00
Roman Donchenko
f8a100f3e0
Merge pull request #2520 from vlkolesnikov:misprint_fix
2014-03-24 14:05:18 +04:00
Ilya Lavrenov
6ba60a1e22
added 3-channels support to cv::Canny
2014-03-24 13:02:54 +04:00
Roman Donchenko
9aa6528fd7
Merge pull request #2504 from asmorkalov:android_camera_locks_24
2014-03-24 12:06:51 +04:00
Roman Donchenko
623b1db8d1
Merge pull request #2515 from apavlenko:perf_default_strategy
2014-03-24 12:02:30 +04:00
Vladimir Kolesnikov
60803afe8f
Misprint fixed in table formatter
2014-03-24 11:04:49 +04:00
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
2014-03-24 10:37:15 +04:00
Andrey Pavlenko
157f35ef29
Merge pull request #2503 from mlyashko:optflow_dualtvl1
2014-03-24 10:35:51 +04:00
Andrey Pavlenko
ae89787984
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
2014-03-24 10:25:47 +04:00
Andrey Pavlenko
cf3a2e30cd
Merge pull request #2517 from ilya-lavrenov:fix
2014-03-24 10:25:04 +04:00
Andrey Pavlenko
259b9e093c
disabling failing tests
2014-03-24 10:12:02 +04:00
Andrey Pavlenko
5421d741bc
making OCL tests conform to the comon style
2014-03-24 10:08:44 +04:00
Alessandro Trebbi
c4a63f6a86
-
2014-03-23 22:00:16 +01:00
Ilya Lavrenov
20b6191842
doc fix
2014-03-23 16:20:00 +04:00
Koji Miyazato
0a5d6e10b9
Added test code for I/O of user-defined types.
2014-03-22 00:32:44 +09:00
Andrey Pavlenko
244f126ff6
Merge pull request #2454 from apavlenko:2.4_haar_extend
2014-03-21 18:45:58 +04:00
Andrey Pavlenko
f368b27f0a
Merge pull request #2489 from vbystricky:iocl_pyrlk
2014-03-21 18:33:32 +04:00
Andrey Pavlenko
a3668f1369
changing default perf strategy from BASIC (old) to SIMPLE (new, faster)
2014-03-21 18:29:06 +04:00
Andrey Pavlenko
8ac93f9b6b
Merge pull request #2508 from akarsakov:fix_erode_intel
2014-03-21 18:25:12 +04:00
Andrey Pavlenko
ef9669ba1a
Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device
2014-03-21 18:24:36 +04:00
Alexander Smorkalov
0dba5bdc4a
Multiple fixes in camera.
...
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
2014-03-21 17:26:05 +04:00
Konstantin Matskevich
79fc3a6203
added gpu type selection in OPENCV_OPENCL_DEVICE parser
2014-03-21 17:01:37 +04:00
Roman Donchenko
46d39aff68
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
2014-03-21 16:28:48 +04:00
Andrey Pavlenko
7193762d2d
Merge pull request #2495 from ilya-lavrenov:tapi_flip
2014-03-21 16:08:46 +04:00
Andrey Pavlenko
d18ebfa8e8
Merge pull request #2500 from akarsakov:hog_intel_fix
2014-03-21 16:02:49 +04:00
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
2014-03-21 16:02:47 +04:00
Andrey Pavlenko
fe5eaae102
adding missing include (fixing 'no ocl implementation' error)
2014-03-21 14:30:49 +04:00
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
2014-03-21 14:16:03 +04:00
Firat Kalaycilar
c9f51d5eed
modified BackgroundSubtractorMOG2::getBackgroundImage so that it can now work with gray-level images.
2014-03-21 09:44:11 +02:00
Alexander Karsakov
0bd4fd3a87
Workaround for Intel platform: replace min() with ternary operator
2014-03-21 09:33:00 +04:00
Andrey Pavlenko
b7198ccf1c
dropping legacy modes testing
2014-03-20 22:30:16 +04:00
Andrey Pavlenko
640e180efe
switching to CV_HAAR_SCALE_IMAGE mode, enabling test
2014-03-20 22:22:55 +04:00
Andrey Pavlenko
d060d30fa0
enabling OCL LBP branch for all devices
2014-03-20 21:57:34 +04:00
Andrey Pavlenko
bdfd29a0b8
Merge pull request #2496 from ilya-lavrenov:tapi_imgproc
2014-03-20 19:20:15 +04:00
mlyashko
80a40ae3d7
changed epsilon for test pass on Win32
2014-03-20 16:15:43 +04:00
Andrey Pavlenko
9c7ba6db90
Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters
2014-03-20 13:54:27 +04:00
Andrey Pavlenko
2299e2ed1b
Merge pull request #2494 from ilya-lavrenov:tapi_merge
2014-03-20 13:39:39 +04:00
Andrey Pavlenko
87ae0f9990
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
2014-03-20 13:39:17 +04:00
Ilya Lavrenov
63d8a61b9b
enabled 3-channels support for cv::createSuperResolution_BTVL1
2014-03-20 13:31:20 +04:00
Alexander Karsakov
b14c314fc3
Fixed incorrect thread synchronizations
2014-03-20 13:03:03 +04:00
Roman Donchenko
68c57a1e82
Merge pull request #2473 from euphrat:mog2_weight_bugfix
2014-03-20 12:40:23 +04:00
Ilya Lavrenov
eb8b4c58c7
fixed bug in cv::ocl::predictOptimalVectorWidth
2014-03-20 00:28:21 +04:00
krodyush
65d64af2a8
ocl_calcOpticalFlowPyrLK optimizations
...
1. decrease branch number in CL code by replacing them into weights
2. decrease local mem pressure in reduce operation by using private variables
3. decrease image sampler pressure by caching data into local memory
4. remove unnecessary sync point on the HOST side.
2014-03-19 19:31:14 +04:00
Ilya Lavrenov
291458a859
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
2014-03-19 18:56:16 +04:00
Alexander Karsakov
30a8308f8e
Enabled Intel-specific optimizations for HOG detector.
2014-03-19 17:30:13 +04:00
Ilya Lavrenov
b449b0bf71
simplified cv::sepFilter2D OpenCL part
2014-03-19 15:59:00 +04:00
Roman Donchenko
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +04:00
Ilya Lavrenov
b73490f86c
eliminated restriction src[i].channels() == 1 in cv::merge
2014-03-19 13:56:31 +04:00
Andrey Pavlenko
a2dec6c34e
Merge pull request #2493 from ilya-lavrenov:tapi_fnlm
2014-03-19 12:56:11 +04:00
Konstantin Matskevich
f9f730c426
update error message
2014-03-19 12:14:48 +04:00
Ilya Lavrenov
04884ebf45
added 3-channels support to cv::setIdentity
2014-03-19 01:53:53 +04:00
Ilya Lavrenov
d1cfcfcafd
added 3-channels support to morphology operations
2014-03-18 20:15:11 +04:00
Ilya Lavrenov
8d97d0d631
added 3-channels support to cv::flip
2014-03-18 19:31:37 +04:00
Firat Kalaycilar
0a16d93e1d
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2
2014-03-18 17:26:24 +02:00
Koji Miyazato
a43ef9a6cd
WriteStructContext treats state of fs
2014-03-18 23:29:30 +09:00
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
Roman Donchenko
b70332d806
Merge pull request #1986 from GregoryMorse:patch-3
2014-03-18 16:18:33 +04:00
Firat Kalaycilar
4d9698a4cf
Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix
2014-03-18 14:00:30 +02:00
Andrey Pavlenko
6e44f05e6f
Merge pull request #2464 from KonstantinMatskevich:ocl_stereobm_experiment
2014-03-18 15:53:09 +04:00
Konstantin Matskevich
eebf92ba58
fix for incorrect opencl device selection
2014-03-18 15:47:35 +04:00
Roman Donchenko
bff92da970
Merge pull request #2488 from Nerei:minor_doc
2014-03-18 15:41:20 +04:00
Roman Donchenko
d76226e21b
Merge pull request #2456 from kurodash:pr_use_cvAlloc
2014-03-18 14:39:40 +04:00
Ilya Lavrenov
6fe71bd27c
added 4 channels support to fnlm
2014-03-18 14:29:02 +04:00
Roman Donchenko
ae2b0b0098
Merge pull request #2486 from SpecLad:merge-2.4
2014-03-18 13:55:57 +04:00
Roman Donchenko
bfb1ba371c
Merge pull request #2026 from pemmanuelviel:giveFurthestPoint
2014-03-18 13:40:44 +04:00
Ilya Lavrenov
82e6edfba2
optimized sep filter
2014-03-18 00:16:38 +04:00
Ilya Lavrenov
3940b6163b
remove intel guard since the code is 2 times faster on AMD too
2014-03-17 19:11:21 +04:00
yash
51cb6998ea
made the example consistent with the fuction definition and improved doc
...
made the example consistent with the fuction definition and improved doc
2014-03-17 18:44:02 +05:30
Anatoly Baksheev
0c02e5de25
minor doc fix
2014-03-17 17:02:49 +04:00
vbystricky
6890aa0033
Fix problems on Intel HD graphics
2014-03-17 16:03:15 +04:00
Roman Donchenko
40a740ff88
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
2014-03-17 14:14:07 +04:00
Andrey Pavlenko
dc28451b8a
Merge pull request #2479 from alalek:ocl_compare_scalar
2014-03-17 14:04:22 +04:00
Andrey Pavlenko
2a1d5c6d43
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
2014-03-17 13:10:34 +04:00
Alexander Alekhin
af062b7c42
ocl: compare: remove useless perf tests
2014-03-17 12:33:12 +04:00
Roman Donchenko
882971151d
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
2014-03-17 11:59:14 +04:00
Roman Donchenko
136e5eb804
Merge pull request #2484 from berak:mat_doc_24
2014-03-17 11:57:10 +04:00
Konstantin Matskevich
1a43ed9893
finalizing
2014-03-17 10:42:19 +04:00
Anatoly Baksheev
24d8cbf940
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
2014-03-16 20:07:05 +04:00
berak
80708008a4
missing () on Mat::type()
2014-03-16 14:04:05 +01:00
Alexander Alekhin
7ce2ca2e0c
ocl: workaround for Pow accuracy test failure
2014-03-14 19:51:19 +04:00
Alexander Alekhin
9cafd50160
ocl: fixes
2014-03-14 19:51:19 +04:00
Alexander Alekhin
755ca4b7cf
ocl: compare with scalar
2014-03-14 19:51:19 +04:00
Andrey Pavlenko
dd6cf15a39
Merge pull request #2481 from akarsakov:fix_hog_intel
2014-03-14 19:17:03 +04:00
Andrey Pavlenko
bcb938efbb
Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4
2014-03-14 19:14:35 +04:00
Andrey Pavlenko
c72a0a1295
Merge pull request #2482 from ilya-lavrenov:tapi_fix
2014-03-14 19:08:07 +04:00
Andrey Pavlenko
6b434befc9
Merge pull request #2480 from vpisarev:ocl_orb
2014-03-14 19:04:19 +04:00
Konstantin Matskevich
af1084eb58
speedUp
2014-03-14 18:00:13 +04:00
Konstantin Matskevich
91e4334227
temp
2014-03-14 18:00:12 +04:00
Konstantin Matskevich
18a59b48ba
fixes
2014-03-14 18:00:12 +04:00
Konstantin Matskevich
ddc235172e
new approach
2014-03-14 18:00:11 +04:00
Konstantin Matskevich
a5d989f346
new attempt
2014-03-14 18:00:11 +04:00
Konstantin Matskevich
799d7e7a50
bad experiment =(
2014-03-14 18:00:10 +04:00
Konstantin Matskevich
0904f10ab5
optimizations
2014-03-14 18:00:10 +04:00
Konstantin Matskevich
bfc843a5f5
added optimization
2014-03-14 18:00:09 +04:00
Konstantin Matskevich
b5f717b6b3
stereoBM
2014-03-14 18:00:09 +04:00
Ilya Lavrenov
6f12f1b3b5
added 3 vs 4 channels performance tests
2014-03-14 17:30:14 +04:00
Ilya Lavrenov
6be7869ae8
fix for unsupported doubles
2014-03-14 16:54:52 +04:00
Roman Donchenko
4a4151ec97
Merge pull request #2474 from akarsakov:fix_getpolicy
2014-03-14 15:17:45 +04:00
Alexander Karsakov
4698d62125
Removed workaround for Intel platform.
2014-03-14 14:18:52 +04:00
Alexander Karsakov
8910508b83
Fixed getPolicy() method to make it thread-safe.
2014-03-14 13:50:33 +04:00
kuroda sho
f9484bae8a
fix: use "cvAlloc" wrapper function for malloc.
2014-03-14 17:09:08 +09:00
Ilya Lavrenov
b47bec2ed0
performance tests for ORB
2014-03-13 23:30:02 +04:00
Vadim Pisarevsky
4fafab3786
fixed extra whitespace
2014-03-13 23:18:41 +04:00
Vadim Pisarevsky
42e604abea
fixed bug in FAST
2014-03-13 23:17:28 +04:00
Vadim Pisarevsky
3e854fa6e5
finished OpenCL port of ORB
2014-03-13 22:56:53 +04:00
Ilya Lavrenov
61c347fb76
typos
2014-03-13 22:56:46 +04:00
Ilya Lavrenov
357a856cf6
nonfree perf tests
2014-03-13 22:35:08 +04:00
Ilya Lavrenov
6f76e7b42d
improved performance of bitwise ops
2014-03-13 19:42:13 +04:00
Andrey Pavlenko
0ce8f1d5dd
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
2014-03-13 18:55:28 +04:00
Andrey Pavlenko
c5bf1c108c
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
2014-03-13 18:42:01 +04:00
Andrey Pavlenko
4233539617
Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels
2014-03-13 18:37:05 +04:00
Ilya Lavrenov
adc15c2bba
improved performance of cv::ocl::sum
2014-03-13 17:33:18 +04:00
Andrey Pavlenko
a6c40abfb2
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
2014-03-13 16:56:01 +04:00
Andrey Pavlenko
0764a23eb2
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
2014-03-13 16:49:57 +04:00
Andrey Pavlenko
6b6cfa893d
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
2014-03-13 16:48:38 +04:00
Alexander Alekhin
48196ad10b
ocl: cleanup workarounds
2014-03-13 15:46:38 +04:00
Ilya Lavrenov
3ebfe60008
improved performance of cv::ocl::countNonZero
2014-03-13 15:35:53 +04:00
Ilya Lavrenov
8e79de35a8
changes for GFTT
2014-03-13 14:57:13 +04:00
Koji Miyazato
b96762a48f
Fix for bug #3599 : cv::FileStorage does not work for std::vector of user-defined struct.
2014-03-13 19:41:13 +09:00
Ilya Lavrenov
a5afcd9f11
improved performance of cv::ocl::minMax
2014-03-13 14:35:12 +04:00
Roman Donchenko
553673eeed
Merge pull request #2468 from mlyashko:back_proj_fix
2014-03-13 13:42:20 +04:00
Roman Donchenko
fd8f2c8d23
Merge pull request #2463 from ziyangli:master
2014-03-12 18:51:41 +04:00
Firat Kalaycilar
a87607e3ef
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in BackgroundSubtractorMOG2
2014-03-12 16:14:59 +02:00
Roman Donchenko
836635d2d5
Merge pull request #2434 from Nerei:viz_continue
2014-03-12 16:53:42 +04:00
Anatoly Baksheev
4d7a593c25
minor cmake fix fo macos
2014-03-12 16:22:22 +04:00
Ilya Lavrenov
9932cf41a4
3-channel reduction operations
2014-03-12 15:07:39 +04:00
Alexander Alekhin
dca401d4cc
ocl: pyrUp/pyrDown 3-channel
2014-03-12 14:39:55 +04:00
ziyangli
bbe8654c3d
cleanup
2014-03-12 18:16:54 +08:00
Ziyang LI
4f5896493e
remove a whitepace
2014-03-12 18:14:43 +08:00
Ilya Lavrenov
f138b613b7
cv::compare
2014-03-12 13:16:33 +04:00
mlyashko
5252aa8fdd
added data type check for back projection fix
2014-03-12 11:30:28 +04:00
Ilya Lavrenov
89b7c0dd93
3 channel support to cv::transpose
2014-03-12 00:17:11 +04:00
Ilya Lavrenov
2755ae5df9
experiments
2014-03-11 23:03:55 +04:00
Roman Donchenko
1bb0c5747c
Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo
2014-03-11 17:41:18 +04:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Andrey Pavlenko
702a2a6ff6
Merge pull request #2373 from mlyashko:optflow_dualtvl1
2014-03-11 16:00:22 +04:00
Andrey Pavlenko
5261fbe217
Merge pull request #2387 from alalek:ocl_remap_3cn
2014-03-11 15:59:12 +04:00
Andrey Pavlenko
90c5dde887
Merge pull request #2455 from ilya-lavrenov:tapi_fix
2014-03-11 15:58:32 +04:00
Ilya Lavrenov
9b31e6cd44
changes according to reviewer's suggestions
2014-03-11 15:40:31 +04:00
Andrey Pavlenko
0084dee05b
Merge pull request #2448 from akarsakov:ocl_cxt_termination
2014-03-11 12:57:29 +04:00
Ilya Lavrenov
3eff05e3eb
added performance tests for cv::ocl::calcHist
2014-03-11 12:34:27 +04:00
Alexander Alekhin
e7475bff68
TAPI: remap 3-channel
2014-03-10 20:35:10 +04:00
Alexander Alekhin
e4608229f0
ocl: copyMakeBorder 3-channel
2014-03-10 17:22:49 +04:00
Ziyang LI
786e3b9eee
Moved x = 0 into the parenthesis
...
Easier to understand
2014-03-10 17:33:13 +08:00
Ian Taylor
45969bb3ae
fix variable name typo in calcBlurriness
2014-03-10 03:02:06 -04:00
Ilya Lavrenov
208831eb5d
optimized cv::calcHist
2014-03-08 12:24:31 +04:00
Vadim Pisarevsky
efdfca7a11
do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient
2014-03-07 18:55:45 +04:00
Roman Donchenko
70e22b682d
Merge pull request #2397 from vbystricky:intelperc
2014-03-07 18:19:00 +04:00
Vadim Pisarevsky
06c138bd64
make the correctness test pass
2014-03-07 18:18:10 +04:00
vbystricky
193e97a34a
Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual
2014-03-07 16:25:15 +04:00
kurodash
0eaeff0641
fix: use "cvAlloc" wrapper function for malloc.
2014-03-07 19:02:37 +09:00
Andrey Pavlenko
2879ff2098
Merge pull request #2437 from ilya-lavrenov:tapi_morph
2014-03-07 14:00:09 +04:00
Andrey Pavlenko
5dbe73f94d
Merge pull request #2438 from ilya-lavrenov:tapi_flip
2014-03-07 13:54:34 +04:00
Andrey Pavlenko
182d74d33f
Merge pull request #2441 from akarsakov:ocl_platform_vendor
2014-03-07 13:54:13 +04:00
Andrey Pavlenko
451be9ed53
Merge pull request #2444 from ilya-lavrenov:tapi_gftt
2014-03-07 13:53:43 +04:00
Andrey Pavlenko
3cb49eac49
Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data
2014-03-07 13:52:47 +04:00
Andrey Pavlenko
8f3492851e
Merge pull request #2453 from ilya-lavrenov:tapi_sobel
2014-03-07 13:51:37 +04:00
Alexander Karsakov
8660588fe9
Pass vendor macro to opencl kernel
2014-03-07 12:57:29 +04:00
mlyashko
eb2e8a11fa
changed kernel.set to support unsuccssful set
2014-03-07 11:15:54 +04:00
sprice
75ed2f52f1
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/stardetector.cpp
2014-03-06 15:39:06 -08:00
Ilya Lavrenov
0e2cc5ef63
fix bitwise ops and mask support
2014-03-06 23:39:05 +04:00
Andrey Pavlenko
d1d451c952
Merge pull request #2431 from ilya-lavrenov:tapi_perf
2014-03-06 22:17:44 +04:00
Andrey Pavlenko
229aa62300
Merge pull request #2445 from ilya-lavrenov:ocl_perf
2014-03-06 22:03:01 +04:00
Andrey Pavlenko
2f0fe5b87b
Merge pull request #2450 from ilya-lavrenov:tapi_test
2014-03-06 21:55:50 +04:00
Vadim Pisarevsky
8e1918e86e
added OpenCL-accelerated(?) FAST; for now the tests fail :(
2014-03-06 18:04:04 +04:00
Ilya Lavrenov
dc76e6b4a1
added new dtypes to cv::Sobel
2014-03-06 17:57:13 +04:00
Ilya Lavrenov
4a7289b22f
improved cv::preCornerDetect
2014-03-06 17:40:02 +04:00
Ilya Lavrenov
d9c5fbc9ba
disable SURF
2014-03-06 16:49:22 +04:00
Alexander Karsakov
806e9241a6
Clarifying comments
2014-03-06 16:44:46 +04:00
Ilya Lavrenov
1291bd1c4a
ported fast calculation of covar data
2014-03-06 15:40:27 +04:00
Ilya Lavrenov
f404315368
test for clEnqueueReadBufferRect
2014-03-06 12:11:46 +04:00
mlyashko
66ed6a8a50
macro for normal return from thriveless kernel.set
2014-03-06 11:43:01 +04:00
Alexander Smorkalov
b3e18d23a3
Implicit CUDA and OpenCL control for module definition added.
...
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
2014-03-06 10:31:33 +04:00
Ilya Lavrenov
f7a474180b
tuned some tests
2014-03-06 09:24:02 +04:00
Ilya Lavrenov
86a3ed4162
improved performance of GFTT
2014-03-06 09:19:40 +04:00
Anatoly Baksheev
fde0185a77
iteractor work
2014-03-06 03:26:21 +04:00
Vadim Pisarevsky
22f42a639f
fixed doc builder warnings; make sure the tests give reasonable results when OpenCL is not available
2014-03-05 18:48:19 +04:00
Alexander Karsakov
4aa891e773
Remove clReleaseDevice call (workaround for pure virtual call on Windows)
2014-03-05 17:57:06 +04:00
Vadim Pisarevsky
60ce2b2e9f
modified SURF's performance test to test OpenCL version as well
2014-03-05 17:10:51 +04:00
Vadim Pisarevsky
da70b04262
made SURF_OCL default constructor parameters the same as SURF
2014-03-05 17:04:49 +04:00
Vadim Pisarevsky
3c1917771b
modified OpenCL SURF API and the tests in 2.4.x to prove that it gives different from CPU results
2014-03-05 16:31:41 +04:00
Alexander Karsakov
c1dad2178c
Added Device:: isAMD,isIntel,isNvidia methods.
2014-03-05 14:43:11 +04:00
vbystricky
d4a1df85be
Change text of copyright
2014-03-05 13:06:36 +04:00
vbystricky
f9e942f9ef
Change text of license and copyright
2014-03-05 11:03:57 +04:00
Dave Hughes
b184d7f27b
Fix for #3554
...
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
2014-03-05 02:44:40 +00:00
Cody Rigney
a80ebfe28d
Master Version: Added NEON Optimizations for LK Optical Flow.
2014-03-04 14:47:12 -05:00
Andrey Pavlenko
0a3aca230c
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
2014-03-04 19:21:15 +04:00
Andrey Pavlenko
ba4513503e
Merge pull request #2429 from ilya-lavrenov:master_compatible_tests
2014-03-04 19:18:13 +04:00
Andrey Pavlenko
c9d8025fab
Merge pull request #2391 from ilya-lavrenov:tapi_match_template
2014-03-04 18:50:14 +04:00
Andrey Pavlenko
c00f0faf24
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
2014-03-04 18:37:26 +04:00
Roman Donchenko
5527f2872d
Merge pull request #2409 from juanmanpr:master
2014-03-04 15:32:13 +04:00
Roman Donchenko
b5248dbf3f
Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
2014-03-04 15:30:26 +04:00
Roman Donchenko
fa3f29f2b5
Merge pull request #2439 from ilya-lavrenov:typo
2014-03-04 13:51:31 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Roman Donchenko
0692a674d1
Merge pull request #2381 from ElenaGvozdeva:ipp_resize
2014-03-04 11:49:02 +04:00
Roman Donchenko
a600267b9f
Merge pull request #2432 from ilya-lavrenov:summary_py
2014-03-04 11:46:29 +04:00
mlyashko
5c867463d2
changed localsize to NULL (reviewers comment)
2014-03-04 11:36:47 +04:00
Hilton Bristow
72d5609a36
Merged upstream master
2014-03-04 11:14:03 +10:00
GregoryMorse
90920c2376
Update cap_msmf.cpp
...
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update cap_msmf.cpp
Create cap_msmf.h
Update cap_msmf.cpp
Update cap_msmf.h
Update cap_msmf.cpp
Update cap_msmf.h
Update and rename cap_msmf.h to cap_msmf.hpp
Update cap_msmf.cpp
Update CMakeLists.txt
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.cpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Successful test - samples are grabbed
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Create ppltasks_winrt.h
Update cap_msmf.hpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update ppltasks_winrt.h
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Update ppltasks_winrt.h
Fixed trailing whitespace
2014-03-04 01:52:17 +08:00
Ilya Lavrenov
050cca0422
improved performance of cv::flip (flip cols)
2014-03-03 19:04:32 +04:00
Ilya Lavrenov
4376de7698
fixed morphology operations
2014-03-03 15:29:48 +04:00
Ilya Lavrenov
be5b5a0471
fixed cv::dft
2014-03-03 14:32:38 +04:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Ilya Lavrenov
29deff8707
ability to merge logs with intersections only
2014-03-03 13:27:07 +04:00
Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
Anatoly Baksheev
fb7e74c511
iteractor work
2014-03-02 23:15:53 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Ilya Lavrenov
68957b2757
added some new performance tests
2014-03-02 10:29:50 +04:00
Ilya Lavrenov
767b28f2e3
tests
2014-03-01 18:47:44 +04:00
Cody Rigney
fbc69e444b
Added NEON optimizations for LK optical flow (Intrinsics).
2014-02-28 16:48:04 -05:00
Ilya Lavrenov
c1c3139368
master-like performance tests
2014-02-28 22:40:24 +04:00
Elena Gvozdeva
68edda3350
fixed
2014-02-28 11:56:23 +04:00
Alexander Alekhin
b9d68ef061
core/ocl: OpenCL build log improvements
2014-02-27 13:16:07 +04:00
Andrey Pavlenko
57b6850d74
Merge pull request #2415 from vpisarev:fix_stereobm_sse
2014-02-27 09:37:04 +04:00
Alexander Karsakov
e6f6707558
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
2014-02-26 18:11:11 +04:00
Roman Donchenko
bd5d8404c9
Merge pull request #2393 from ilya-lavrenov:coverity
2014-02-26 12:16:36 +04:00
mlyashko
ba5ebaa758
changed file name to case-sensitve to support linux
2014-02-26 10:55:18 +04:00
juanmanpr
7a68e3d207
CV_Assert for photo module corrected
2014-02-25 19:58:08 +01:00
Roman Donchenko
693129902d
Merge pull request #2399 from SpecLad:merge-2.4
2014-02-25 19:42:54 +04:00
Vadim Pisarevsky
a3aced20c1
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
2014-02-25 18:13:51 +04:00
Roman Donchenko
c9a4a82667
Merge pull request #2358 from rohitgirdhar:rotatedRect
2014-02-25 17:43:48 +04:00
Ilya Lavrenov
ce0557ebb8
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
Elena Gvozdeva
45cc8a5300
fixed
2014-02-25 16:43:52 +04:00
Roman Donchenko
1db1a83410
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
2014-02-25 15:04:24 +04:00
Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Ilya Lavrenov
fe38aab84a
core tapi optimization
2014-02-25 14:14:42 +04:00
Elena Gvozdeva
48e7bc6b30
fixed
2014-02-25 12:59:33 +04:00
Roman Donchenko
7dc549f166
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
2014-02-25 12:37:01 +04:00
Alexander Smorkalov
c78142acb0
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
...
The crash was cased by massive Mat objects leak in NativeCameraView class.
2014-02-25 11:54:03 +04:00
vbystricky
ff8b8ef24c
Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera
2014-02-25 10:59:35 +04:00
Alexander Smorkalov
dbb7aa7856
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
...
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
2014-02-25 10:36:20 +04:00
Andrey Pavlenko
d695d4a0bf
Merge pull request #2406 from ilya-lavrenov:abf
2014-02-25 09:12:32 +04:00
juanmanpr
540a60fca7
Replaced calls to cout from photo module, by CV_Assert
2014-02-25 00:29:07 +01:00
Ilya Lavrenov
653b99c9bd
new scheme of sqrSum
2014-02-25 00:38:44 +04:00
Ilya Lavrenov
e1a598c5b3
disabled ABF tests
2014-02-24 23:26:01 +04:00
mlyashko
e75a257f92
changed epsilon for test passing
2014-02-24 17:47:56 +04:00
Andrey Pavlenko
73dfc4cb8c
Merge pull request #2402 from ilya-lavrenov:amd_libs
2014-02-24 16:56:40 +04:00
Andrey Pavlenko
3845b96f6c
Merge pull request #2388 from alalek:coverity_bug_fix
2014-02-24 16:54:44 +04:00
Andrey Pavlenko
52a339cba5
Merge pull request #2401 from akarsakov:fix_elem_size
2014-02-24 16:22:28 +04:00
Ilya Lavrenov
16bfdbd22a
dump AMD Blas/Fft
2014-02-24 15:12:42 +04:00
Alexander Karsakov
6d83048ec3
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
2014-02-24 15:10:00 +04:00
Nghia Ho
ced8e7a813
Typo
2014-02-24 20:06:20 +11:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
Ilya Lavrenov
0406898b9a
int2 -> ulong; to work properly with 3 channels
2014-02-23 15:12:38 +04:00
Ilya Lavrenov
0ef16125ae
improved cv::matchTemplate OpenCL part
2014-02-22 14:30:19 +04:00
Rohit Girdhar
fd4461d543
addressed issues
2014-02-22 09:54:16 +05:30
Roman Donchenko
0a90d6dde6
Merge pull request #2266 from vpisarev:ipp_norm_fix
2014-02-21 19:11:57 +04:00
Vadim Pisarevsky
51dafc780b
fixed hint type declaration
2014-02-21 18:07:01 +04:00
Roman Donchenko
51421098dd
Merge pull request #2201 from mattip:2.4
2014-02-21 17:57:36 +04:00
Matti Picus
dc50dc7254
fix merge
2014-02-21 13:54:58 +02:00
Alexander Alekhin
9b3c76a3db
TAPI: coverity bug fix
2014-02-21 14:04:01 +04:00
Matti Picus
f5330a44e8
merge with origin
2014-02-21 11:59:49 +02:00
Ilya Lavrenov
c7857e8c13
small fixes
2014-02-21 12:19:08 +04:00
Rohit Girdhar
347a3dc520
added randomized test
2014-02-21 12:47:01 +05:30
Matti Picus
31c8f2ec57
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
2014-02-20 22:12:22 +02:00
Matti Picus
46d128e073
add test (needs updated opencv_extra repo)
2014-02-20 22:10:22 +02:00
Andrey Pavlenko
9c5bd85247
Merge pull request #2375 from akarsakov:fix_getGradient
2014-02-20 21:41:43 +04:00
Andrey Pavlenko
b96923d5fa
Merge pull request #2377 from alalek:tapi_warpers_perf_test
2014-02-20 21:40:28 +04:00
Ilya Lavrenov
aa5311ea9f
backport of master-based perf tests for matchTemplate to 2.4
2014-02-20 18:58:32 +04:00
Ilya Lavrenov
804b70b72f
ported 2.4 perf tests for matchTemplate
2014-02-20 18:11:56 +04:00
Elena Gvozdeva
7b552c0493
fixed
2014-02-20 17:34:51 +04:00
Rohit Girdhar
ea7b1bb3d2
added test, doc
2014-02-20 17:51:48 +05:30
Elena Gvozdeva
cd68cd43a2
Fixed
2014-02-20 16:13:05 +04:00
mlyashko
10f2a038c2
Optical flow dualt tvl1 ocl-based implementation and tests
2014-02-20 14:23:10 +04:00
Elena Gvozdeva
e013d31715
Added IPP function for resize()
2014-02-20 14:01:22 +04:00
Alexander Karsakov
7e4dea968c
Fixed typo with indexes in getGradient(x/y) functions.
2014-02-20 13:58:31 +04:00
Roman Donchenko
ad66233774
Merge pull request #2376 from GrinIara:master
2014-02-20 13:43:22 +04:00
Alexander Alekhin
79eba54a4f
some fixes in perf tests
2014-02-20 13:29:11 +04:00
Alexander Alekhin
ddd3c062b5
TAPI: fix perf test for warpers
2014-02-20 13:09:06 +04:00
Vladislav Vinogradov
7fd21d217a
fix bug #3562 :
...
add missing __syncthreads to edgesHysteresisLocalKernel
2014-02-20 10:24:52 +04:00
GrinIara
fa0599448d
Fixed compilation error due to missing std::.
2014-02-19 17:06:33 +01:00
Rohit Girdhar
b939b4ae3b
removed inline, changed interface
2014-02-19 20:58:40 +05:30
Ilya Lavrenov
8bf616e4c7
added color image support via L*a*b*
2014-02-19 18:35:37 +04:00
Ilya Lavrenov
634e8d37cc
fixed for 2 channels
2014-02-19 18:18:22 +04:00
Alexander Alekhin
bf4f15fb5f
TAPI: fix OpenCL warpers and test
2014-02-19 15:30:43 +04:00
Ilya Lavrenov
7faf1f6277
some improvements
2014-02-19 15:01:34 +04:00
Roman Donchenko
ccbceb56c4
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
2014-02-19 14:48:57 +04:00
Roman Donchenko
ce42593fe6
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
2014-02-19 12:03:06 +04:00
Alexander Smorkalov
4c1ed13846
Warning fixes for GCC 4.8.
2014-02-18 23:53:35 +04:00
Ilya Lavrenov
72c327fef8
hope it finally works
2014-02-18 19:23:38 +04:00
Roman Donchenko
af9368d35f
Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo
2014-02-18 17:00:54 +04:00
Roman Donchenko
c35dab9046
Merge pull request #2359 from SpecLad:moments-no-vectorize
2014-02-18 17:00:32 +04:00
Roman Donchenko
3782c324c4
Merge pull request #2098 from pxli168:patch-1
2014-02-18 15:49:19 +04:00
Roman Donchenko
6f19ef8631
Merge pull request #2361 from alekcac:ios_camera_changes
2014-02-18 15:44:56 +04:00
Ilya Lavrenov
38cbe9873a
small fixes
2014-02-18 14:56:13 +04:00
Ilya Lavrenov
9db28f332a
more fixes
2014-02-18 14:32:03 +04:00
Ilya Lavrenov
891dbeabba
implemented OpenCL version of cv::fastNlMeansDenoising
2014-02-18 14:32:03 +04:00
Ilya Lavrenov
d27068f79a
some more refactoring
2014-02-18 14:32:03 +04:00
Ilya Lavrenov
e16d89e8d6
some refactoring
2014-02-18 14:32:03 +04:00
Ilya Lavrenov
da9bdf9c15
fixes typo and unused variables
2014-02-18 14:16:54 +04:00
Alexander Shishkov
77df5948e7
removed trailing spaces
2014-02-18 13:56:26 +04:00
Roman Donchenko
e35d98e566
Worked around an apparent GCC bug in moments.
2014-02-18 13:51:27 +04:00
Roman Donchenko
b7659c62f3
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
2014-02-18 13:47:46 +04:00
yash
394c74b349
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
2014-02-18 15:04:27 +05:30
Andrey Pavlenko
e6420c523d
Merge pull request #2235 from alalek:ocl_svm_perf_test
2014-02-18 13:33:16 +04:00
Andrey Pavlenko
b3cfe6b446
Merge pull request #2341 from alalek:ocl_fix_error_processing
2014-02-18 13:27:38 +04:00
Andrey Pavlenko
ff9a0815b9
Merge pull request #2352 from ilya-lavrenov:flann
2014-02-18 13:24:41 +04:00
Roman Donchenko
2409812803
Merge pull request #2347 from Chechli:master
2014-02-18 12:57:26 +04:00
Roman Donchenko
139a262072
Merge pull request #2367 from jet47:fix-3544
2014-02-18 12:15:49 +04:00
Roman Donchenko
bcf4307345
Merge pull request #2356 from SpecLad:merge-2.4
2014-02-18 12:14:57 +04:00
Roman Donchenko
95d7ecb33f
Merge pull request #2364 from ilya-lavrenov:unused_field
2014-02-18 11:57:36 +04:00
Chechli
768da4d95a
Update hough_circles.cpp
2014-02-18 08:50:33 +01:00
Vladislav Vinogradov
afd99c9c81
fix bug #3544 :
...
add "opencv2/core/utility.hpp" header to precomp.hpp
2014-02-18 10:45:47 +04:00
yash
38ef8894b7
Made a sentence in the doc for Mat::copyTo more clearer
2014-02-18 10:51:05 +05:30
pxli168
44ecb727c5
Change again.
...
Opps.
2014-02-18 10:13:30 +08:00
Ilya Lavrenov
6ad7b64912
some more changes
2014-02-17 21:57:33 +04:00
Ilya Lavrenov
01527c44fd
removed unused field
2014-02-17 21:50:00 +04:00
Andrey Pavlenko
9885a671ee
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
2014-02-17 17:53:05 +04:00
Andrey Pavlenko
47d9b933f6
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
2014-02-17 17:38:26 +04:00
Alexander Shishkov
cc529d971b
removed tabs
2014-02-17 17:37:02 +04:00
Andrey Pavlenko
aeeb9f9e25
Merge pull request #2334 from alalek:umat_usage_flags_2
2014-02-17 17:34:19 +04:00
Rohit Girdhar
a879e1fcd6
fixed warnings
2014-02-17 19:00:36 +05:30
Evgeniy
8236181c62
Added more colorizing options to XLS generating script
2014-02-17 17:01:23 +04:00
Andrey Pavlenko
01b225acb0
Merge pull request #2340 from ilya-lavrenov:tapi_lab
2014-02-17 16:45:40 +04:00
Rohit Girdhar
613a17355d
rotRect using points
2014-02-17 17:39:13 +05:30
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Roman Donchenko
a6d64e254f
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
2014-02-17 15:00:47 +04:00
Roman Donchenko
e8d26b02ac
Merge pull request #2339 from jet47:gpu-warnings
2014-02-17 13:35:15 +04:00
Marijan Vukcevich
9a98cd6e65
Update cap_ios_abstract_camera.mm
...
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
2014-02-17 13:23:25 +04:00
Chechli
9211d1ac2d
Update hough_circles.cpp
2014-02-17 09:50:32 +01:00
Chechli
640a45d359
Update precomp.hpp
2014-02-17 09:48:51 +01:00
Roman Donchenko
a0bb74a086
Merge pull request #2337 from pmoulon:master
2014-02-17 12:24:48 +04:00
Roman Donchenko
cfcf07acfa
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
2014-02-17 12:23:59 +04:00
Roman Donchenko
8cbb284b7b
Merge pull request #2348 from ilya-lavrenov:typo
2014-02-17 12:02:59 +04:00
gleb.sternharz
f85aa929f1
fix dev by 0 in KL-Divergence
2014-02-17 04:08:30 +01:00
pxli168
70d462b352
Simplify the code
...
Simplify the code as @SpecLad suggested.
2014-02-17 10:21:18 +08:00
Ilya Lavrenov
f74ef644bc
changed the signature of add method according to the base class
2014-02-17 02:39:38 +04:00
yash
1a89a03c7c
Fixed CV_ASSERT condition in the code for bag of words
2014-02-16 22:33:30 +05:30
Chechli
10465c546a
Update hough_circles.cpp
2014-02-16 13:26:00 +01:00
Ilya Lavrenov
c8e22c04c8
extended performance test
2014-02-16 13:42:25 +04:00
Vladislav Vinogradov
150e522bee
fix bug #3552 :
...
replace std::swap with own code
2014-02-16 12:17:17 +04:00
Ilya Lavrenov
510680a5df
typo
2014-02-16 01:42:02 +04:00
Ilya Lavrenov
7629bb78a4
extended performance tests to test 3 channels
2014-02-16 01:31:33 +04:00
Anatoly Baksheev
03bd82796d
source compatibility with master
2014-02-15 23:40:09 +04:00
Chechli
72e4f72a75
Update hough_circles.cpp
2014-02-15 17:31:14 +01:00
Ilya Lavrenov
9b627a5e9f
disabled 'reshape', 'copyTo' test
2014-02-15 20:17:42 +04:00
Anatoly Baksheev
56754e907d
fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
2014-02-15 20:08:04 +04:00
Anatoly Baksheev
1a5dfe421d
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
2014-02-15 17:02:17 +04:00
Ilya Lavrenov
7ce2c3574a
restored lost in PR #1735 umat tests
2014-02-15 16:09:55 +04:00
Ilya Lavrenov
4f36bc29d9
cleaned-up UMat tests
2014-02-15 15:51:52 +04:00
Alexander Alekhin
915fb632fd
core/ocl: change error processing for missed function
2014-02-14 19:50:58 +04:00
Ilya Lavrenov
8150c1b7e4
added [s|l]rgb <-> lab conversion
2014-02-14 18:45:56 +04:00
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +04:00
Alexander Alekhin
d1606b4aa3
ocl: added SVM perf test
2014-02-14 16:36:46 +04:00
Roman Donchenko
e0d991cf46
Merge pull request #2335 from jet47:gpu-alphacomp-test
2014-02-14 16:20:45 +04:00
Andrey Pavlenko
0fc248fb70
Merge pull request #2326 from vpisarev:ocl_ch3
2014-02-14 15:49:36 +04:00
Alexander Alekhin
95e38e457f
core/umat: usage flags (with proposals from PR #2195 )
2014-02-14 15:40:16 +04:00
Roman Donchenko
fa272c43c2
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
2014-02-14 15:37:09 +04:00
Pierre Moulon
8829e9f6c8
Fix a typo error
2014-02-14 12:22:53 +01:00
Roman Donchenko
a1de9e9ad5
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
2014-02-14 14:38:37 +04:00
Vladislav Vinogradov
1ce5165cb7
temporary disable performance test for alphaComp function
2014-02-14 14:27:43 +04:00
Andrey Pavlenko
534bec3a90
Merge pull request #2315 from ilya-lavrenov:nlmeans_perf
2014-02-14 13:24:12 +04:00
Andrey Pavlenko
d68c688f22
Merge pull request #1735 from KonstantinMatskevich:umat_tests
2014-02-14 12:37:47 +04:00
Roman Donchenko
3def7778dc
Merge pull request #2062 from cook:bug3440
2014-02-14 12:09:03 +04:00
Yantao Xie
6b00c4e337
Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.
2014-02-13 23:53:58 +08:00
Roman Donchenko
ecbe843061
Merge pull request #2333 from asmorkalov:java_dead_code_fix
2014-02-13 19:21:56 +04:00
Alexander Smorkalov
dbe7634286
Dead code removed as this cannot be null in Java.
2014-02-13 18:17:47 +04:00
Vadim Pisarevsky
630bdbf42f
fixed OpenCL kernel flag in resize (thanks to Ilya L)
2014-02-13 17:37:42 +04:00
Vladislav Vinogradov
eb247d826f
temporary disable perf test for StereoBeliefPropagation
2014-02-13 17:25:59 +04:00
Vladislav Vinogradov
9e69e2a07a
increase epsilon for AlphaComp sanity test for integer input
2014-02-13 17:16:43 +04:00
Konstantin Matskevich
5f76072c62
update
2014-02-13 13:29:53 +04:00
Andrey Pavlenko
0ee5c34f40
Merge pull request #2324 from vpisarev:fix_facedetect
2014-02-13 11:46:24 +04:00
Konstantin Matskevich
a0a3b8b56d
Some tests for UMat
2014-02-13 09:59:05 +04:00
Ilya Lavrenov
879c0196d4
enabled OpenGL on MacOSX
2014-02-13 00:17:15 +04:00
Rohit Girdhar
a4b5641836
bugfix: blobdetector was putting incorrect diameter value in keypoints
2014-02-12 22:29:04 +05:30
Vadim Pisarevsky
91587059ad
tab => spaces
2014-02-12 20:28:55 +04:00
Vadim Pisarevsky
290fbc0121
3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective
2014-02-12 19:29:18 +04:00
Vadim Pisarevsky
a18bc9651d
fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)
2014-02-12 17:42:09 +04:00
Stuart Cunningham
5d43d3ca88
Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.
2014-02-12 23:41:38 +11:00
Roman Donchenko
863e9c699a
Merge pull request #2322 from berak:b_cc_read
2014-02-12 16:32:29 +04:00
Stuart Cunningham
8bbce0a2a2
Fix reading of 16-bit TIFF images on big endian host.
...
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().
Added test where both big and little endian TIFF files are read using imread().
Fixed build of 3rdparty libtiff on big endian hosts.
Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
2014-02-12 21:21:06 +11:00
Vadim Pisarevsky
f7620dc7d1
added 3-channel support to arithmetic operations
2014-02-12 12:18:55 +04:00
Zhigang Gong
9aef26e2ad
Workaround a LLVM/Clang 3.3 bug.
...
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2014-02-12 13:14:43 +08:00
Anatoly Baksheev
261546f6f6
casting Vec3b operator for viz::Color
2014-02-11 23:27:19 +04:00
Ilya Lavrenov
4f2cdc9bac
added performance tests for NLMeans
2014-02-11 18:21:53 +04:00
Roman Donchenko
72aabb8a84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVGenAndroidMK.cmake
cmake/templates/OpenCV.mk.in
doc/tutorials/viz/creating_widgets/creating_widgets.rst
doc/tutorials/viz/launching_viz/launching_viz.rst
doc/tutorials/viz/table_of_content_viz/images/image_effects.png
doc/tutorials/viz/transformations/transformations.rst
doc/tutorials/viz/widget_pose/widget_pose.rst
modules/core/include/opencv2/core/affine.hpp
modules/core/include/opencv2/core/core.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/cuda/canny.cu
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_color.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_gpumat.cpp
modules/gpu/test/test_hough.cpp
modules/nonfree/CMakeLists.txt
modules/nonfree/include/opencv2/nonfree/gpu.hpp
modules/nonfree/perf/perf_gpu.cpp
modules/nonfree/src/cuda/surf.cu
modules/nonfree/src/precomp.hpp
modules/nonfree/src/surf_gpu.cpp
modules/nonfree/test/test_gpu.cpp
modules/ocl/perf/perf_haar.cpp
modules/stitching/CMakeLists.txt
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
modules/stitching/include/opencv2/stitching/warpers.hpp
modules/stitching/src/blenders.cpp
modules/stitching/src/matchers.cpp
modules/stitching/src/precomp.hpp
modules/stitching/src/seam_finders.cpp
modules/stitching/src/stitcher.cpp
modules/stitching/src/warpers.cpp
modules/viz/doc/widget.rst
modules/viz/include/opencv2/viz/types.hpp
modules/viz/include/opencv2/viz/viz3d.hpp
modules/viz/include/opencv2/viz/widget_accessor.hpp
modules/viz/src/precomp.hpp
modules/viz/src/shapes.cpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkCloudMatSource.h
modules/viz/test/test_precomp.hpp
modules/viz/test/tests_simple.cpp
samples/android/tutorial-4-cuda/CMakeLists.txt
samples/android/tutorial-4-cuda/jni/Android.mk
samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
samples/cpp/stitching_detailed.cpp
samples/cpp/tutorial_code/viz/creating_widgets.cpp
samples/cpp/tutorial_code/viz/launching_viz.cpp
samples/cpp/tutorial_code/viz/transformations.cpp
samples/cpp/tutorial_code/viz/widget_pose.cpp
2014-02-11 12:05:01 +04:00
Anatoly Baksheev
f1c062c30a
cloud collection finalize
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
5dc17f5d58
Fixed all OpenGL issues for Macos (via objective-C++ layer)
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
069dd8a068
default meshlab background
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
f8ccc115ef
proper render call order (fixes some issues with VTK6.1)
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
17fea0dd0a
fixed size_t/int conversion warnings
2014-02-10 15:45:45 +04:00
Anatoly Baksheev
998aefd1d1
cloud collection merges data only on rendering
2014-02-10 15:45:44 +04:00
Anatoly Baksheev
eb8728d727
Updated cloud io functionality - removed dependency from VTK legacy
2014-02-10 15:45:44 +04:00
Roman Donchenko
63dbe66b41
Merge pull request #2308 from jet47:gpu-tests-timeout
2014-02-10 15:10:31 +04:00
Roman Donchenko
3cc27c769c
Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen
2014-02-10 14:59:05 +04:00
Anatoly Baksheev
becbfa6281
Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function
2014-02-10 13:41:27 +04:00
Vladislav Vinogradov
8b44a42a40
decrease input size for several gpu tests to fix "timed out" error:
...
* BruteForceNonLocalMeans
* OpticalFlowBM
2014-02-10 11:50:14 +04:00
berak
3959329ef4
proper initialization for ccimpl in bool CascadeClassifier::read(const FileNode
2014-02-08 14:42:09 +01:00
Roman Donchenko
1d68a89947
Merge pull request #2303 from jet47:gpu-canny-fix
2014-02-07 19:03:14 +04:00
Andrey Pavlenko
86b6c48712
Merge pull request #2295 from alalek:opencl_align_rw_buffers
2014-02-07 17:45:15 +04:00
Roman Donchenko
48f95d92ae
Merge pull request #2294 from jet47:fix-gpu-issues
2014-02-07 16:54:49 +04:00
Roman Donchenko
8b16b8b657
Merge pull request #2296 from apavlenko:fix_coverity_scan
2014-02-07 16:54:30 +04:00
Vladislav Vinogradov
5dbdadb769
fixed several bugs in CUDA Canny implementation:
...
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
2014-02-07 16:04:29 +04:00
Vladislav Vinogradov
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
2014-02-07 14:55:06 +04:00
Alexander Alekhin
ce992c8269
ocl: update gftt
2014-02-07 14:51:59 +04:00
Alexander Alekhin
e371901dd9
ocl: workaround for failures with misaligned host buffers
2014-02-07 14:51:58 +04:00
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
Andrey Pavlenko
4b31b9cb8c
Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter
2014-02-07 11:33:49 +04:00
Andrey Pavlenko
710d51bb41
Merge pull request #2287 from ilya-lavrenov:mat_step
2014-02-06 21:38:22 +04:00
Andrey Pavlenko
9ff5a24f92
Merge pull request #2289 from ilya-lavrenov:umat_expr
2014-02-06 21:37:57 +04:00
Andrey Pavlenko
38f46eb3b4
fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 ( http://scan.coverity.com/projects/169?tab=Overview )
2014-02-06 21:33:44 +04:00
Ilya Lavrenov
412468e0ae
added cv::sqrBoxFilter to T-API
2014-02-06 19:19:18 +04:00
Vladislav Vinogradov
5d099df578
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
3e4bb371c8
fix epsilons for several gpu tests
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
b6ba1f226c
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a853
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
da44a2fac1
Revert "disable gpu Subtract_Array test:"
...
This reverts commit e91bf95d58
2014-02-06 18:02:14 +04:00
Roman Donchenko
7daf26d398
Merge pull request #2269 from Nerei:qt5_vtk_guards
2014-02-06 16:47:15 +04:00
Ilya Lavrenov
af0040eab0
condition for Mat step
2014-02-06 15:44:27 +04:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Andrey Pavlenko
b6675ee2a8
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
2014-02-06 12:55:04 +04:00
Ilya Lavrenov
e190d3fd36
added perf test
2014-02-05 20:24:30 +04:00
Ilya Lavrenov
563dc5aa38
implemented umat expressions
2014-02-05 19:23:42 +04:00
Roman Donchenko
721d0145e0
Merge pull request #2002 from abak:stereo_calibrate
2014-02-05 17:47:27 +04:00
Roman Donchenko
9f8de69505
Set status to -tp2.
2014-02-05 13:57:04 +04:00
Konstantin Matskevich
bdfa9fa14a
fixes2
2014-02-05 13:51:14 +04:00
Konstantin Matskevich
435615ba2e
update test CascadeClassifier
2014-02-05 12:23:36 +04:00
Konstantin Matskevich
84fa60abb8
update test for cascade
2014-02-05 12:06:48 +04:00
Konstantin Matskevich
1aa83d324b
fixed docs2
2014-02-05 11:32:35 +04:00
Andrey Pavlenko
e6f3c9b0bf
Merge pull request #2281 from vpisarev:ocl_surf
2014-02-05 11:07:19 +04:00
Konstantin Matskevich
eb4c2cd59f
removed CV_IN/OUT
2014-02-05 10:55:26 +04:00
Konstantin Matskevich
a0ccb46a7f
fixed docs
2014-02-05 10:49:56 +04:00
Konstantin Matskevich
b0f617bc01
fixes
2014-02-05 09:59:04 +04:00
Andrey Pavlenko
055f41c92a
Merge pull request #2250 from ilya-lavrenov:tapi_renaming
2014-02-05 09:27:06 +04:00
Ilya Lavrenov
2e8579fe9b
cleaned up super_resolution sample from old OCL
2014-02-05 00:28:10 +04:00
Vadim Pisarevsky
3e0c72a8f7
fixed warnings/errors from GCC
2014-02-04 21:50:04 +04:00
Andrey Pavlenko
564f5fcca3
Merge pull request #2280 from ilya-lavrenov:attempt_pvc
2014-02-04 21:22:49 +04:00
Vadim Pisarevsky
092d058d06
fixed warnings from OCL and DOC builders
2014-02-04 21:19:31 +04:00
Andrey Pavlenko
b7ffed7b46
Merge pull request #2279 from alalek:fix_memory_leak_getumat
2014-02-04 20:45:27 +04:00
Vadim Pisarevsky
38f5c7140c
undone change in ocl.hpp (explicit Image2D constructor)
2014-02-04 20:41:11 +04:00
Vadim Pisarevsky
c18d1ee2a9
SURF kind of works (let's see if the tests pass)
2014-02-04 20:00:51 +04:00
Ilya Lavrenov
c7fe162829
renamed **2 -> **
2014-02-04 19:55:11 +04:00
Ilya Lavrenov
d957e8e40d
attempt to fix pure virtual call in Mat::deallocate
2014-02-04 19:50:37 +04:00
Alexander Alekhin
83a2b566a3
fix memory leak for Mat::getUMat() operation
2014-02-04 17:25:09 +04:00
Konstantin Matskevich
f44334285b
features2d
2014-02-04 16:55:07 +04:00
Alexander Alekhin
485635310c
core/ocl: OpenCLBufferPool
2014-02-04 16:48:35 +04:00
Andrey Pavlenko
22146e4b18
Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog
2014-02-04 16:35:12 +04:00
Andrey Pavlenko
bd6620fa87
Merge pull request #2252 from ilya-lavrenov:ocl_ref
2014-02-04 16:34:28 +04:00
Andrey Pavlenko
49db511882
Merge pull request #2268 from ilya-lavrenov:tapi_pow
2014-02-04 16:32:43 +04:00
Konstantin Matskevich
c684da3549
drawing
2014-02-04 11:09:29 +04:00
Elena Gvozdeva
85d519b6c3
fixed
2014-02-04 10:54:02 +04:00
Vadim Pisarevsky
8d5e952263
very preliminary port of SURF to T-API (compiles but certainly does not work)
2014-02-04 03:21:03 +04:00
Ilya Lavrenov
da5b316b4e
minor ocl.cpp refactoring
...
fix for cv::LUT and cv::transpose
2014-02-04 01:52:48 +04:00
Andrey Pavlenko
92c8b94ba9
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
2014-02-04 00:39:09 +04:00
Ilya Lavrenov
98b72ff389
optimized cv::pow for integer power
2014-02-03 22:36:57 +04:00
Andrey Pavlenko
9dede73d9f
Merge pull request #2153 from scottbreyfogle:constrained-hough-lines
2014-02-03 17:35:15 +04:00
Andrey Pavlenko
810dc262ad
Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching
2014-02-03 17:32:20 +04:00
Andrey Pavlenko
b3a48e1eed
Merge pull request #2264 from alalek:bug_fix_3470
2014-02-03 17:31:57 +04:00
Roman Donchenko
109e71e4ef
Merge pull request #2263 from ilya-lavrenov:include_fix
2014-02-03 17:25:12 +04:00
Vadim Pisarevsky
b5d8f4d5e5
Merge pull request #2031 from berak:b_flann_timer_30
2014-02-03 17:00:21 +04:00
Vadim Pisarevsky
7cfb7bc8cd
Merge pull request #2120 from prclibo:master
2014-02-03 16:59:04 +04:00
Konstantin Matskevich
3495c5953c
fixes
2014-02-03 16:38:06 +04:00
Vadim Pisarevsky
de4b1c668d
hopefully fixed compile warnings and the doc builder warnings
2014-02-03 16:36:36 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
cd1ffd169c
Merge pull request #2261 from jet47:stitching-cuda-android
2014-02-03 15:35:55 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Vadim Pisarevsky
11926dafb2
eliminate crash in ipp-accelerated norm and mean functions (thanks to Matt Curfman and Aaron Kunze for the patch)
2014-02-03 15:31:32 +04:00
Vadim Pisarevsky
30593ee55e
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
2014-02-03 15:12:27 +04:00
Ilya Lavrenov
9a1e461450
fix for PR 2166
2014-02-03 14:47:32 +04:00
Konstantin Matskevich
5c38519c65
some changes
2014-02-03 14:46:53 +04:00
Konstantin Matskevich
3ea32b87bb
perf test
2014-02-03 14:46:52 +04:00
Konstantin Matskevich
9a62df1650
HOG
2014-02-03 14:46:52 +04:00
Alexander Alekhin
91ca834be9
bug fix for issue 3470
2014-02-03 14:46:22 +04:00
Andrey Pavlenko
0fef7f8b96
Merge pull request #2217 from ilya-lavrenov:tapi_superres
2014-02-03 14:38:59 +04:00
Konstantin Matskevich
ffeb223150
test for failure
2014-02-03 14:34:02 +04:00
Ilya Lavrenov
cc47edb850
more strict checks and reseting state
2014-02-03 14:32:25 +04:00
Konstantin Matskevich
aa23a842a1
test for failure
2014-02-03 14:32:25 +04:00
Andrey Pavlenko
13875b5fbc
Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2
2014-02-03 14:26:05 +04:00
Andrey Pavlenko
a1ad1f0800
Merge pull request #2259 from ilya-lavrenov:ocl_surf
2014-02-03 14:24:36 +04:00
Andrey Pavlenko
a2fcaccf8b
Merge pull request #2258 from ilya-lavrenov:tapi_video
2014-02-03 14:17:49 +04:00
Andrey Pavlenko
cb1e4b2ede
Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl
2014-02-03 14:10:21 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Vladislav Vinogradov
a138e5a6a5
turn on CUDA part of stitching module on Android for non-dynamic build
2014-02-03 12:35:24 +04:00
Roman Donchenko
206df7fdb1
Merge pull request #2255 from ilya-lavrenov:ocl_doc
2014-02-03 12:14:14 +04:00
Roman Donchenko
82330a51bd
Merge pull request #2253 from ilya-lavrenov:cuda
2014-02-03 12:12:12 +04:00
Roman Donchenko
c967069922
Merge pull request #2254 from ilya-lavrenov:opengl
2014-02-03 12:11:28 +04:00
Vladislav Vinogradov
d8f7377122
turn on CUDA part of nonfree module on Android for non-dynamic build
2014-02-03 11:52:43 +04:00
Ilya Lavrenov
ede5b23753
rewrote perf tests for SURF
2014-02-03 02:00:29 +04:00
Ilya Lavrenov
e844c08203
some fixes and improvements in cv::matchTemplate
2014-02-02 19:20:37 +04:00
Ilya Lavrenov
31b7cdc695
implemented OpenCL version of cv::updateMotionHistory
2014-02-02 17:52:57 +04:00
Anatoly Baksheev
1f5007f106
modified viz module header layout for 2.4 compatibility
2014-02-02 16:23:34 +04:00
Ilya Lavrenov
19f799ba1e
fix2 for OpenCL on/off
2014-02-02 15:35:13 +04:00
Ilya Lavrenov
02692f9ac0
fix MACRO
2014-02-01 22:43:41 +04:00
Andrey Pavlenko
75dde49b64
Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
2014-02-01 22:32:39 +04:00
Ilya Lavrenov
66b2acc8ee
removed ocl from allmodules list
2014-02-01 20:55:50 +04:00
Ilya Lavrenov
ec3eb14138
unused function in case of unavailable OpenGL
2014-02-01 18:14:10 +04:00
Ilya Lavrenov
a6104bd025
fixed unused function in case of unavailable CUDA
2014-02-01 18:11:45 +04:00
Ilya Lavrenov
6ad4823f0c
ported superres to T-API
2014-02-01 17:20:18 +04:00
Scott Breyfogle
aaa9be7c65
Merge remote-tracking branch 'original/master' into constrained-hough-lines
2014-01-31 14:27:51 -08:00
Scott Breyfogle
b074c67a56
Add static cast to hough lines
2014-01-31 14:26:45 -08:00
Roman Donchenko
2bef73c968
Merge pull request #2249 from jet47:gpu-tests-disable
2014-01-31 20:49:05 +04:00
Roman Donchenko
a518d7a1cb
Merge pull request #2248 from jet47:gpu-npp-disable
2014-01-31 20:48:52 +04:00
Roman Donchenko
9ef8aeadd3
Merge pull request #2247 from jet47:gpu-test-cufft
2014-01-31 20:48:38 +04:00
Andrey Pavlenko
c909a21035
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
2014-01-31 19:25:29 +04:00
Andrey Pavlenko
25d2ab8a68
Merge pull request #2218 from alalek:fix_defects_code_coverity
2014-01-31 19:23:02 +04:00
Andrey Pavlenko
6925dbd9f9
Merge pull request #2216 from ElenaGvozdeva:ocl_MOG2
2014-01-31 19:22:38 +04:00
Andrey Pavlenko
5894f82f14
Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector
2014-01-31 19:22:18 +04:00
Andrey Pavlenko
b0befeb1b3
Merge pull request #2232 from ilya-lavrenov:ABF_drop
2014-01-31 19:17:16 +04:00
Ilya Lavrenov
c01e8e9361
removed ABF
2014-01-31 19:15:40 +04:00
Andrey Pavlenko
2c35438771
Merge pull request #2228 from ilya-lavrenov:tapi_experiments
2014-01-31 19:14:19 +04:00
Andrey Pavlenko
09b55a77c8
Merge pull request #2243 from ilya-lavrenov:ocl2trash
2014-01-31 19:08:27 +04:00
Andrey Pavlenko
82bab2b03b
Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter
2014-01-31 19:04:49 +04:00
Andrey Pavlenko
0b57d3717f
Merge pull request #2244 from ilya-lavrenov:tapi_device_cache
2014-01-31 19:04:30 +04:00
Andrey Pavlenko
b104b04d53
Merge pull request #2245 from ilya-lavrenov:redundant_sync
2014-01-31 19:04:07 +04:00
Roman Donchenko
e2db68f822
Merge pull request #2242 from jet47:gpu-test-fix
2014-01-31 17:24:21 +04:00
Vladislav Vinogradov
952027a853
disable gpu CvtColor.*2HSV tests:
...
possible bug in CPU version
2014-01-31 16:20:45 +04:00
Vladislav Vinogradov
e91bf95d58
disable gpu Subtract_Array test:
...
possible bug in CPU version
2014-01-31 16:15:11 +04:00
Vladislav Vinogradov
dbce90692a
disable gpu Canny and HoughCircles perf tests:
...
it fails because driver terminates CUDA kernels after time out
2014-01-31 16:14:07 +04:00
Vladislav Vinogradov
e630be3890
disable NPP for GpuMat methods and for copyMakeBorder
2014-01-31 15:52:06 +04:00
Vladislav Vinogradov
8401ed9395
disable some gpu tests if library was built without CUFFT
2014-01-31 15:40:59 +04:00
Roman Donchenko
7161b5bbad
Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix
2014-01-31 14:56:10 +04:00
Alexander Alekhin
9300af90cd
imgproc/intersection: fix loop index
2014-01-31 14:42:38 +04:00
Ilya Lavrenov
d15bf6261a
redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked
2014-01-31 14:39:03 +04:00
Ilya Lavrenov
50cf152977
cached commonly used device properties
2014-01-31 14:00:05 +04:00
Ilya Lavrenov
0f168936a0
OCL module 2 trash
2014-01-31 13:19:16 +04:00
Vladislav Vinogradov
49731ad530
gpu test output files moved from cwd to temp folder
2014-01-31 13:19:15 +04:00
Roman Donchenko
9041c31813
Merge pull request #2223 from cosminBoaca:add_prob_result_bayes_classifier
2014-01-31 12:49:19 +04:00
Alexander Smorkalov
87935f3560
Highgui test output fixes.
...
Useless output to console fixed;
Test output files moved from cwd to temp folder.
2014-01-31 12:49:10 +04:00
Vladislav Vinogradov
063d8b4211
disable performance test for gpu generalized hough
2014-01-31 12:40:40 +04:00
Elena Gvozdeva
69630ee9d9
fixed test
2014-01-31 10:46:29 +04:00
Ilya Lavrenov
68f5dd4170
simplified cv::boxFilter OpenCL impl
2014-01-31 01:53:38 +04:00
Ivy Lee
b7f2b671a2
Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer
2014-01-30 21:53:05 +00:00
Cosmin Boaca
f756171f7b
Fixed alignment
2014-01-30 16:43:56 +02:00
Cosmin Boaca
8782eb8657
Fixed alignment
2014-01-30 16:41:38 +02:00
Cosmin Boaca
b90f82e61f
Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier
2014-01-30 16:38:15 +02:00
U-WBI\nlv20442
be7eb72051
some fixes
2014-01-30 14:50:35 +01:00
Andrey Pavlenko
77bbd65fa6
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
2014-01-30 17:33:06 +04:00
Andrey Pavlenko
66cc440c82
Merge pull request #2226 from ilya-lavrenov:tapi_calcHist
2014-01-30 17:28:43 +04:00
Ilya Lavrenov
1ab1594d00
workaround
2014-01-30 17:26:56 +04:00
Cosmin Boaca
2cd22a3ca3
Fixed broken alignment
2014-01-30 13:37:53 +02:00
Cosmin Boaca
e6f86ea39d
Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier
2014-01-30 13:32:32 +02:00
Ilya Lavrenov
372cdac07c
moved kernelToStr to ocl.hpp
2014-01-30 15:23:11 +04:00
U-WBI\nlv20442
d950adc0d2
function code
2014-01-30 10:51:12 +01:00
unknown
14b1e8c7f1
New KNN code -should compile now
2014-01-30 10:47:12 +01:00
Ilya Lavrenov
231bc17de7
added conditional compilation
2014-01-30 13:07:13 +04:00
Roman Donchenko
40f6f679b8
Merge pull request #2224 from SpecLad:obsolete-immediate
2014-01-30 12:43:51 +04:00
Roman Donchenko
2b3013fd20
Merge pull request #2229 from ilya-lavrenov:possible_memory_leak
2014-01-30 12:23:20 +04:00
Ilya Lavrenov
1862dbc5ab
fixed fp problem
2014-01-30 05:48:15 +04:00
Ilya Lavrenov
0d19cbcc7a
added performance test
2014-01-30 02:01:38 +04:00
Ilya Lavrenov
86353eb541
fix for PR 2196
2014-01-30 01:47:25 +04:00
Ilya Lavrenov
e7e63fac6c
eliminated possible memory leak
2014-01-30 01:21:04 +04:00
Ilya Lavrenov
6d64907f18
async
2014-01-30 00:19:18 +04:00
Ilya Lavrenov
6fa41c5a64
some experiments
2014-01-30 00:12:59 +04:00
Ilya Lavrenov
faa6074f3d
added performance test
2014-01-29 20:34:37 +04:00
Ilya Lavrenov
384a28622d
added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
2014-01-29 20:19:15 +04:00
Alexander Alekhin
6fa49f6e80
fix unintialized fields
2014-01-29 19:59:03 +04:00
Alexander Alekhin
f91f55927e
fix memory management problem
2014-01-29 19:59:01 +04:00
Roman Donchenko
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
2014-01-29 19:34:02 +04:00
Roman Donchenko
9b9eadc941
Merge pull request #2214 from cosminBoaca:add_returnDFVal_parallel_predict
2014-01-29 17:12:48 +04:00
Cosmin Boaca
97092e31bc
Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue #3401
2014-01-29 13:57:51 +02:00
Elena Gvozdeva
96b6f338e1
fixed
2014-01-29 14:27:29 +04:00
Ilya Lavrenov
7c96d98a24
implemented OpenCL version of cv::accumulate****
2014-01-29 11:42:46 +04:00
Elena Gvozdeva
17c6b4d306
fixed warnings
2014-01-29 11:05:05 +04:00
Ilya Lavrenov
41bc5808c0
optimized createHanningWindow
2014-01-28 23:37:20 +04:00
Alexander Alekhin
5474935a81
fixes for defects from code coverity
2014-01-28 20:24:10 +04:00
Andrey Pavlenko
fff5a6c058
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
2014-01-28 16:31:30 +04:00
Elena Gvozdeva
0edd0aaf69
fixed
2014-01-28 16:23:39 +04:00
Elena Gvozdeva
1391ca1da5
Added ocl_Mog2
2014-01-28 16:23:38 +04:00
Cosmin Boaca
3985980b2f
Added returnDFVal parameter to parallel CvSVM::predict function
2014-01-28 11:54:39 +02:00
Roman Donchenko
84c29745f2
Merge pull request #2211 from SpecLad:merge-2.4
2014-01-28 12:44:29 +04:00
Roman Donchenko
7a0a9d010b
Merge pull request #2205 from jet47:bug-3477-fix
2014-01-28 12:23:32 +04:00
Vladislav Vinogradov
c41e8006c7
fix #3477 :
...
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
by all VideoCapture backends. Some backends can return 0.0 or -1.0.
2014-01-28 10:28:00 +04:00
Seunghoon Park
eb9d7c4dd5
fixing bug #3345 . use norm to make sure two matrices are the same.
2014-01-27 20:57:40 -05:00
Seunghoon Park
73389b2b9c
Merge branch '2.4' into blur_border_isolated
2014-01-27 20:44:03 -05:00
Andrey Pavlenko
6deda99f07
Merge pull request #2207 from ilya-lavrenov:tapi_macro
2014-01-27 18:56:06 +04:00
Ilya Lavrenov
78c2b3ca2a
refactored imgproc
2014-01-27 18:47:16 +04:00
Ilya Lavrenov
48a084c236
OpenCL version of cv::buildPyramid
2014-01-27 18:42:44 +04:00
Andrey Pavlenko
d9b24457fa
Merge pull request #2208 from alalek:ocl_dynload_warn
2014-01-27 18:24:14 +04:00
Andrey Pavlenko
ce48b6afde
Merge pull request #2203 from ilya-lavrenov:tapi_umat_vectors
2014-01-27 16:06:12 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Alexander Alekhin
1ff9a8ef52
core/ocl: added warning about incompatible configuration
2014-01-27 13:52:52 +04:00
Ilya Lavrenov
c8f2050cc2
warn fix
2014-01-27 12:34:30 +04:00
Ilya Lavrenov
321782b9b7
added macro with ability of returning values
2014-01-27 12:32:26 +04:00
Ilya Lavrenov
f767077a41
fixed condition
2014-01-27 12:00:53 +04:00
Ilya Lavrenov
2dd294cc84
fixed cv::split; enabled test
2014-01-27 12:00:53 +04:00
Ilya Lavrenov
fa5492343a
added STD_VECTOR_UMAT support to _OutputArray::create
2014-01-27 11:59:59 +04:00
Andrey Pavlenko
06acf7090c
Merge pull request #2027 from AD-530:brief_cl
2014-01-27 09:49:46 +04:00
Anatoly Baksheev
3dc2dbc17e
VTK off by default
2014-01-26 14:48:29 +04:00
Andrey Pavlenko
a64d3c1744
Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
2014-01-25 17:08:07 +04:00
Andrey Pavlenko
1db8aa8628
Merge pull request #2204 from ilya-lavrenov:tapi_stitch_perf_fix
2014-01-25 16:54:00 +04:00
Andrey Pavlenko
3f61007563
Merge pull request #2191 from ilya-lavrenov:tapi_macro
2014-01-25 16:32:54 +04:00
Ilya Lavrenov
9968197ebf
doc fix
2014-01-25 14:44:28 +04:00
Ilya Lavrenov
7184925105
fix
2014-01-25 11:50:28 +04:00
Ilya Lavrenov
e559256719
added cv::GFTTDetector
2014-01-25 00:23:59 +04:00
Ilya Lavrenov
7f785e0a11
refactored core using new macro
2014-01-24 23:59:00 +04:00
vbystricky
bb09d44e0a
Unused code removed
2014-01-24 17:37:54 +04:00
vbystricky
27fb7e1802
Change type of result vector of ocl version from row to column
2014-01-24 17:37:53 +04:00
vbystricky
094bc92318
Fix build error
2014-01-24 17:37:53 +04:00
vbystricky
a7e5a488a8
Change method of setting arguments to kernel to safe one
2014-01-24 17:37:52 +04:00
vbystricky
e96ba8140c
Grow up epsilon for sanity checks
2014-01-24 17:37:52 +04:00
vbystricky
3a798a27e5
Add perfomance test
2014-01-24 17:37:52 +04:00
vbystricky
ece635bf3c
Fix builds errors
2014-01-24 17:37:51 +04:00
vbystricky
3ba6636651
Fix builds errors
2014-01-24 17:37:51 +04:00
vbystricky
33fc46cdec
Validate parameters for using OpenCL version, before upload UMat
2014-01-24 17:37:50 +04:00
vbystricky
4152135e63
Fix error with some opencl functions on the build WITH_OPENCL=OFF
2014-01-24 17:37:50 +04:00
vbystricky
c57e427fba
Move OpticalFlowPyrLK from ocl module to video module
2014-01-24 17:37:50 +04:00
Andrey Pavlenko
ac3f06bc7f
Merge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate
2014-01-24 17:33:06 +04:00
Ilya Lavrenov
cc514ac7a9
added new macros useful for tracking whether OpenCL impl run or not
2014-01-24 17:16:40 +04:00
Andrey Pavlenko
5424c55565
Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
2014-01-24 16:50:03 +04:00
Andrey Pavlenko
b0caa588ec
Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo
2014-01-24 16:44:19 +04:00
Konstantin Matskevich
c7a6537b83
add brackets
2014-01-24 16:35:51 +04:00
Andrey Pavlenko
d093cb54d5
Merge pull request #2194 from apavlenko:2.4_perf_haar_iter
2014-01-24 16:13:19 +04:00
Matti Picus
64fd54ffb4
fix tiled read for reading tiles into partial blocks in image
2014-01-24 13:03:47 +02:00
Konstantin Matskevich
ae827a638c
fixes
2014-01-24 14:01:31 +04:00
Elena Gvozdeva
07a88d48e9
fixed
2014-01-24 11:41:23 +04:00
Andrey Pavlenko
0a4a1d7526
temporary disabling hanging test
2014-01-24 10:07:21 +04:00
Elena Gvozdeva
4d86804f11
Fixed merge conflicts
2014-01-23 15:31:32 +04:00
Elena Gvozdeva
7bd8f9294d
fixed
2014-01-23 14:50:30 +04:00
Elena Gvozdeva
8c5e19c270
fixed pref test
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
b4652e2cb3
Added perf test for ocl_matchTemplate
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
2c0765b4d1
fixed trailing whitespace
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
7e2bdb590f
fixed
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
4da1ba56b3
fixed
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
47b572f99f
fixed
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
da4d33ec26
Fixed test_match_template
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
9de70c9a00
Fixed trailing whitespace
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
ba5d480f80
Fixed warnings
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
86636dc265
Added ocl_matchTemplate( without dft)
2014-01-23 14:50:28 +04:00
Andrey Pavlenko
ee88cc2c52
Merge pull request #2110 from hmax:master
2014-01-23 14:37:34 +04:00
Roman Donchenko
7ff9d7eb2d
Merge pull request #2188 from jet47:gpumat-copyto-fix
2014-01-23 13:28:12 +04:00
Konstantin Matskevich
133f91f3f2
added perf test
2014-01-23 07:51:19 +04:00
Andrey Pavlenko
ba77719914
Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix
2014-01-22 19:13:05 +04:00
Andrey Pavlenko
7ce6c28bb4
Merge pull request #2186 from ilya-lavrenov:tapi_precornerdetect
2014-01-22 19:09:34 +04:00
Andrey Pavlenko
9aa4410509
Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback
2014-01-22 18:57:34 +04:00
Konstantin Matskevich
f90e41d54e
dumpinfo
2014-01-22 17:04:44 +04:00
Konstantin Matskevich
2f8c29a1f0
removed unnecessary functions and variables
2014-01-22 15:31:27 +04:00
Konstantin Matskevich
3b7683e72f
fixed docs
2014-01-22 15:31:26 +04:00
Konstantin Matskevich
ca5689e0db
BFMatcher
...
match
radiusMatch
2014-01-22 15:31:26 +04:00
Ilya Lavrenov
d2ffd8ed21
implemented OpenCL version of cv::preCornerDetect
2014-01-22 13:46:26 +04:00
Ilya Lavrenov
059e6e4305
fixed cv::sepFilter2D
2014-01-22 13:40:48 +04:00
Vladislav Vinogradov
dda999545c
fix GpuMat::copyTo method with mask:
...
fill destination matrix with zeros if it was reallocated
2014-01-22 10:40:14 +04:00
vbystricky
e0c6377d58
Change the sanity checking type to ERROR_RELATIVE
2014-01-22 10:34:27 +04:00
Andrey Pavlenko
069bb9a929
Merge pull request #2185 from ilya-lavrenov:tapi_corners
2014-01-22 10:25:41 +04:00
Andrey Pavlenko
665d9cb29c
Merge pull request #2168 from ilya-lavrenov:tapi_perf_stitching
2014-01-22 10:14:38 +04:00
Andrey Pavlenko
5d818c010e
Merge pull request #2156 from ilya-lavrenov:tapi_reduce
2014-01-22 10:12:08 +04:00
Andrey Pavlenko
1400f53436
Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib
2014-01-21 23:27:16 +04:00
Andrey Pavlenko
99942e8043
Merge pull request #2166 from ilya-lavrenov:tapi_gftt
2014-01-21 22:29:41 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Ilya Lavrenov
3177a683e9
ported corners to T-API
2014-01-21 20:13:55 +04:00
Roman Donchenko
a548a08129
Merge pull request #2183 from jet47:cuda-hough-fix
2014-01-21 19:27:54 +04:00
Andrey Pavlenko
c8afe7efc6
Merge pull request #1320 from mbarnach:svm_hog
2014-01-21 19:23:04 +04:00
Andrey Pavlenko
4fbd2ef87a
Merge pull request #1290 from mbarnach:bow_desc
2014-01-21 19:22:47 +04:00
Andrey Pavlenko
32bc89f094
Merge pull request #2107 from nghiaho12:nn_doc
2014-01-21 19:11:12 +04:00
vbystricky
c1172b83dd
Change epsilon value to 0.01
2014-01-21 18:46:26 +04:00
Ilya Lavrenov
5d206059a8
moved bioinspired to opencv_contrib
2014-01-21 18:02:53 +04:00
Andrey Pavlenko
9eca3ec8f6
Merge pull request #2177 from ilya-lavrenov:ocl_superres
2014-01-21 17:05:50 +04:00
Vladislav Vinogradov
33d42b740c
disable CUDA generalized Hough Transform
2014-01-21 15:07:47 +04:00
Vladislav Vinogradov
d847387694
split CUDA Hough sources
2014-01-21 15:07:47 +04:00
Ilya Lavrenov
bfa382cf9d
fixed copying UMat -> std::vector
2014-01-21 14:37:22 +04:00
Ilya Lavrenov
ae4be413c3
added perf tests for cv::reduce
2014-01-21 14:18:38 +04:00
Ilya Lavrenov
ac2e613975
skip OCL tests if OpenCL isn't available
2014-01-21 13:09:39 +04:00
Andrey Pavlenko
494f7e3657
Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d
2014-01-20 23:35:06 +04:00
Andrey Pavlenko
801d2d0a32
Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn
2014-01-20 23:33:55 +04:00
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
2014-01-20 22:51:33 +04:00
Roman Donchenko
a509819b21
Merge pull request #2163 from ilya-lavrenov:tapi_channels
2014-01-20 18:48:52 +04:00
Ilya Lavrenov
e5130cf83f
enabled tests
2014-01-20 18:09:43 +04:00
Roman Donchenko
9710b25c7d
Merge pull request #2173 from Nerei:viz
2014-01-20 18:05:11 +04:00
Roman Donchenko
9dc93ce328
Merge pull request #2176 from SpecLad:merge-2.4
2014-01-20 18:04:56 +04:00
Anatoly Baksheev
ac035b9b8e
review comments
2014-01-20 15:22:58 +04:00
Andrey Pavlenko
69ba0c53ad
Merge pull request #2165 from ilya-lavrenov:tapi_upload
2014-01-20 15:18:56 +04:00
Roman Donchenko
e45fd939c2
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
2014-01-20 15:10:19 +04:00
Roman Donchenko
087371c021
Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2
2014-01-20 14:15:05 +04:00
Ilya Lavrenov
5abfd40989
added perf test for cv::goodFeaturesToTrack
2014-01-20 13:57:53 +04:00
Ilya Lavrenov
52ed6d0d27
ported cv::goodFeaturesToTrack to T-API
2014-01-20 13:57:53 +04:00
Ilya Lavrenov
5d18cf9989
added cv::[extract|insert]Channel to T-API
2014-01-20 13:52:07 +04:00
Roman Donchenko
8386ce2b2f
Merge pull request #2160 from SpecLad:norm-assert
2014-01-20 12:20:21 +04:00
Anatoly Baksheev
4cc8f7012b
closing window
2014-01-19 18:39:01 +04:00
Anatoly Baksheev
4e18007066
fixed white spaces
2014-01-19 18:39:01 +04:00
Anatoly Baksheev
d29c3d2f0d
fixed documentation warnings
2014-01-19 18:39:00 +04:00
Anatoly Baksheev
8f15a8abdb
disabled Ubuntu workaround code for Windows
2014-01-19 18:39:00 +04:00
Anatoly Baksheev
0d12fb0346
implemented workaround of a problem with x-server for ubuntu
2014-01-19 18:39:00 +04:00
Anatoly Baksheev
7410593d55
fixed warnigns and compiler errors for Ubuntu
2014-01-19 18:39:00 +04:00
Anatoly Baksheev
d7ca0bb757
merged background color with background gradient methods, updated tests to show description of scene
2014-01-19 18:38:59 +04:00
Anatoly Baksheev
16281027af
resolved problem with multiple spin()/spinOnce()
2014-01-19 18:38:59 +04:00
Anatoly Baksheev
57d5ad5131
minor iteractor refactoring
2014-01-19 18:38:59 +04:00
Anatoly Baksheev
ffad7b699c
added test for textured mesh
2014-01-19 18:38:59 +04:00
Anatoly Baksheev
8d327fa497
updated for compatibility with VTK6.0
2014-01-19 18:38:58 +04:00
Anatoly Baksheev
e472d45d99
updated mesh reading (texture support)
2014-01-19 18:38:58 +04:00
Anatoly Baksheev
625c35a9f9
added support of texture for mesh
2014-01-19 18:38:58 +04:00
Anatoly Baksheev
74206e0159
added painted cloud widget
2014-01-19 18:38:57 +04:00
Anatoly Baksheev
3086095837
improved background gradient
2014-01-19 18:38:57 +04:00
Anatoly Baksheev
b0ca93b22c
by default enabled tests vtk
2014-01-19 18:38:57 +04:00
Anatoly Baksheev
d7c30281a5
set background texture method
2014-01-19 18:38:57 +04:00
Anatoly Baksheev
e2ef558c8a
refactored WGrid
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
658f4a7d38
refactoed plane
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
53b8218652
addeed test for text 2d/3d
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
bb891f0570
added cone implementation
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
08f50314cb
updated cylinder and cube
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
c0cc551228
refactored circle
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
dac27c9913
refactored arrow
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
1449823bcd
implemented showImage
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
d90a068e0e
fixed bug with setImage
2014-01-19 18:38:54 +04:00
Anatoly Baksheev
cad9a786c4
optimized Mat to vtkImageData conversion
2014-01-19 18:38:54 +04:00
Anatoly Baksheev
e21f2a81ff
factored camera postions with image
2014-01-19 18:38:54 +04:00
Anatoly Baksheev
a23f1447a8
minor
2014-01-19 18:38:53 +04:00
Anatoly Baksheev
f930f2f19d
simplification of cloud collection
2014-01-19 18:38:53 +04:00
Anatoly Baksheev
e3ff28dacc
refactored WImage3D
2014-01-19 18:38:53 +04:00
Anatoly Baksheev
f37c31742a
created tests for images, created vtk/vtkImageMatSource, and switched all images to that class
2014-01-19 18:38:53 +04:00
Anatoly Baksheev
462d516743
added test for camera positions, slightly refactored the widgets
2014-01-19 18:38:52 +04:00
Anatoly Baksheev
8309d19f31
renamed Mesh3d -> Mesh
2014-01-19 18:38:52 +04:00
Anatoly Baksheev
d591bd875b
fixed crash in enabling shading for polydata widgets
2014-01-19 18:38:52 +04:00
Anatoly Baksheev
e478d6b1e9
renamed cv::viz::get() to getWindowByName()
2014-01-19 18:38:52 +04:00
Anatoly Baksheev
25b417e8b2
added test for trajectories and fixed bug with float type
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
64566e6178
minor
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
0d702b83f4
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
a3b1f29d23
refactored spheres trajectory
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
38c9fa4a92
more refactoring
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
4833976a0c
refactored frustum trajectory to use glyphs
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
42dc90295d
refactored camera position - simplified frustum creation
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
45879fb9db
more refactoring
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
a8556134ae
refactored simple trajectory to use TensorGlyph
2014-01-19 18:38:49 +04:00
Anatoly Baksheev
771d9509a8
polyline now uses scalars for color data (for reuse by other widgets)
2014-01-19 18:38:49 +04:00
Anatoly Baksheev
e94ee94be3
refactored WCoordinateSystem widget
2014-01-19 18:38:49 +04:00
Anatoly Baksheev
56819eaf19
switched completer API to doubles, updated docs
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
d264465422
more refactoring
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
406444037d
refactored polyline
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
b100299644
code beatification
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
e26b7e1e4f
ported some trajectories functionality to InputArray style
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
7b28f730f4
traits for Affine3
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
cd57c4e189
refactored CloudNormals and added test for it
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
b7cb3fe8e0
switched more to doubles
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
a76a34d28e
added Affine3: 3x4 input Mat support
2014-01-19 18:38:46 +04:00
Anatoly Baksheev
3e071491c9
added Affine3 ctor from array
2014-01-19 18:38:46 +04:00
Anatoly Baksheev
baee8c3aa5
refactored Mesh, added tests, added failing "twice spin()" test
2014-01-19 18:38:46 +04:00
Anatoly Baksheev
70a81db567
fixed bugs in cloud collection and added test
2014-01-19 18:38:46 +04:00
Anatoly Baksheev
cb58061649
getViewerPose implementation simplified (and error seems to be fixed)
2014-01-19 18:38:45 +04:00
Anatoly Baksheev
186853a50f
mass switch from Affine3f to Affine3d
2014-01-19 18:38:45 +04:00
Anatoly Baksheev
b1c0bf1fee
Affine::rotate(rvec) method
2014-01-19 18:38:45 +04:00
Anatoly Baksheev
1615527426
switched source to InputArrays
2014-01-19 18:38:45 +04:00
Anatoly Baksheev
f610c295f2
more tests
2014-01-19 18:38:44 +04:00
Anatoly Baksheev
e7791e1590
colors minor
2014-01-19 18:38:44 +04:00
Anatoly Baksheev
c1b41caa7c
added vtkCloudMatSink, reworked cloud IO functions, added normals support
2014-01-19 18:38:44 +04:00
Anatoly Baksheev
1c4cfd8eaf
normals support for CloudMatSource
2014-01-19 18:38:43 +04:00
Anatoly Baksheev
7e952e2f10
removed incorrect and unnecessarily methods from Affine3f
2014-01-19 18:38:43 +04:00
Anatoly Baksheev
bf30c33e6e
getting data from opencv_extra
2014-01-19 18:38:43 +04:00
Anatoly Baksheev
b131faa8f9
export scene to vrml and obj formats
2014-01-19 18:38:43 +04:00
Anatoly Baksheev
b2cd526e6a
removed extra code
2014-01-19 18:38:42 +04:00
Anatoly Baksheev
84d6fe397d
reading/writing clouds functionality
2014-01-19 18:38:42 +04:00
Anatoly Baksheev
80ab6e889f
refactoring
2014-01-19 18:38:42 +04:00
Anatoly Baksheev
7dbf6bc8df
rewrote cloud widget in vtk filters style
...
Conflicts:
modules/viz/src/clouds.cpp
2014-01-19 18:38:42 +04:00
Anatoly Baksheev
159de9cc47
fixed potential crash
2014-01-19 18:38:41 +04:00
Anatoly Baksheev
2705068290
refactored Keyboard and Mouse Events
2014-01-19 18:38:41 +04:00
Anatoly Baksheev
cad2f98007
removed vizActor (since unnecessarily in new design concept with simplified widgets)
2014-01-19 18:38:41 +04:00
Anatoly Baksheev
45aeecb043
renaming
2014-01-19 18:38:41 +04:00
Anatoly Baksheev
abc9465798
kinect camera CAD parameters
2014-01-19 18:38:40 +04:00
Anatoly Baksheev
e990d5b999
reading/writing trajectories
2014-01-19 18:38:40 +04:00
Anatoly Baksheev
e048df51ce
for shapes switched vtkDataSetMapper to more efficient vtkPolyDataMapper
2014-01-19 18:38:40 +04:00
Anatoly Baksheev
4979f44cfa
minor
2014-01-19 18:38:40 +04:00
Anatoly Baksheev
31d42ce18f
refactored Trajectory: split into Trajectory and TrajectoryFrustums)
2014-01-19 18:38:39 +04:00
Anatoly Baksheev
54fa69cab2
renamed Spheres Trajectory, minor changes in Trajectory
2014-01-19 18:38:39 +04:00
Anatoly Baksheev
c7ff13873d
minor
2014-01-19 18:38:39 +04:00
Anatoly Baksheev
f6e9b81188
reduced exported interface names (to make IntelliSense hints less littered)
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
44c1d4dfdc
allow fast switch between actors (except mesh, cloud, cloud collection)
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
2d63f60d43
minor changes, opencv cross-branch code
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
15fd3faa40
support gray color clouds
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
2cbfb04144
viz: rich set of named colors
2014-01-19 18:38:37 +04:00
Anatoly Baksheev
5ea3ecdc3b
horisontal mwhell support
2014-01-19 18:32:22 +04:00
Ilya Lavrenov
3db33979e1
added perf tests for stitching warpers
2014-01-19 12:01:01 +04:00
Ilya Lavrenov
5af2e6f1c9
removed useless CRC calculation
2014-01-19 11:57:50 +04:00
Drew Jetter
6bf599b1bc
Fixed bug #3489 : The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent.
2014-01-18 23:04:16 -07:00
Anatoly Baksheev
4e20e06ee7
warnings
2014-01-19 04:07:24 +04:00
Anatoly Baksheev
0fc4ac4f1f
warnings and compilation with installed Windows 8.1 SDK
2014-01-19 04:07:17 +04:00
Ilya Lavrenov
6b8bee6e0b
fixed kernel compilation warnings
2014-01-18 22:37:47 +04:00
Matthias Bady
d270c9e8b6
Type conversions to fix warnings
2014-01-18 11:12:13 +01:00
Matthias Bady
67e2d7ec43
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
2014-01-18 10:38:07 +01:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Roman Donchenko
0de799b3b0
Removed some duplicate assertions.
2014-01-17 18:25:28 +04:00
Roman Donchenko
088535fa56
Merge pull request #2159 from SpecLad:1xN
2014-01-17 18:23:53 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
vbystricky
f1541b5287
Add perfomance test
2014-01-17 16:15:39 +04:00
vbystricky
fc8b385ff6
Return false if ocl version not properly worked
2014-01-17 16:15:38 +04:00
vbystricky
3762036b08
Fix compiler warnings. Add additional test case for UseInitFlow
2014-01-17 16:15:38 +04:00
vbystricky
3b0fa68a97
Move OpticalFlowFarneback from ocl module to video module
2014-01-17 16:15:38 +04:00
Roman Donchenko
659c5345d9
Merge pull request #2122 from adishavit:feature-HandleMouseWheel
2014-01-17 14:58:28 +04:00
Roman Donchenko
58afe5dd17
Merge pull request #2140 from Daniil-Osokin:fix_saving_untrained_svm_model
2014-01-17 14:57:57 +04:00
Roman Donchenko
e9805e444f
Fixed an overly-narrow assertion in cv::norm.
...
size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
2014-01-17 14:49:42 +04:00
Roman Donchenko
5f8d8c0069
Added a test for matrix-to-vector copy and convert.
2014-01-17 14:18:31 +04:00
Roman Donchenko
4e4a7d0353
Removed an unnecessary workaround for matrix-to-vector copyTo.
2014-01-17 14:16:22 +04:00
Roman Donchenko
ee97a5e757
Re-fix bug #3319 with less side effects.
2014-01-17 14:13:21 +04:00
Roman Donchenko
f02204847a
Revert "fixed bug #3319 "
...
See 092f9164f9c081dc3
2014-01-17 13:43:00 +04:00
Konstantin Matskevich
e9e9e00d45
replaced sprintf with cv::format
2014-01-17 13:01:12 +04:00
Roman Donchenko
092f916db9
Revert 4f9c081
...
That commit introduces problems, as it breaks certain use cases of
OpenCV functions; for example, convertTo of an Nx1 matrix to an
std::vector.
Since vectors can't store separate width and height values, OpenCV
considers them to always be 1xN. So even though the vector is created with
.create(N, 1), the Mat passed to getContinousSize has dimensions 1xN,
and the size comparison fails, even though the operation itself is safe.
This is a use case we probably don't want to break, at the very least
for backwards compatibility. So I'm reverting the commit. This will also
unfix bug #3319 ; I'll submit a less intrusive solution as a PR to 2.4, which
will also revert 4f9c081
2014-01-17 12:51:52 +04:00
Ilya Lavrenov
93a818684c
ported cv::Canny to T-API
2014-01-17 11:13:28 +04:00
Andrey Pavlenko
8dbc96fed8
Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel
2014-01-17 10:43:40 +04:00
Ilya Lavrenov
63a5e39e2c
added cv::reduce to T-API
2014-01-17 00:41:18 +04:00
Daniil Osokin
8ce691e679
Fixed cvtColor alpha channel docs
2014-01-16 18:36:06 +04:00
Adi Shavit
8fd0fd538d
Doc fix.
2014-01-16 16:30:54 +02:00
Roman Donchenko
07e08f7a3d
Merge pull request #2141 from ilya-lavrenov:perf_warp
2014-01-16 18:03:21 +04:00
Roman Donchenko
63c61b4b98
Revert "replaced sprintf with cv::format"
...
Fixing build breakage.
This reverts commit b83eff7ecf
2014-01-16 17:58:26 +04:00
Roman Donchenko
ddfd1854a7
Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d
2014-01-16 16:44:24 +04:00
Konstantin Matskevich
b83eff7ecf
replaced sprintf with cv::format
2014-01-16 16:18:02 +04:00
Adi Shavit
46f06d82c9
Update docs.
2014-01-16 12:51:14 +02:00
Adi Shavit
8802d62cc5
Updated docs.
2014-01-16 11:25:57 +02:00
Nick D'Ademo
75b80e5d7d
Added missing comma in enum.
2014-01-16 20:17:49 +11:00
Adi Shavit
24333569aa
Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()
2014-01-16 11:09:25 +02:00
Roman Donchenko
b0af6a2b58
Merge pull request #2127 from apavlenko:perf_cascades
2014-01-16 12:37:02 +04:00
Scott Breyfogle
0ea454301f
Added optional constraints to non-probablistic hough lines functions
2014-01-15 13:22:56 -08:00
Ilya Lavrenov
82d3efc6c0
added perf test for cv::Canny
2014-01-15 20:06:24 +04:00
Konstantin Matskevich
ab18c2d132
changed testdata path for calib3d
2014-01-15 15:08:09 +04:00
Seunghoon Park
2272a58769
fixing bug #3345 . don't use BORDER_ISOLATED alone. it should be combined with some border type
2014-01-14 20:47:23 -05:00
Adi Shavit
e45cf2173f
[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.
2014-01-14 21:33:32 +02:00
Adi Shavit
fecd5c994b
Added support for mouse-wheel events on Windows.
...
To be used in the mouse callback like this:
if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
{
int delta= CV_GET_WHEEL_DELTA(event);
// use delta...
}
2014-01-14 21:20:05 +02:00
Adi Shavit
9dc0bfc755
Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors.
...
This is the way recommended by Microsoft.
2014-01-14 21:20:04 +02:00
Andrey Pavlenko
c7d90c8b32
adding old cascade
2014-01-14 23:15:50 +04:00
Andrey Pavlenko
9b7b360bf7
fixing compilation if WITH_OPENCL=OFF
2014-01-14 17:50:00 +04:00
Ilya Lavrenov
7ed692bf92
fixed cv::cvtColor
2014-01-14 16:16:35 +04:00
Nick D'Ademo
25870fa66b
Added PVAPI enums to highgui.hpp
...
Added "PVAPI_" prefix to FrameStartTriggerMode definition
2014-01-14 21:38:57 +11:00
Roman Donchenko
2fde4d8a94
Merge pull request #2145 from andreasBihlmaier:2.4
2014-01-14 11:55:29 +04:00
