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
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Andrey Pavlenko
fdb1019b9e
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt
2014-01-14 11:34:03 +04:00
Matthias Bady
06fb073b8b
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
2014-01-13 18:14:56 +01:00
Ilya Lavrenov
09bff78d63
deleted extra arg in case of power=0.5
2014-01-13 19:59:10 +04:00
Roman Donchenko
2443e8090e
Merge pull request #2133 from apavlenko:2.4-perf_haar
2014-01-13 19:28:09 +04:00
ahb
49dfa5a17f
Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
...
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83
The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
Adjust all other occurrences of "defined(linux)" as well.
2014-01-13 16:09:42 +01:00
Ilya Lavrenov
30b5234e9a
added perf test for cv::sqrBoxFilter
2014-01-13 18:51:49 +04:00
Ilya Lavrenov
8702fceb4b
fixed cv::integral perf test
2014-01-13 18:36:52 +04:00
Andrey Pavlenko
4c99196399
adding finish() to flush CL queue, renaming the test to match 'master' branch
2014-01-13 18:12:30 +04:00
Ilya Lavrenov
a7a7b80ff8
added perf test for cv::Moments
2014-01-13 17:50:14 +04:00
Andrey Pavlenko
520a692fda
switching to CL_PERF_TEST_P, adding safeFinish() to flush CL queue
2014-01-13 16:58:36 +04:00
Roman Donchenko
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
2014-01-13 16:30:33 +04:00
Roman Donchenko
87e0c26129
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
2014-01-13 16:26:02 +04:00
Ilya Lavrenov
6fb878a65f
added perf tests for cv::medianBlur
2014-01-13 15:59:24 +04:00
Max Khardin
d8e5f1611b
Rewrite definition/declaration of variables to be more compact
2014-01-13 15:55:49 +04:00
Ilya Lavrenov
5e7fd8bd7e
added perf tests for cv::morphologyEx
2014-01-13 15:43:09 +04:00
Ilya Lavrenov
5a2a0b326a
added perf tests for cv::dilate
2014-01-13 15:30:35 +04:00
Ilya Lavrenov
f61597dce8
added perf tests for filters
2014-01-13 15:26:50 +04:00
Ilya Lavrenov
04ae46e21c
added perf tests to some imgproc functions
2014-01-13 15:01:52 +04:00
Nick D'Ademo
3cf5c0b991
Added get and set for extra PVAPI property: CV_CAP_PROP_FRAMESTARTTRIGGERMODE
2014-01-13 22:01:09 +11:00
Ilya Lavrenov
e76d51511e
added perf test for cv::cvtColor, pyr operations
2014-01-13 14:40:42 +04:00
Ilya Lavrenov
4bd4c8d12a
added perf tests for cv::blendLinear
2014-01-13 14:06:15 +04:00
Daniil Osokin
5d2edced26
Added throwing exception when saving untrained SVM model
2014-01-13 13:50:30 +04:00
Ilya Lavrenov
6fbaff6d83
added perf tests for T-API warp operations
2014-01-13 13:10:26 +04:00
Andrey Pavlenko
a7821c60e5
refactoring the test as it should be in 2.4
2014-01-13 11:20:17 +04:00
Andrey Pavlenko
6071671bda
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2
2014-01-11 17:15:22 +04:00
Ilya Lavrenov
da2790249e
added NORM_L2SQR type to cv::norm
2014-01-10 18:45:52 +04:00
Ilya Lavrenov
2e5e278271
added cv::PSNR performance test
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
a01e81c8f7
added some performance tests
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
1592234f1a
added mask support to cv::norm, cv::meanStdDev
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
7852b2f155
updated docs according to the last changes
2014-01-10 18:19:26 +04:00
Ilya Lavrenov
8f9ccc099b
replaced Mat by Input/Output arrays
2014-01-10 18:16:56 +04:00
Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
Roman Donchenko
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +04:00
Alexander Alekhin
f7b0940d44
core/ocl: runtime, remove unused declarations
2014-01-10 11:42:02 +04:00
Volodymyr Kysenko
89dd828e3c
added test for correct handling of uniforma areas in the MergeMertens
2014-01-09 14:10:00 -08:00
Andrey Pavlenko
4d28e8243c
'master'-like Haar perf test
2014-01-10 00:14:48 +04:00
Andrey Pavlenko
2c0e24e948
adding Haar & LBP cascades perf test using UMat, removing old incomplete test
2014-01-10 00:08:15 +04:00
Ilya Lavrenov
dd302158e0
fixed case with zero mask
2014-01-09 19:26:09 +04:00
Andrey Pavlenko
a75cfe13e7
Merge pull request #2128 from alalek:ocl_cleanup_runtime
2014-01-09 17:08:48 +04:00
Roman Donchenko
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
Ilya Lavrenov
9899cf7519
fixed cv::mixChannels perf test
2014-01-09 14:26:44 +04:00
Roman Donchenko
b45bb60c8b
Merge pull request #2126 from yinghau76:master
2014-01-09 14:00:53 +04:00
Ilya Lavrenov
6ee0b6eb56
added mask support to cv::norm, cv::meanStdDev
2014-01-09 13:49:42 +04:00
Alexander Alekhin
70a0327004
core/ocl: cleanup unused files
2014-01-09 13:47:04 +04:00
Roman Donchenko
7acea48788
Merge pull request #2106 from robbertkl:patch-2
2014-01-09 13:25:59 +04:00
Roman Donchenko
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
2014-01-09 12:41:57 +04:00
Roman Donchenko
ea3dd9d5e7
Merge pull request #2103 from ilya-lavrenov:typo
2014-01-09 12:38:55 +04:00
Roman Donchenko
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +04:00
Patrick Tsai
b24f7ee57c
Fix compiler error with Android NDK r8e
...
Original error without the fix:
opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'
2014-01-09 14:49:20 +08:00
Volodymyr Kysenko
aa36898024
added epsilon value to weights in the MergeMertens in order to avoid zero weights for pixels from uniformly filled areas of image
2014-01-07 19:38:57 -08:00
Bo Li
d155639db5
grammar fix
2014-01-07 09:57:40 +08:00
Bo Li
d444af5bb2
updated decomposeEssentialMat doc
2014-01-07 09:54:12 +08:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Ilya Lavrenov
0119e8553c
fixed cv::mixChannels OpenCL version
2014-01-06 14:41:57 +04:00
Matthias Bady
e17da9a843
merge with upstream
2014-01-05 19:00:25 +01:00
Kazuki Matsuda
2ae20c74a2
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
...
Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.
First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113
2014-01-06 02:24:14 +09:00
Max Khardin
699eda46b6
Remove three sneaky tabs
2014-01-04 20:09:30 +08:00
Ilya Lavrenov
3a4d4080f4
fixed overflow for cv::norm NORM_L2
2014-01-04 15:20:50 +04:00
Max Khardin
34b05794d6
Fix source code indents
2014-01-04 19:01:32 +08:00
Max Khardin
214e9d4b12
Add performance tests for elementwise multiplication
2014-01-04 18:56:32 +08:00
Pierre-Emmanuel Viel
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
2014-01-03 13:16:36 +01:00
Nghia Ho
d3e24f3cbf
Improved documentation for neural network
2014-01-03 14:18:07 +11:00
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
Ilya Lavrenov
0c49360318
fixed typo
2014-01-01 19:41:14 +04:00
Anatoly Baksheev
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
Vadim Pisarevsky
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
2013-12-31 15:55:00 +04:00
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
Roman Donchenko
cd576c7364
Merge pull request #2096 from kamjagin:master
2013-12-31 11:53:25 +04:00
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
2013-12-31 11:40:44 +04:00
pxli168
203a9acdbc
Add support to bool type
...
Add the bool support to the get function
2013-12-31 12:53:31 +08:00
Seunghoon Park
b036fc756a
fixing bug #3345
2013-12-30 21:10:06 -05:00
Andrey Pavlenko
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
2013-12-31 00:35:39 +04:00
Andrey Pavlenko
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
2013-12-31 00:26:22 +04:00
Andrey Pavlenko
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
2013-12-31 00:17:33 +04:00
Miroslav Kobetski
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
2013-12-30 17:00:17 +01:00
Andrey Pavlenko
8151571dd6
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
2013-12-30 19:54:27 +04:00
Ilya Lavrenov
3e1bec5248
added OpenCL version of cv::patchNaNs
2013-12-30 19:53:03 +04:00
Ilya Lavrenov
a2e683d133
fixed umat access
2013-12-30 19:37:20 +04:00
Roman Donchenko
4ce684e61c
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
2013-12-30 18:18:42 +04:00
Roman Donchenko
795c108f2b
Fixed MinGW build by declaring the minimal required Windows version.
...
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.
This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
2013-12-30 18:13:42 +04:00
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
2013-12-30 17:57:43 +04:00
Roman Donchenko
cdc10defa3
Merge commit '05b9c991dd' into merge-2.4
...
Conflicts:
modules/cuda/test/test_objdetect.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_core.cpp
2013-12-30 17:30:59 +04:00
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
2013-12-30 17:13:40 +04:00
Roman Donchenko
1312eca220
Merge commit '0566ab4d3d' into merge-2.4
...
Conflicts:
modules/core/src/system.cpp
2013-12-30 16:51:46 +04:00
Roman Donchenko
7f795e964f
Merge commit 'ee36717d' into merge-2.4
2013-12-30 16:49:39 +04:00
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
2013-12-30 16:48:45 +04:00
Ilya Lavrenov
09d25e11c6
fixed bug #3341
2013-12-30 16:47:54 +04:00
Roman Donchenko
09e154d214
Merge commit '60906d917' into merge-2.4
...
Conflicts:
modules/ts/src/cuda_perf.cpp
2013-12-30 16:47:05 +04:00
Roman Donchenko
0e552ea6e2
Merge commit '1acc1085d' into merge-2.4
2013-12-30 16:37:39 +04:00
Roman Donchenko
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
Konstantin Matskevich
55634c1f52
fix
2013-12-30 13:06:32 +04:00
Alexander Alekhin
44970ddf56
eliminate MINGW pragma warning
2013-12-30 12:31:00 +04:00
Ilya Lavrenov
c4c913ff13
converted CPU-based example to T-API (Mat 2 UMat, etc)
2013-12-30 03:19:17 +04:00
Ilya Lavrenov
6b64257c81
added OpenCL version of cv::scaleAdd
2013-12-29 18:46:25 +04:00
Ilya Lavrenov
abcf8d9e61
implemented OpenCL version of cv::convertScaleAbs
2013-12-29 18:01:19 +04:00
Hilton Bristow
483061e802
explicit string encoding when writing to file in python3
2013-12-29 17:10:52 +10:00
Hilton Bristow
2f45942adc
converted necessary files for python3 compatibility using 2to3
2013-12-29 17:10:44 +10:00
Andrey Pavlenko
4a6c2ce378
Merge pull request #2081 from ilya-lavrenov:tapi_perf
2013-12-28 22:06:12 +04:00
Andrey Pavlenko
dbaf125fcd
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
2013-12-28 22:05:49 +04:00
Andrey Pavlenko
0913dd7ffa
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
2013-12-27 22:38:08 +04:00
Ilya Lavrenov
bb7e96311e
disabled cv::split perf test
2013-12-27 21:57:20 +04:00
Roman Donchenko
05b9c991dd
Merge pull request #2083 from jet47:gpu_android_tests
2013-12-27 21:09:18 +04:00
Roman Donchenko
46be47cb4b
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
2013-12-27 20:53:42 +04:00
Roman Donchenko
2d2312d742
Merge pull request #2077 from ilya-lavrenov:tapi_context
2013-12-27 20:23:57 +04:00
Ilya Lavrenov
31e6251793
added new perf tests to core
2013-12-27 20:02:12 +04:00
Roman Donchenko
4eb9b9d6cf
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
2013-12-27 19:58:57 +04:00
Vladislav Vinogradov
53494ba397
increase thresholds for some tests
2013-12-27 18:20:14 +04:00
Vladislav Vinogradov
15678efe84
disable 2 problematic tests
2013-12-27 18:20:01 +04:00
Vladislav Vinogradov
8399568edf
disabled GEMM test if library was built without CUBLAS
2013-12-27 18:19:29 +04:00
Roman Donchenko
0566ab4d3d
Merge pull request #2078 from ilya-lavrenov:warn
2013-12-27 18:17:21 +04:00
Alexander Smorkalov
df63060e4d
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
2013-12-27 18:04:10 +04:00
Alexander Smorkalov
4175916b2a
dynamicuda became private module.
2013-12-27 17:19:38 +04:00
vbystricky
26d53c7435
Change threshold from 2.0 to 1.0 in the test
2013-12-27 16:26:34 +04:00
vbystricky
b719ed79c2
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
2013-12-27 16:21:32 +04:00
Andrey Pavlenko
80816f68f3
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
2013-12-27 15:49:28 +04:00
Andrey Pavlenko
5c25d821b1
Merge pull request #2063 from vpisarev:ocl_moments
2013-12-27 15:44:12 +04:00
Andrey Pavlenko
d649f47eeb
Merge pull request #2072 from pengx17:patch-3
2013-12-27 15:36:24 +04:00
Ilya Lavrenov
d014cb8fb4
fixed warning [-Wempty-body]
2013-12-27 14:44:58 +04:00
Ilya Lavrenov
f221f57c7c
this commit prevents segfaults in case of opencl disabled
2013-12-27 14:02:03 +04:00
Ilya Lavrenov
73c96cbd50
some fixes of cv::mixChannels
2013-12-27 13:59:55 +04:00
Ilya Lavrenov
2eab07f0a4
disabled cv::dft opencl impl for CPU devices
2013-12-27 13:39:29 +04:00
Ilya Lavrenov
52b8bb6761
fixed getUMatIndex
2013-12-27 13:18:31 +04:00
Ilya Lavrenov
a7d2830d3f
added cv::mixChannels to T-API
2013-12-27 13:14:37 +04:00
Roman Donchenko
c45492371a
Merge pull request #2036 from GregoryMorse:patch-1
2013-12-27 12:44:02 +04:00
Roman Donchenko
719149877e
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
2013-12-27 12:43:49 +04:00
Roman Donchenko
ee36717db4
Merge pull request #2037 from GregoryMorse:patch-2
2013-12-27 12:11:52 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
Konstantin Matskevich
a70a8e8680
CLAHE
2013-12-27 10:12:22 +04:00
Peng Xiao
0ccc903647
fixed a buffer overrun of ocl canny
...
the `map` buffer does not have the same size with CUDA and index starts at [1, 1] instead of [0, 0].
2013-12-27 11:54:08 +08:00
Peter Andreas Entschev
07c5e33023
OCL: included ORB featured detector/descriptor extractor.
2013-12-26 22:36:24 -02:00
Pierre-Emmanuel Viel
9cb48606ba
Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
2013-12-27 00:19:37 +01:00
Pierre-Emmanuel Viel
8e93c19de3
Fix a heap issue with static on Windows
2013-12-26 23:46:52 +01:00
Vadim Pisarevsky
48c7378c8f
improved performance of moments (on 720p or larger images)
2013-12-26 23:29:04 +04:00
Andrey Pavlenko
41fd711ab0
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
2013-12-26 23:07:25 +04:00
Pierre-Emmanuel Viel
e85bacff7b
Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors.
2013-12-26 19:44:23 +01:00
Andrey Pavlenko
4b885e2067
Merge pull request #2068 from akarsakov:disable_ipp
2013-12-26 22:41:52 +04:00
Vadim Pisarevsky
e97dd57dc7
hopefully fixed test failures and complains from the doc builder
2013-12-26 22:00:29 +04:00
Alexander Smorkalov
4f6f6e8cac
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
2013-12-26 21:20:32 +04:00
Andrey Pavlenko
4644a864a5
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
2013-12-26 20:37:34 +04:00
Alexander Karsakov
6ef0253fb7
Disabled some IPP implementation since it breaks tests
2013-12-26 19:53:53 +04:00
Andrey Pavlenko
f7b5e6544f
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
2013-12-26 19:38:57 +04:00
Andrey Pavlenko
fd6a74496b
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
2013-12-26 19:38:01 +04:00
Andrey Pavlenko
a981295524
Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology
2013-12-26 19:20:12 +04:00
Ilya Lavrenov
b23edc34e9
added cv::calcBackProject for 2-dimensional histograms
2013-12-26 19:17:32 +04:00
Pierre-Emmanuel Viel
112d63ae96
Add a new method for initializing KMeans centers that leads to better clusters and thus better retrieval when final centers have to be existing keypoints instead of clusters barycenters.
2013-12-26 16:15:35 +01:00
Roman Donchenko
648facccd6
Merge pull request #2064 from dpen2000:patch-2
2013-12-26 17:47:09 +04:00
Andrey Pavlenko
c8a52daafd
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
2013-12-26 17:27:06 +04:00
Konstantin Matskevich
ca9810e8aa
hope last fix
2013-12-26 17:16:55 +04:00
Ilya Lavrenov
5b3520fa46
fixed warning [ -Wreorder ]
2013-12-26 17:14:20 +04:00
Ilya Lavrenov
fc1f9ab236
removed unnecessary data copying
2013-12-26 17:13:26 +04:00
Andrey Pavlenko
734bf8babd
removing legacy stuff
2013-12-26 15:49:12 +04:00
GregoryMorse
4880858119
Update CMakeLists.txt
...
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
2013-12-26 19:45:21 +08:00
Ilya Lavrenov
d64bea00b2
ported cv::calcBackProject to T-API
2013-12-26 14:58:50 +04:00
Roman Donchenko
60906d9175
Merge pull request #2060 from asmorkalov:ocv_ts_cuda
2013-12-26 14:39:51 +04:00
dpen2000
d6a88397b4
Fix python sample path
2013-12-26 10:36:24 +00:00
Roman Donchenko
8fe79738ce
Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers
2013-12-26 14:21:21 +04:00
ytxie
3d3b310ae1
Fix the bug 3440.
2013-12-26 17:54:05 +08:00
Andrey Pavlenko
f9aa148ba9
eliminating VS2013 build warnings
2013-12-26 13:35:59 +04:00
Vadim Pisarevsky
a760c454dd
tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )
2013-12-26 13:25:00 +04:00
Alexander Smorkalov
e79c875fe2
Java wrappers for functions from cv::gpu namespace in core module added.
2013-12-26 12:13:23 +04:00
Roman Donchenko
24be7b26cd
Merge pull request #2049 from asmorkalov:android_cuda_warning_fix
2013-12-26 12:07:01 +04:00
Alexander Smorkalov
0206f419c1
ts dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls from core module.
2013-12-26 11:36:00 +04:00
Konstantin Matskevich
52df2b346b
not synchronous kernel's run
2013-12-26 10:45:09 +04:00
Alexander Smorkalov
1e038e2837
CUDA warning fix/supporession for Android.
2013-12-26 10:17:38 +04:00
Alexander Smorkalov
4aa9f83100
Dynamic CUDA support library name fixed. Additional error messages added.
2013-12-26 10:16:29 +04:00
Konstantin Matskevich
7a186c72e1
some fixes
2013-12-26 09:55:18 +04:00
Konstantin Matskevich
f55c85fed3
morphology
2013-12-26 09:55:17 +04:00
Alexander Alekhin
217b2282b8
fixes
2013-12-26 03:06:58 +04:00
Vadim Pisarevsky
83f749afd2
moments work now and work more or less fast
2013-12-26 02:57:08 +04:00
Andrey Pavlenko
65b020f0d3
Merge pull request #2046 from ilya-lavrenov:tapi_inrange
2013-12-26 00:14:23 +04:00
Andrey Pavlenko
6e8386f705
Merge pull request #1984 from ilya-lavrenov:tapi_perf
2013-12-26 00:13:28 +04:00
Andrey Pavlenko
1aaeea9941
Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist
2013-12-26 00:05:13 +04:00
Vadim Pisarevsky
6035925f41
experimental moments implementation (does not work yet)
2013-12-25 21:09:23 +04:00
Roman Donchenko
1acc1085d2
Merge pull request #2017 from pemmanuelviel:flannMemoryLeak
2013-12-25 19:36:49 +04:00
Andrey Pavlenko
512ddcc804
Merge pull request #2043 from ilya-lavrenov:tapi_hack
2013-12-25 19:00:26 +04:00
Andrey Pavlenko
9ec4c20280
Merge pull request #2042 from vpisarev:ocl_facedetect8
2013-12-25 19:00:06 +04:00
Ilya Lavrenov
4c23059209
added cv::inRange to T-API
2013-12-25 18:22:41 +04:00
Ilya Lavrenov
d7c22343aa
added perf tests for T-API core functions
2013-12-25 18:19:40 +04:00
vbystricky
9e05d18d42
Fix compilation warnings
2013-12-25 18:05:07 +04:00
vbystricky
35dc26e0b9
Add ocl implementation of the sepFilter2D into img_proc module.
2013-12-25 16:48:32 +04:00
Roman Donchenko
faddd5b97f
Merge pull request #2045 from SpecLad:merge-2.4
2013-12-25 16:18:00 +04:00
Alexander Alekhin
e49065b1dc
core/ocl: temporary move device selection from ocl module
2013-12-25 16:17:40 +04:00
Konstantin Matskevich
9d04a7aba9
bugfix in equalizeHist
2013-12-25 15:16:26 +04:00
Alex Willisson
4293a54447
Fixed typo in comment
2013-12-24 19:53:50 -05:00
Matthias Bady
928924d248
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
2013-12-23 19:47:06 +01:00
Ilya Lavrenov
a70467d7a2
removed unnecessary assert
2013-12-23 21:51:25 +04:00
Vadim Pisarevsky
bc730292bb
workaround for some strange bug on old Mac.
2013-12-23 21:29:31 +04:00
Andrey Pavlenko
0966e5ffa1
Merge pull request #2033 from ilya-lavrenov:tapi_normalize
2013-12-23 19:19:00 +04:00
Ilya Lavrenov
e3d23918fa
added cv::normalize to T-API; implemented missed UMat::copyTo with mask
2013-12-23 19:17:35 +04:00
Andrey Pavlenko
6a2fb8e5d1
Merge pull request #2041 from ilya-lavrenov:tapi_mul_div
2013-12-23 19:09:59 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Vadim Pisarevsky
8998186ce4
removed extra whitespaces and hopefully fixed the test failures
2013-12-23 18:41:54 +04:00
Roman Donchenko
edce617a58
Merge pull request #2040 from asmorkalov:android_mk_fix
2013-12-23 18:02:18 +04:00
Alexander Smorkalov
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
2013-12-23 16:40:31 +04:00
Roman Donchenko
83cdd43a4c
Merge pull request #2039 from asmorkalov:ocv_version_inc3
2013-12-23 15:53:11 +04:00
Vadim Pisarevsky
d084d19779
added OpenCL optimization for LBP-based face detector
2013-12-23 15:28:50 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Alexander Smorkalov
bc72f4d2a2
Code review fixes.
2013-12-23 11:34:46 +04:00
GregoryMorse
08d8faf9da
Update system.cpp
...
Add native C++ support
2013-12-23 00:21:51 +08:00
Ilya Lavrenov
febb200eee
fixed cv::multuply, cv::divide
2013-12-22 15:49:36 +04:00
Ilya Lavrenov
6083efc111
refactored cv::CamShift and cv::meanShift
2013-12-21 14:40:59 +04:00
Andrey Pavlenko
f9268d34dc
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
2013-12-21 12:44:06 +04:00
Andrey Pavlenko
b29835a8f8
Merge pull request #2030 from LeszekSwirski:fix-imgproc-ipp
2013-12-20 21:39:10 +04:00
Andrey Pavlenko
a49211a77e
Merge pull request #2032 from ilya-lavrenov:tapi_mulSpectrums
2013-12-20 21:38:14 +04:00
Ilya Lavrenov
c33a7cd7bf
added cv::mulSpectrums to T-API
2013-12-20 18:41:20 +04:00
Vadim Pisarevsky
1540910542
started adding OpenCL acceleration of LBP-based object detectors
2013-12-20 18:39:35 +04:00
berak
2bb3de5aa0
core/utility.hpp missing in flann/timer.h
2013-12-20 14:58:21 +01:00
Andrey Pavlenko
14782194f4
Merge pull request #1995 from akarsakov:ocl_pyramids
2013-12-20 17:57:09 +04:00
Roman Donchenko
b0ec7dafd8
Merge pull request #1950 from GregoryMorse:patch-2
2013-12-20 17:54:02 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Andrey Pavlenko
6b7d890f34
Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
2013-12-20 16:50:00 +04:00
Leszek Swirski
9c22d4887c
imgproc: IPP compilation fix and minor cleanup
2013-12-20 12:40:40 +00:00
Matthias Bady
a032d947b4
Fixed doc
2013-12-20 11:45:07 +01:00
Matthias Bady
9b0a9f2a24
moved documentation of BriefDescriptorExtractor to correct place
2013-12-20 10:57:48 +01:00
Matthias Bady
6e4715309b
added documentation
2013-12-20 10:53:21 +01:00
krodyush
e8dd31aacd
change code according reviewer suggesions
2013-12-20 13:51:51 +04:00
Vladimir Bystricky
d6a7e8f84f
Remove TBB ifdef form code
2013-12-20 12:33:39 +04:00
Roman Donchenko
b4bd5bab6d
Merge pull request #2021 from vpisarev:ocl_facedetect7
2013-12-20 12:30:49 +04:00
Alexander Smorkalov
529bd41751
Build fixes for case where HAVE_CUDA==OFF.
2013-12-20 11:37:15 +04:00
Pierre-Emmanuel Viel
d3ac1bc314
When a cluster is empty for KMeans, it's better to give it the point from another cluster j that is the furthest one from center j.
2013-12-20 01:00:55 +01:00
Matthias Bady
74dfa668e2
added tests
2013-12-20 00:05:50 +01:00
krodyush
27c1bd2762
Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
...
The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
new performance tests were added
2013-12-19 22:56:46 +04:00
Andrey Pavlenko
cdffa05c27
Merge pull request #2019 from ilya-lavrenov:tapi_repeat
2013-12-19 19:28:58 +04:00
Alexander Smorkalov
069f3d8d9a
Build fixes for GPU module.
2013-12-19 19:12:18 +04:00
Alexander Smorkalov
2509fa8080
Warious fixes for case where HAVE_CUDA==OFF.
2013-12-19 18:02:59 +04:00
Alexander Smorkalov
5a5c82bb1d
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.
2013-12-19 17:41:04 +04:00
Alexander Karsakov
febe528363
Added ocl::pyrUp to T-API
2013-12-19 17:21:50 +04:00
Andrey Pavlenko
26f5d2d639
Merge pull request #1765 from ilya-lavrenov:cv_remap
2013-12-19 17:08:52 +04:00
Vadim Pisarevsky
242a3d1f19
2 more fixes to calm down the doc builder
2013-12-19 16:57:02 +04:00
Andrey Pavlenko
dde1d6b636
Merge pull request #2018 from ilya-lavrenov:tapi_dft
2013-12-19 16:47:19 +04:00
Andrey Pavlenko
b674cd8571
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
2013-12-19 16:46:58 +04:00
Andrey Pavlenko
8c91a1af71
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
2013-12-19 16:46:40 +04:00
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
2013-12-19 16:42:11 +04:00
Vadim Pisarevsky
f41f633d2d
fixed various warnings from the “doc” and other builders
2013-12-19 16:31:30 +04:00
Andrey Pavlenko
22a3cf0fba
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
2013-12-19 16:14:42 +04:00
Vadim Pisarevsky
a1784b7320
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
2013-12-19 14:48:42 +04:00
Vadim Pisarevsky
ec3f22cee2
renamed OpenCL kernel filename; made some final changes
2013-12-19 14:29:28 +04:00
Ilya Lavrenov
b3af0e3154
added cv::repeat to T-API
2013-12-19 14:28:09 +04:00
Vadim Pisarevsky
b7553d4e2e
some attempts to tune the performance
2013-12-19 14:09:44 +04:00
Alexander Karsakov
ac230cd2ae
Added ocl::pyrDown to T-API
2013-12-19 13:56:42 +04:00
Andrey Pavlenko
0cea828a10
Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft
2013-12-19 13:48:40 +04:00
Ilya Lavrenov
c8cbfe5382
added cv::dft T-API test
2013-12-19 13:42:16 +04:00
Andrey Pavlenko
bc741ab25f
Merge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final
2013-12-19 13:38:52 +04:00
Alexander Smorkalov
64c94cb22c
CUDA related func tables refactored to remove unneeded dependencies.
2013-12-19 11:18:04 +04:00
Alexander Smorkalov
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
2013-12-19 10:27:38 +04:00
Alexander Smorkalov
442082eb0f
Fixes for Android support.
2013-12-19 09:38:46 +04:00
Matthias Bady
545f02679a
Optimized version. Faster than CPU
2013-12-19 01:54:57 +01:00
Matthias Bady
69d034ecdf
Naive impl. Slower than CPU
2013-12-19 00:15:53 +01:00
Pierre-Emmanuel Viel
92fc763925
Fix some memory leaks in HierarchicalClusteringIndex
2013-12-18 22:46:41 +01:00
Pierre-Emmanuel Viel
0d19685f95
Move templates in dist.h in order to share them between KMeansIndex and HierarchicalClusteringIndex classes.
2013-12-18 20:48:34 +01:00
Pierre-Emmanuel Viel
fa749de0dc
As some processed distances are already ^2, use template to select whether or not we have to ^2 in KMeanspp
2013-12-18 20:48:25 +01:00
Pierre-Emmanuel Viel
5aeeaa6fce
Apply to KMeansIndex KMeanspp the same modification as in HierarchicalClusteringIndex
2013-12-18 20:48:15 +01:00
Pierre-Emmanuel Viel
45e0e5f8e9
Pick centers in KMeans++ with a probability proportional to their distance^2, instead of simple distance, to previous centers
2013-12-18 20:48:02 +01:00
Andrey Pavlenko
2431c72d1d
Merge pull request #2000 from apavlenko:license_copyright
2013-12-18 19:35:04 +04:00
Andrey Pavlenko
96f8ff2ab8
adding LICENSE file and a sample of its reference in ocl.hpp
2013-12-18 19:33:25 +04:00
Andrey Pavlenko
459e7d4a80
Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill
2013-12-18 19:13:22 +04:00
Andrey Pavlenko
a9687a341e
adding more than 4 channels random Mats support
...
if `Scalar:all` is used, Mats with 5+ channels cause errors
2013-12-18 17:27:39 +04:00
krodyush
1ae71fe205
intel device guard was added because of perf degradation on some non intel platform.
2013-12-18 14:27:51 +04:00
Andrey Pavlenko
59cab94fc7
Merge pull request #1997 from alalek:tapi_fix_memleaks
2013-12-18 13:53:17 +04:00
Andrey Pavlenko
388d0ef182
Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto
2013-12-18 13:46:14 +04:00
Alexander Smorkalov
be530bd085
DeviceInfo class method that were implemented in header moved to cpp file.
2013-12-18 12:02:15 +04:00
Vladimir Bystricky
80d0593dbd
Delete end comma in enumerations
2013-12-18 11:46:52 +04:00
Vladimir Bystricky
66145ea06c
Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list
2013-12-18 10:55:09 +04:00
Vadim Pisarevsky
02fb3f0a77
it finally works!!!
2013-12-17 20:55:49 +04:00
krodyush
34c630faf4
update doc to be consisted with headers
2013-12-17 17:46:09 +04:00
Ilya Lavrenov
3a6d248bee
typo
2013-12-17 17:41:28 +04:00
krodyush
ea0c9b7f5c
GFFT fix for linux build
2013-12-17 17:12:57 +04:00
Andrey Pavlenko
bd91b39593
Merge pull request #1917 from alalek:ocl_d3d
2013-12-17 16:44:27 +04:00
Andrey Pavlenko
586a5cb6db
Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc
2013-12-17 16:42:44 +04:00
Andrey Pavlenko
6a0fb2c7da
Merge pull request #1992 from ElenaGvozdeva:ocl_medianFilter
2013-12-17 16:42:16 +04:00
Andrey Pavlenko
d3fa2bfe8c
Merge pull request #1998 from ilya-lavrenov:tapi_gemm
2013-12-17 16:41:59 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
Ilya Lavrenov
ac030c16f1
fixed UMat::copyTo(UMat)
2013-12-17 15:23:39 +04:00
Vadim Pisarevsky
ef509ace43
trying to debug the new cascade
2013-12-17 14:51:22 +04:00
Vadim Pisarevsky
9d3e7e027a
almost finished opencl-ization of cascade classifier
2013-12-17 14:29:30 +04:00
krodyush
fffac2f085
optimize SURF by
...
Inlining and customizing sampling functions to reduce memory traffic and compute
Improve calcOrientation implementation.
Using more efficient rounding routines.
Removing unnecessary use of local memory
2013-12-17 14:12:33 +04:00
Roman Donchenko
6d77cbee7e
Merge pull request #1934 from vbystricky:ocl_boxFilter
2013-12-17 14:11:51 +04:00
krodyush
dfe7c98090
optimize separable filter by
...
Added "sep_filter_singlepass" kernel that performs separable filtering in one kernel call
Added appropriate host part - sepFilter2D_SinglePass function and SingleStepSeparableFilterEngine_GPU class
Changed function declarations to enable their usage
2013-12-17 14:09:06 +04:00
krodyush
f3ee1c3d2f
Changes the datatype of the angle of the gradient for Intel platforms.
2013-12-17 14:06:14 +04:00
krodyush
917b883cf0
remove extra calculations from haar to be consistent with native implementation
2013-12-17 14:04:10 +04:00
krodyush
a63576e76d
HOST side optimization for GFFT
2013-12-17 14:02:57 +04:00
krodyush
de431609db
optimize Dx and Dy calcualtion to make it as single opencl kernel
2013-12-17 14:01:01 +04:00
Roman Donchenko
e49b8dee40
Merge pull request #1881 from pentschev:defaultNorm_master
2013-12-17 13:53:59 +04:00
Roman Donchenko
52a785e95a
Merge pull request #1996 from SpecLad:merge-2.4
2013-12-17 13:21:48 +04:00
Roman Donchenko
5d5527d03e
Merge pull request #1987 from pentschev:cv_completesymm_template_2.4
2013-12-17 13:17:25 +04:00
Konstantin Matskevich
5cf4166801
some fixes
2013-12-17 12:43:21 +04:00
Konstantin Matskevich
904dac7670
minMaxLoc
2013-12-17 12:43:21 +04:00
Vladimir Bystricky
4088013251
Add set/get depth generator properties by default. Add documentation
2013-12-17 12:00:40 +04:00
Adrien BAK
6ae16ebec3
update doc accordingly
2013-12-17 16:51:33 +09:00
Elena Gvozdeva
d9d4678599
Fixed condition for channels
2013-12-17 11:15:48 +04:00
Elena Gvozdeva
125d67130b
Fixed medianFilter
2013-12-17 11:04:54 +04:00
Alexander Smorkalov
88a883e68e
Build fix.
2013-12-17 10:24:00 +04:00
Adrien BAK
c5c3fd4443
modify signature of stereoCalibrate for consistency
2013-12-17 14:53:44 +09:00
Ilya Lavrenov
2f34bb9aa0
added cv::gemm to T-API
2013-12-16 19:12:27 +04:00
Roman Donchenko
f2befa01f4
Fixed build for the TLS-related stuff.
2013-12-16 18:45:41 +04:00
Elena Gvozdeva
8fe4e98b8a
Fixed trailing whitespace
2013-12-16 18:06:11 +04:00
Alexander Alekhin
9cb31e86ae
umat: fix memory leaks
2013-12-16 16:46:36 +04:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
Alexander Smorkalov
8660e048bc
Dynamic CUDA support library loading implemented for Linux.
...
Logical mistake in macro fixed;
DeviceInfo deligate reimplemented;
Build and warning fixes.
2013-12-16 14:46:44 +04:00
Alexander Smorkalov
d4087f19a2
All CUDA related stuff were moved to separate dynamic library.
2013-12-16 14:46:44 +04:00
StevenPuttemans
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
Elena Gvozdeva
b2d8b491c0
Added ocl_medianFilter using Transparent API
2013-12-16 13:20:05 +04:00
Peter Andreas Entschev
f44de302a0
cv::completeSymm fixed to work with any OpenCV data type and multiple channels.
2013-12-15 20:56:55 -02:00
Matthias Bady
b7c97f6e30
fixed init of clCxt
2013-12-15 22:41:07 +01:00
Ilya Lavrenov
558c4a2b1d
implemented UMat::convertTo
2013-12-15 14:15:30 +04:00
Andrey Pavlenko
172a5d42a9
Merge pull request #1974 from ilya-lavrenov:tapi_equalizehist
2013-12-13 19:47:34 +04:00
Ilya Lavrenov
5c0dabf1ea
added cv::equalizeHist to T-API
2013-12-13 19:46:20 +04:00
Andrey Pavlenko
c9ed05c3bd
Merge pull request #1981 from ilya-lavrenov:tapi_sqrt
2013-12-13 19:34:28 +04:00
Alexander Alekhin
11b9d5bf4d
core: added DirectX interop implementation (OpenCL) with samples
2013-12-13 19:02:41 +04:00
Ilya Lavrenov
e30875bcef
fixed UMat sync problems
2013-12-13 18:38:12 +04:00
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
2013-12-13 17:25:16 +04:00
Vadim Pisarevsky
d8513d627d
continue adding OpenCL optimization to cascade classifier
2013-12-12 21:58:42 +04:00
Alexander Alekhin
17ca7f9545
ocl: add support for initialization from user-provided OpenCL handles
2013-12-12 19:59:22 +04:00
Ilya Lavrenov
1d6715e58a
added cv::sqrt to T-API (using built-in sqrt OpenCL function)
2013-12-12 18:12:30 +04:00
Andrey Pavlenko
b43d6b6858
Merge pull request #1954 from pentschev:ocl_features2d_fast_master
2013-12-12 17:37:09 +04:00
Andrey Pavlenko
5299b13434
Merge pull request #1979 from pentschev:ocl_arithm_sqrt_master
2013-12-12 17:35:01 +04:00
Andrey Pavlenko
b0a9220de8
Merge pull request #1889 from alalek:ocl_core_dynamic_runtime
2013-12-12 17:27:34 +04:00
Peter Andreas Entschev
5bc9f15dda
OCL: included sqrt matrix operation.
2013-12-12 08:57:27 -02:00
Peter Andreas Entschev
41bec1b112
OCL: including FAST feature detector.
2013-12-11 21:23:27 -02:00
Ilya Lavrenov
b20714a8a8
fixed kernel compilation of cv::min, cv::max for CV_64F
2013-12-12 02:42:24 +04:00
sprice
1c15776cf5
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/imgproc/src/sumpixels.cpp
2013-12-11 14:35:51 -08:00
Andrey Pavlenko
f3e2bfea79
Merge pull request #1970 from ilya-lavrenov:tapi_checks
2013-12-11 21:37:10 +04:00
Andrey Pavlenko
eeb16a5d01
Merge pull request #1971 from ilya-lavrenov:tapi_laplacian
2013-12-11 21:25:54 +04:00
Alexander Alekhin
740b1f235e
ocl: implemented per-thread OpenCL command queue
2013-12-11 19:12:09 +04:00
Alexander Alekhin
a118577a57
core: added TLS support
2013-12-11 18:50:11 +04:00
Vladimir Bystricky
268d814d18
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 16:57:47 +04:00
Alexander Alekhin
3bbf51fbfb
ocl: disabled test for Split (there are problems with OutputArray and getMatRef)
2013-12-11 16:46:08 +04:00
Andrey Pavlenko
129b715e3d
Merge pull request #1958 from vbystricky:ocl_filter2D
2013-12-11 16:41:12 +04:00
Alexander Alekhin
91fc0c3bc3
bioinspired: fix ocl test, skip them if OpenCL is not available
2013-12-11 15:56:54 +04:00
Alexander Alekhin
d0114b24e0
core/ocl: replace dynamic runtime
2013-12-11 15:56:54 +04:00
Alexander Alekhin
9f388a2be7
core/ocl: autogenerated files for dynamic runtime
2013-12-11 15:56:54 +04:00
Alexander Alekhin
5ecf759742
core/ocl: update dynamic runtime
2013-12-11 15:56:54 +04:00
Alexander Alekhin
381d7851b7
core/ocl: move opencl dynamic runtime from ocl module
2013-12-11 15:56:54 +04:00
Vladimir Bystricky
f76bf8b425
Fix error in test
2013-12-11 14:33:22 +04:00
Vladimir Bystricky
e7227d3e4b
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 14:26:33 +04:00
Alexander Alekhin
bdbd3eb2bf
ocl: process termination hung workaround
2013-12-11 00:31:34 +04:00
Ilya Lavrenov
8fa8b36b42
added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API
2013-12-10 23:20:28 +04:00
Vadim Pisarevsky
302a5adcc2
converted Haar cascades to the new format; now they are handled with C++ code.
2013-12-10 22:54:37 +04:00
Ilya Lavrenov
5566d31468
more strict checks outside ROI
2013-12-10 19:30:14 +04:00
Andrey Pavlenko
d802b4d143
Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear
2013-12-10 18:49:42 +04:00
Peter Andreas Entschev
c289c8a700
Fixing some indentation issues on FREAK source file.
2013-12-10 08:57:46 -02:00
Roman Donchenko
90c28d254f
Merge pull request #1961 from SpecLad:merge-2.4
2013-12-10 14:39:35 +04:00
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
2013-12-10 13:07:52 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Roman Donchenko
5c72c74b09
Merge pull request #1960 from ilya-lavrenov:tapi_bilateral
2013-12-10 12:13:15 +04:00
Roman Donchenko
9d87f9c974
Merge pull request #1956 from ilya-lavrenov:tapi_split_merge
2013-12-09 16:56:06 +04:00
Ilya Lavrenov
93c6fe66ce
added cv::bilateralFilter to T-API
2013-12-09 16:03:25 +04:00
Peter Andreas Entschev
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
2013-12-09 09:54:42 -02:00
Roman Donchenko
24465bbd05
Merge pull request #1855 from Nerei:master
2013-12-09 14:13:40 +04:00
Roman Donchenko
8db53c1760
Merge pull request #1883 from philippefoubert:branch_matx_inv
2013-12-09 14:07:10 +04:00
Andrey Pavlenko
0dfa188ca5
Merge pull request #1948 from ilya-lavrenov:tapi_norm
2013-12-09 13:25:41 +04:00
Vladimir Bystricky
8d8f5665f1
Fix build errors on Linux system
2013-12-09 11:31:55 +04:00
Vladimir Bystricky
179a43ef63
Fix build errors on Linux system
2013-12-09 11:10:48 +04:00
Vladimir Bystricky
29ba7730ed
Add ocl version of filter2D to the module img_proc
2013-12-09 10:45:23 +04:00
Anatoly Baksheev
262f70f3ab
cv::format declaration in default headers
2013-12-08 19:00:53 +04:00
Ilya Lavrenov
c16c9a2e8e
added cv::split to T-API
2013-12-08 16:30:17 +04:00
Ilya Lavrenov
b6c33bf86b
added cv::norm to T-API
2013-12-08 15:27:48 +04:00
Ilya Lavrenov
cd3f7fbf05
added cv::merge to T-API
2013-12-08 13:49:28 +04:00
Anatoly Baksheev
4c66b87698
fixed -Wshadow and other warnings, added rvec test
2013-12-07 20:33:50 +04:00
Anatoly Baksheev
f62ffa2aea
compilation
2013-12-07 18:58:29 +04:00
Anatoly Baksheev
f9ca6cfd22
fixed ocv_module_disable()
2013-12-07 18:58:28 +04:00
Anatoly Baksheev
546c084fe6
fixed shadow error and added ocv_disable_module
2013-12-07 18:58:27 +04:00
Anatoly Baksheev
0e88733b13
updating Viz cmake (switched to WITH_VTK option)
2013-12-07 18:58:27 +04:00
Anatoly Baksheev
3830a0b5b2
fixed bug with deletion from std::map
2013-12-07 18:50:47 +04:00
Anatoly Baksheev
a6ab9be5a6
removed VizAccessor from docs
2013-12-07 18:50:47 +04:00
Anatoly Baksheev
fb62a66b69
removed unused code
2013-12-07 18:50:46 +04:00
Anatoly Baksheev
b88fdc73d6
VizAccessor is now private and renamed to VizStorage
2013-12-07 18:50:46 +04:00
Anatoly Baksheev
d970d58308
added Viz::tutorial2 test
2013-12-07 18:50:45 +04:00
Anatoly Baksheev
ace71cef3f
Added Affine3<T>::rvec()
2013-12-07 18:50:45 +04:00
Anatoly Baksheev
9f1f5aed53
compilation
2013-12-07 18:50:44 +04:00
Anatoly Baksheev
a9c7aa92d9
removed CV_EXPORTS from cv::Afiine
2013-12-07 18:50:44 +04:00
Anatoly Baksheev
177f7eb339
fixed warning
2013-12-07 18:50:43 +04:00
Anatoly Baksheev
0895616576
switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale)
2013-12-07 18:50:43 +04:00
Anatoly Baksheev
b560cc35d9
removed Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer
2013-12-07 18:50:42 +04:00
GregoryMorse
68d8f6410f
Update system.cpp
...
Cleaned up to use the preferred namespace code. This can be further simplified by using the HString/HStringReference classes from wrl\wrappers\corewrappers.h
2013-12-07 15:40:30 +08:00
Vadim Pisarevsky
fdf1996e2e
added old=>new cascade conversion function
2013-12-07 01:51:35 +04:00
Ilya Lavrenov
73aa43d2ca
fixed warnings
2013-12-07 01:05:07 +04:00
Roman Donchenko
060e58d080
Merge pull request #1945 from apavlenko:2.4_version_update
2013-12-06 17:56:59 +04:00
Andrey Pavlenko
b5936648ca
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
2013-12-06 16:59:02 +04:00
Andrey Pavlenko
a0c296fcdb
Merge pull request #1936 from ElenaGvozdeva:ocl_flip
2013-12-06 16:40:30 +04:00
Andrey Pavlenko
f2cf9dd8bf
updating version to 2.4.7.2
2013-12-06 16:21:22 +04:00
Andrey Pavlenko
7069b4b761
Merge pull request #1927 from JBosch:issue3409
2013-12-06 16:06:03 +04:00
Andrey Pavlenko
c34fc180a7
Merge pull request #1762 from jet47:cuda-6.0-npp-fix
2013-12-06 15:56:15 +04:00
Elena Gvozdeva
f5a01f15a5
Fixed test for ocl_flip
2013-12-06 15:53:00 +04:00
Andrey Pavlenko
1d01c49a06
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
2013-12-06 15:47:39 +04:00
Peter Andreas Entschev
def17f2baa
Removing ocl::oclMat::ptr() method.
...
The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.
2013-12-06 09:31:18 -02:00
Andrey Pavlenko
f36858b3a0
Merge pull request #1942 from ilya-lavrenov:warn_fix
2013-12-06 15:26:43 +04:00
Ilya Lavrenov
926cab2baa
fixed warnings
2013-12-06 15:20:29 +04:00
Vladimir Bystricky
44126e350a
Change while(true) to for(;;) for fix compiler warning.
2013-12-06 15:11:26 +04:00
Andrey Pavlenko
72cfff4c59
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
2013-12-06 15:05:34 +04:00
Andrey Pavlenko
b0b199ee8a
Merge pull request #1929 from alalek:ocl_haar_amd_beta
2013-12-06 14:56:47 +04:00
Vladimir Bystricky
591b1a7e70
Another fix for disable "conditional expression is constant"
2013-12-06 14:42:06 +04:00
Vladimir Bystricky
3013b469fe
Add check for depths of destination and source image. Fix warning C4127.
2013-12-06 14:21:51 +04:00
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +04:00
Peter Andreas Entschev
3bc952ed34
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().
...
The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.
2013-12-05 19:27:10 -02:00
Elena Gvozdeva
b930028727
Added cv::flip using Transparent API
2013-12-05 17:54:05 +04:00
Andrey Pavlenko
9dea590ada
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
2013-12-05 17:05:25 +04:00
Andrey Pavlenko
b16f0a25af
Merge pull request #1925 from vpisarev:ocl_facedetect2
2013-12-05 17:02:37 +04:00
Alexander Alekhin
3dcddad88a
ocl: added workaround into Haar kernels
2013-12-05 16:56:01 +04:00
Andrey Pavlenko
39754bd6f9
Merge pull request #1920 from alalek:ocl_disable_workaround
2013-12-05 16:46:25 +04:00
Vladimir Bystricky
af6134b4b6
Fix issue in boxFilter with destination depth not equal to source depth.
2013-12-05 14:25:15 +04:00
Roman Donchenko
bee4dff89d
Merge pull request #1447 from Siddharthk:master
2013-12-05 12:38:12 +04:00
Vladimir Bystricky
968a898a1b
Add ocl version of boxFilter to the module img_proc
2013-12-05 11:47:17 +04:00
sprice
73b0827ec1
Don't automatically convert to grayscale (keep previous behavior.)
2013-12-04 18:21:56 -08:00
sprice
2cc11e2c6a
Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images
2013-12-04 18:13:34 -08:00
Zhigang Gong
6ce03b0484
Fixed some implicitly type conversions between vector and scalar data type.
...
There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2013-12-05 09:35:21 +08:00
Josep Bosch
2153453fd1
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
2013-12-04 22:32:20 +01:00
Vadim Pisarevsky
828b0b151b
another attempt to fix compile errors
2013-12-04 22:22:36 +04:00
Ilya Lavrenov
eb7ff99f80
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
2013-12-04 22:04:31 +04:00
Vadim Pisarevsky
fe11ca886a
trying to eliminate compile problems
2013-12-04 21:56:35 +04:00
Andrey Pavlenko
458ac2592b
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
2013-12-04 21:41:44 +04:00
Vadim Pisarevsky
ff87385201
refactored CascadeClassifier to hide implementation details (take 2)
2013-12-04 19:00:39 +04:00
siddharth
c48ad880f3
Errors resolved
2013-12-04 19:18:00 +05:30
Anna Kogan
944f7bac42
After-merge corrections
2013-12-04 19:18:00 +05:30
siddharth
573e818415
New changes done and removed opencv_extra folder
...
Removed opencv_extra folder inside opencv folder
New changes done
Removed test images
2013-12-04 19:18:00 +05:30
siddharth
33e6c07485
Removed build errors and removed test images
...
Removed conflict
Error fix 1
Error fix 2
Error fix 3
Error fix 3
Error fix 4
Error fix 5
Error fix 6
Error fix 7
Error fix 8
Error fix 9
Error fix 10
Error fix 11
Error fix 12
Errors fixed
Removed opencv_extra folder inside opencv folder
2013-12-04 19:18:00 +05:30
siddharth
2f65a0d4ba
Changes done in npr module
2013-12-04 19:18:00 +05:30
siddharth
35d9ca6483
Changes done in cloning module
2013-12-04 19:18:00 +05:30
siddharth
daa9694cab
Changes done in decolorization module
2013-12-04 19:17:59 +05:30
siddharth
94eab9babe
Revert Back
2013-12-04 19:17:59 +05:30
siddharth
6c7272bde1
Update to remove Android error
2013-12-04 19:17:59 +05:30
siddharth
3b239561c6
Changed STL in contrast_preserve file
2013-12-04 19:17:59 +05:30
siddharth
f85a615f3f
whitespaces removed and other minor changes to fix build error
...
Update 1
update 2
Update 3
Update 4
Update 5
update 6
Update 7
Update 8
Update 9
Update 10
Update 11
Update 12
Update 13
Update 14
Update 15
Update 16
Update 17
Update 18
Update 19
Update 20
Update 21
Update 22
Removed Headers
Update 23
Update 24
Update 25
Update 26
Update 27
Update 28
2013-12-04 19:17:59 +05:30
siddharth
56ab1c18e6
new filters added and all the 3 modules updated
...
All 3 modules Updated
2013-12-04 19:17:58 +05:30
siddharth
ae9b4003ae
edge preserve filters added and windows warning removed
...
update1
2013-12-04 19:17:58 +05:30
siddharth
1ed0e44090
added keyboard control
2013-12-04 19:17:58 +05:30
siddharth
e170115ad0
new interface added. decolor and cloning module added.
...
Both modules added
2013-12-04 19:17:58 +05:30
siddharth
5b0ee9e085
decolor module updated
2013-12-04 19:17:58 +05:30
siddharth
0802c06571
seamless cloning added
...
update1
update1
update4
2013-12-04 19:17:58 +05:30
siddharth
a1b3ba02a7
add color_boost + doc
2013-12-04 19:17:58 +05:30
siddharth
88aa4a9902
decolor module updated
...
update3
update4
update4
update5
added test data
2013-12-04 19:17:58 +05:30
siddharth
95db69f6b9
added new files
2013-12-04 19:17:58 +05:30
Roman Donchenko
0736ede7e5
Merge pull request #1914 from SpecLad:merge-2.4
2013-12-04 16:30:57 +04:00
Roman Donchenko
fa2cd93ecf
Merge pull request #1915 from jet47:gpu-color-test-fix
2013-12-04 13:55:28 +04:00
Ilya Lavrenov
e2b99a32b2
added cv::threshold to T-API
2013-12-04 13:45:44 +04:00
Ilya Lavrenov
474fc887a6
added cv::copyMakeBorder to T-API
2013-12-04 13:41:35 +04:00
Ilya Lavrenov
5b5f5878ce
added tests to imgproc
2013-12-04 13:41:34 +04:00
Alexander Alekhin
7b551af424
ocl: try to disable clFinish workaround
2013-12-04 13:00:37 +04:00
Andrey Pavlenko
f9190cc662
Merge pull request #1909 from alalek:ocl_tapi_perf
2013-12-04 11:35:11 +04:00
Andrey Pavlenko
e585f145f6
Merge pull request #1903 from ilya-lavrenov:tapi_warp
2013-12-04 11:34:52 +04:00
Ilya Lavrenov
49474903cb
refactoring
2013-12-04 00:51:55 +04:00
Ilya Lavrenov
49e729f89d
ability to use cv::PSNR with transparent cv::norm
2013-12-04 00:51:55 +04:00
Ilya Lavrenov
88bceb5060
added cv::meanStdDev to T-API
2013-12-04 00:51:55 +04:00
Ilya Lavrenov
b8edc2cc4d
added cv::sum to T-API
2013-12-04 00:51:43 +04:00
Ilya Lavrenov
28575c1969
added cv::countNonZero to T-API
2013-12-04 00:51:32 +04:00
Ilya Lavrenov
fed7e61879
added cv::repeat to T-API (fix for copyTo -> UMat is needed)
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
e17107e864
added cv::compare to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
a180cebb2d
added cv::polarToCart to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
ba850f0b64
added cv::cartToPolar to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
435028ccee
added cv::transpose to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
6ab297718d
added setIdentity to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
3e586f42a0
added cv::pow to T-API
2013-12-04 00:50:02 +04:00
Ilya Lavrenov
997ec60839
added OCL-TAPI arithm tests
2013-12-04 00:50:02 +04:00
Ilya Lavrenov
803672feea
added cv::remap to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
dcce9d7088
added cv::warpAffine to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
55af7857b9
added cv::warpPerspective to T-API
2013-12-04 00:43:42 +04:00
Andrey Pavlenko
8752414718
Merge pull request #1911 from apavlenko:2.4_fix_vc12
2013-12-03 19:20:05 +04:00
Alexander Alekhin
7d9150460a
core/ocl: added perf test infra + "Add" perf test
2013-12-03 18:43:50 +04:00
Alexander Alekhin
fe01bc21c0
perf: test-based metrics collection strategy
2013-12-03 18:43:50 +04:00
Roman Donchenko
90c230678e
Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math
2013-12-03 18:02:44 +04:00
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
2013-12-03 17:46:09 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
2013-12-03 16:02:55 +04:00
Vladislav Vinogradov
adb2040980
added additional check in cv::gpu::demosaicing that source is not empty
2013-12-03 15:55:47 +04:00
Vladislav Vinogradov
14ee306b9e
fix gpu test for Demosaicing:
...
check that input images was loaded correctly
2013-12-03 15:55:10 +04:00
Konstantin Matskevich
eaf620ddde
small fix
2013-12-03 14:57:13 +04:00
Konstantin Matskevich
14dccdf23d
T-API cv::log, cv::exp, cv::magnitude, cv::phase
2013-12-03 14:07:00 +04:00
Roman Donchenko
35ea600c54
Merge pull request #1891 from alalek:cv_error_noreturn
2013-12-03 13:57:35 +04:00
Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
2013-12-03 13:38:10 +04:00
Andrey Pavlenko
bd9d3dd561
fixing build of 2.4 branch with VC12 (aka 2013)
...
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
2013-12-03 13:16:44 +04:00
Alexander Alekhin
cb4267cb38
ts/perf: int -> enum WarmUpType
2013-12-03 12:40:31 +04:00
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
2013-12-03 09:18:59 +01:00
Roman Donchenko
17f53bc301
Merge pull request #1904 from severin-lemaignan:emscripten
2013-12-03 12:14:09 +04:00
Roman Donchenko
6e9a7706ce
Merge pull request #1890 from alalek:ts_fix_seh_exceptions_handling
2013-12-03 11:56:49 +04:00
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
2013-12-03 11:32:31 +04:00
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
2013-12-03 11:20:48 +04:00
Andrey Pavlenko
0a624ee67d
Merge pull request #1901 from vpisarev:ocl_svm3
2013-12-03 11:20:26 +04:00
Alexander Alekhin
206b56ed39
ts: catch & append general exceptions into log
2013-12-03 03:40:56 +04:00
Vadim Pisarevsky
cd97d789b6
dummy commit to rerun pre-commit tests
2013-12-02 22:15:07 +04:00
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
2013-12-02 20:38:49 +04:00
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
2013-12-02 20:07:47 +04:00
Roman Donchenko
aed69cc458
Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
2013-12-02 18:55:47 +04:00
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Vadim Pisarevsky
161c3b71e6
hopefully, now opencv_test_imgproc should pass
2013-12-02 18:27:08 +04:00
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
2013-12-02 17:51:29 +04:00
Roman Donchenko
838961a289
Merge pull request #1897 from berak:b_3393_24
2013-12-02 17:11:56 +04:00
Séverin Lemaignan
efe564e3b3
Ensure compilation to Javascript with Emscripten
2013-12-02 14:06:24 +01:00
Vadim Pisarevsky
5fea17ff0d
still trying to fix failure in opencv_test_imgproc
2013-12-02 13:46:54 +04:00
Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
2013-12-02 12:28:18 +04:00
Vadim Pisarevsky
7626a8e8de
try to eliminate failure in opencv_imgproc_test
2013-12-02 12:13:50 +04:00
Vadim Pisarevsky
82b852c13c
yet another attempt to make Core_UMat.getUMat test work
2013-12-02 00:12:20 +04:00
Vadim Pisarevsky
9be727b1ea
another attempt to fix Core_UMat.getUMat test
2013-12-01 23:14:45 +04:00
Vadim Pisarevsky
f263fe145a
trying to guess and fix strange failure in core test
2013-12-01 22:14:15 +04:00
Vadim Pisarevsky
d7f4a223cf
fixed several compile errors/warnings; reacted on the PR comments
2013-12-01 20:58:30 +04:00
Philippe FOUBERT
ec6f2e1c4d
Using cv::String instead of std::string.
2013-12-01 16:41:17 +01:00
Vadim Pisarevsky
6da5d21331
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
2013-12-01 03:12:19 +04:00
berak
34a390fbc2
CV_WRAP for BackgroundSubtractorMOG2
2013-11-30 13:35:23 +01:00
berak
059bf1d9e5
corrected initialization of output_folder in facereco examples
2013-11-30 13:09:42 +01:00
berak
773616ee04
swapped x,y in elbp_
2013-11-30 12:00:22 +01:00
Alexander Alekhin
c1cfb4d422
core: added cv::error with CV_NORETURN attr
2013-11-30 03:43:31 +04:00
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
2013-11-29 23:08:20 +04:00
Ilya Lavrenov
09795e3265
added cv::resize INTER_AREA to T-API
2013-11-29 17:57:37 +04:00
Andrey Pavlenko
d83094b412
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
2013-11-29 12:59:09 +04:00
Alexander Smorkalov
a13db7c8fa
Android native camera destruction fixed for Android 4.4.
2013-11-29 10:38:26 +04:00
Roman Donchenko
9ca80961fd
Merge pull request #1874 from SpecLad:merge-2.4
2013-11-28 16:43:00 +04:00
Ilya Lavrenov
4eba74ee19
added cv::LUT to T-API
2013-11-28 12:31:04 +04:00
Vladislav Vinogradov
51663f5612
enable CUDA support for android
2013-11-28 10:00:47 +04:00
Vladislav Vinogradov
95ebdf4069
fixed compilation with CUDA 6.0:
...
GpuMat::setTo function, removed NPP call for CV_8S
2013-11-28 09:54:34 +04:00
Vladislav Vinogradov
7537521f53
disabled MOG2 performance test (sanity check fails on CUDA 6.0)
2013-11-28 09:50:05 +04:00
Vladislav Vinogradov
7c43daccba
fixed perf tests for bgfg segmentation
2013-11-28 09:49:50 +04:00
Philippe FOUBERT
22ad487328
Comment correction
2013-11-28 00:45:58 +01:00
Philippe FOUBERT
735f704b3e
Add on optional parameter to the matx invert function to know if this operation is successfull without having to analyse the matrix (it may fail in case of bad preconditioning or inappropriate decomposition method)
2013-11-28 00:42:19 +01:00
Philippe FOUBERT
c056e7fc61
Correction to be able to compile using the directive PRINT_KERNEL_RUN_TIME
2013-11-28 00:26:37 +01:00
Ilya Lavrenov
41d046a2db
restored ocl_cvtcolor.cl
2013-11-27 23:46:30 +04:00
Ilya Lavrenov
d2e1318341
RGBA <-> mRGBA
2013-11-27 23:42:10 +04:00
Ilya Lavrenov
f771a0ba81
RGB[A] <-> HLS
2013-11-27 23:37:58 +04:00
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
Ilya Lavrenov
727a5e6df4
BGR5x5 <-> Gray
2013-11-27 22:19:44 +04:00
Mathieu Barnachon
fb9c59dd8d
Fix default argument.
2013-11-27 18:14:37 +01:00
Ilya Lavrenov
8a23646897
RGB[A] <- RGB5x5
2013-11-27 20:00:35 +04:00
Ilya Lavrenov
81b9c9c104
RGB[A] -> RGB5x5
2013-11-27 19:52:42 +04:00
Ilya Lavrenov
af367c4f85
RGB[A] <-> BGR[A]
2013-11-27 19:44:37 +04:00
Ilya Lavrenov
ab9b883c69
RGB[A] <-> XYZ
2013-11-27 19:37:27 +04:00
Ilya Lavrenov
65ee06eb2b
RGB[A] <-> XYZ
2013-11-27 19:25:26 +04:00
Ilya Lavrenov
506c19616d
YCrCb -> RGB[A]
2013-11-27 19:24:27 +04:00
Andrey Pavlenko
41ae5d5f66
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
2013-11-27 18:08:11 +04:00
Roman Donchenko
28242f09d0
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
2013-11-27 17:58:54 +04:00
Ilya Lavrenov
90d62cacc9
fixed cv::cvtColor
2013-11-27 16:43:31 +04:00
Mathieu Barnachon
b413bcbba4
Fix shadow parameter.
2013-11-27 11:36:34 +01:00
Mathieu Barnachon
99c8b8c016
Fix parameter name to fit documentation.
2013-11-27 11:06:52 +01:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
2fed668390
Fixed build errors.
2013-11-27 12:59:19 +04:00
Ilya Lavrenov
6679aed61e
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
2013-11-27 02:52:02 +04:00
Mathieu Barnachon
4f74e2509b
Fix the documentation names.
2013-11-26 22:50:26 +01:00
Andrey Pavlenko
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
2013-11-26 23:27:49 +04:00
Andrey Pavlenko
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
2013-11-26 23:24:51 +04:00
Alexander Smorkalov
8fe4ab280b
Build error fix for binary-complience-checker tool.
2013-11-26 17:39:40 +04:00
Roman Donchenko
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
2013-11-26 15:32:44 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Roman Donchenko
aaf97c4548
Merge pull request #1863 from nevion:master
2013-11-26 13:53:48 +04:00
Roman Donchenko
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
2013-11-26 13:00:56 +04:00
Roman Donchenko
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
2013-11-26 11:43:34 +04:00
Roman Donchenko
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
2013-11-26 11:40:37 +04:00
Andrey Pavlenko
d45ce086c1
Merge pull request #1856 from alalek:ocl_fix_mt
2013-11-26 09:58:22 +04:00
Eric Sommerlade
3b4f65b186
fixed comparison to stop integer wrap around
2013-11-26 00:12:30 +00:00
GregoryMorse
e4793e3d5e
Update system.cpp
...
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
2013-11-26 00:22:14 +08:00
Ilya Lavrenov
16a3067afc
cp test_colot.cpp to imgproc ocl tests
2013-11-25 19:19:17 +04:00
Konstantin Matskevich
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
StevenPuttemans
1b0297d92b
Added fixes mentioned in bugreport 3306
...
- Added author provided fixes
- Added code example
- Added documentation fixes
2013-11-25 09:35:23 +01:00
Roman Donchenko
4c5593b633
Merge pull request #1837 from asmorkalov:android_opencl
2013-11-25 12:19:20 +04:00
Roman Donchenko
06f6f74e61
Merge pull request #1839 from pmiecielica:memory_leaks
2013-11-25 12:17:08 +04:00
Roman Donchenko
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
2013-11-25 12:04:17 +04:00
Roman Donchenko
59aa516ca5
Merge pull request #1860 from alalek:ocl_fix_undef_warn
2013-11-25 12:00:25 +04:00
Mathieu Barnachon
c90fe65f22
Fix compilation issue related to previous commit.
2013-11-24 17:16:45 +01:00
Mathieu Barnachon
e8b86c8663
Fix name of one parameter to fit the documentation.
2013-11-24 17:14:23 +01:00
Mathieu Barnachon
9dc713eaba
Fix name of parameter to have proper documentation.
2013-11-24 15:45:05 +01:00
Mathieu Barnachon
bf84d476fc
Fix useless space...
2013-11-24 15:38:48 +01:00
Mathieu Barnachon
0c4da123e9
Remove duplicate functions.
2013-11-24 14:33:41 +01:00
Mathieu Barnachon
67525627db
Merge remote-tracking branch 'upstream/master' into bow_desc
...
Conflicts:
modules/features2d/src/bagofwords.cpp
2013-11-24 14:21:44 +01:00
Mathieu Barnachon
63c23cce65
Merge remote-tracking branch 'upstream/master' into svm_hog
2013-11-24 13:24:39 +01:00
Jason Newton
88b2fe9dbb
correct upper bound for maximum number of labels for 8-way connectivity
2013-11-24 01:20:07 -08:00
Alexander Alekhin
fd4a7e7d1f
ocl: disable tests
2013-11-23 18:13:32 +04:00
Andrey Pavlenko
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
2013-11-23 16:44:58 +04:00
Ilya Lavrenov
1af95ea12c
fixed error in setting kernel arguments
2013-11-22 18:56:03 +04:00
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
2013-11-22 18:37:44 +04:00
Roman Donchenko
0537747f79
Merge pull request #1853 from StevenPuttemans:bugfix_3346
2013-11-22 18:26:16 +04:00
Alexander Alekhin
ddc9be9170
ocl: don't disable Undef warnings
2013-11-22 18:24:50 +04:00
Roman Donchenko
dd817857b4
Replaced most of the instances of "s = s +" with "s +=".
...
This resynchronizes master code with 2.4. I say "most", because I might
have missed some due to different spacing; I'll deal with those
instances later if I find them.
2013-11-22 17:59:56 +04:00
Roman Donchenko
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
2013-11-22 17:58:40 +04:00
Ilya Lavrenov
c8abb6124f
recursive mutex for linux
2013-11-22 17:30:32 +04:00
Piotr Miecielica
a19cc6cb64
Added pointer initialization
2013-11-22 13:33:33 +01:00
Alexander Smorkalov
514e97223c
Some hacks to build and run OpenCL on Qualcomm S800.
...
Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.
2013-11-22 16:13:38 +04:00
Alexander Alekhin
d650efc069
ocl: multi-threading: opencl buffer memory guard
2013-11-22 14:39:51 +04:00
Alexander Alekhin
96a4a7b339
ocl: multi-threading: fix bug in intialization
2013-11-22 14:39:33 +04:00
Andrey Pavlenko
c1f59c4c76
Merge pull request #1852 from ilya-lavrenov:ocl_retina
2013-11-22 13:57:22 +04:00
StevenPuttemans
7a8bd31657
Fixed bug in report #3346
2013-11-22 09:57:47 +01:00
Ilya Lavrenov
8834d5e57b
changed eps in Retina_OCL test
2013-11-22 12:35:46 +04:00
Piotr Miecielica
923698d700
Fixes of some memory leaks
2013-11-21 18:55:09 +01:00
Andrey Pavlenko
c33cb94d66
Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix
2013-11-21 21:29:26 +04:00
Ilya Lavrenov
650f92f9cc
eliminated warning C4267
2013-11-21 18:27:07 +04:00
Ilya Lavrenov
561a7f5782
fixed kernel compilation in imgproc module
2013-11-21 18:23:57 +04:00
Andrey Pavlenko
8a4f35704a
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
2013-11-21 17:32:53 +04:00
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
2013-11-21 14:22:24 +04:00
Ilya Lavrenov
d764af5318
added extra parameters to ocl::cvtColor performance test
2013-11-21 12:53:21 +04:00
Roman Donchenko
6b23cb5b02
Merge pull request #1795 from alalek:perf_report_progress
2013-11-21 12:31:36 +04:00
Roman Donchenko
b8f5fcf3f9
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
2013-11-21 12:03:02 +04:00
Roman Donchenko
623a02c69f
Merge pull request #1834 from SpecLad:svm-copy-ctor
2013-11-21 11:55:20 +04:00
Alexander Alekhin
c1541c9e79
perf report: summary.py: added --progress mode
2013-11-20 19:57:20 +04:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
Roman Donchenko
3703c7040a
Merge pull request #1828 from SpecLad:merge-2.4
2013-11-20 16:08:53 +04:00
Ilya Lavrenov
60b59eeb73
workaround for AMD bug: UNREACHABLE EXECUTED
2013-11-20 15:40:56 +04:00
Roman Donchenko
cf00349b5b
Gave CvSVM a private copy constructor & assignment operator.
...
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)
"Fixes" <http://code.opencv.org/issues/3358 >.
2013-11-20 14:59:42 +04:00
Roman Donchenko
4cfbee70bd
Simplified the Windows implementation of CV_XADD.
...
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365 >.
2013-11-20 13:47:35 +04:00
Roman Donchenko
b197ec9413
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
2013-11-20 13:36:37 +04:00
Roman Donchenko
95006af170
Merge pull request #1816 from SpecLad:no-more-epoch
2013-11-20 11:52:54 +04:00
Vadim Pisarevsky
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
2013-11-19 20:51:31 -05:00
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
2013-11-19 19:20:24 -05:00
Philippe FOUBERT
78e16a906b
Back to the previous coding way (using the macro with the goto).
2013-11-19 21:51:47 +01:00
Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
2013-11-19 16:25:47 +04:00
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
Roman Donchenko
c47190ef90
Merge pull request #1787 from hs3180:2.4
2013-11-19 14:21:25 +04:00
Ilya Lavrenov
198cd1a40d
added area fast mode to ocl::resize
2013-11-19 13:43:50 +04:00
Roman Donchenko
4746a710bb
Merge pull request #1820 from asmorkalov:android_native_camera_44
2013-11-19 12:47:48 +04:00
Roman Donchenko
3e55d705cc
Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum
2013-11-19 12:34:09 +04:00
Roman Donchenko
56f791679b
Merge pull request #1825 from jet47:fix-opengl-mem-leak
2013-11-19 12:31:53 +04:00
Vladislav Vinogradov
66221a32b9
fixed memory leak in ogl::Texture2D
2013-11-19 10:12:22 +04:00
Vadim Pisarevsky
d0b3c7a518
added some diagnostic into Tonemap test
2013-11-18 23:14:44 -05:00
Vadim Pisarevsky
8c44995ea6
another attempt to fix compile errors
2013-11-18 22:15:04 -05:00
Vadim Pisarevsky
241002384c
fixed some more compile errors
2013-11-18 14:26:19 -05:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Ilya Lavrenov
c0456df611
workaround for ocl::absSum (eliminated error: unreachable executed)
2013-11-18 20:38:39 +04:00
Ilya Lavrenov
f70d63e4c9
added INTER_AREA interpolation to ocl::resize
2013-11-18 18:28:49 +04:00
Roman Donchenko
bb4bf7a1f9
Merge pull request #1811 from Nerei:fixed_some_build_errors
2013-11-18 18:09:44 +04:00
Alexander Smorkalov
04d293d2c4
Initial NativeCamera support for Android 4.4 KitKat.
2013-11-18 18:07:26 +04:00
Roman Donchenko
cdf4e4e0b5
Merge pull request #1810 from Nerei:2.4
2013-11-18 17:49:40 +04:00
Roman Donchenko
4fd1960425
Merge pull request #1807 from KonstantinMatskevich:intel_bug
2013-11-18 15:16:37 +04:00
Roman Donchenko
3f927abb4d
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
2013-11-18 14:55:24 +04:00
Konstantin Matskevich
327d9f274b
fixed Split for device version equals 78712
2013-11-18 13:20:57 +04:00
Konstantin Matskevich
0e1717c14c
fixing bugs for Intel platform CPU device
2013-11-18 13:20:54 +04:00
Roman Donchenko
f5ded41016
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
2013-11-18 12:20:58 +04:00
Anatoly Baksheev
9e3a29701e
Viz code beautification
2013-11-17 19:33:55 +04:00
Anatoly Baksheev
efcc341219
added viz tutorial 3 test
2013-11-17 15:18:15 +04:00
Anatoly Baksheev
e154bce259
fixed compilation for vs2008
2013-11-17 14:13:13 +04:00
Anatoly Baksheev
d8600d3d13
fixed all Viz warnings
...
moved some headers to precomp.hpp
2013-11-17 14:13:11 +04:00
Anatoly Baksheev
5c6248005a
fixed warnings
2013-11-17 14:08:57 +04:00
Anatoly Baksheev
dfef42f94e
Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.
2013-11-17 14:08:56 +04:00
Anatoly Baksheev
d275e29ea4
compilation & warnings
2013-11-17 14:08:55 +04:00
Anatoly Baksheev
13bb236ad5
fixed some warnings
2013-11-16 21:18:36 +04:00
Anatoly Baksheev
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
Roman Donchenko
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
2013-11-15 11:51:59 +04:00
Roman Donchenko
3b7acf2657
Fix building with FFmpeg 0.8.
...
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
2013-11-14 17:25:46 +04:00
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
Roman Donchenko
84da6ca265
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
2013-11-14 14:46:06 +04:00
Roman Donchenko
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
2013-11-14 14:45:50 +04:00
Ilya Lavrenov
fe76b2116a
added RGBA <-> mRGBA
2013-11-14 12:02:59 +04:00
Ilya Lavrenov
1b7c5b201d
added HLS -> RGB[A][FULL] conversion
2013-11-13 19:35:24 +04:00
Ilya Lavrenov
98915e06bc
added HSV -> RGB[A][FULL] conversion
2013-11-13 19:10:06 +04:00
Ilya Lavrenov
3bdd9626f3
added RGB[A] -> HLS[FULL] conversion
2013-11-13 17:41:40 +04:00
Roman Donchenko
15f4292a1f
Merge pull request #1788 from alalek:perf_test_skip
2013-11-13 17:21:52 +04:00
Ilya Lavrenov
af7c614438
added RGB[A] -> HSV[FULL] conversion
2013-11-13 17:09:05 +04:00
Roman Donchenko
411629a57d
Merge pull request #1786 from SpecLad:cap-images-file-pattern
2013-11-13 17:00:20 +04:00
Roman Donchenko
54ea5bbac7
Merge pull request #1779 from perping:integral_2.4
2013-11-13 15:53:42 +04:00
Roman Donchenko
28e0d3d771
Merge pull request #1784 from SpecLad:ffmpeg-no-png
2013-11-13 15:52:42 +04:00
Alexander Alekhin
fb326a58fc
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
2013-11-13 14:17:57 +04:00
Alexander Alekhin
f1873bbca1
perf tests: allow to skip performance tests
2013-11-13 14:17:56 +04:00
Ilya Lavrenov
6770c04073
refactored some functions from ocl arithm
2013-11-13 13:56:49 +04:00
Ilya Lavrenov
c38e4f9639
added eps to ocl::buildWarpPerspectiveMaps perf test
2013-11-13 13:04:02 +04:00
Roman Donchenko
376993be4c
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
2013-11-13 12:20:09 +04:00
Michael Pratt
73f1940b03
Add missing limits include
...
Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:
modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’
2013-11-12 22:29:41 -05:00
perping
185059959b
fix haar
2013-11-13 10:19:09 +08:00
perping
1e2fb6de30
fix match_template and haar
2013-11-13 10:09:39 +08:00
Ilya Lavrenov
0bf7350615
fixed compilation of ocl::minMaxLoc for Intel device
2013-11-12 19:14:40 +04:00
huangs
f02ce90559
minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left
2013-11-12 22:37:23 +08:00
Roman Donchenko
b8e3d3f791
In the image sequence capture, only search for the ordinal in the file name.
...
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.
If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
2013-11-12 16:26:21 +04:00
Ilya Lavrenov
96121a66c5
kernel warnings on AMD
2013-11-12 15:06:46 +04:00
Roman Donchenko
a81efdbb25
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
2013-11-12 14:26:50 +04:00
perping
d6e0ef2710
fix linux warning.
2013-11-12 18:13:44 +08:00
perping
dee584ee15
fix haar
2013-11-12 17:54:03 +08:00
Roman Donchenko
834705490e
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
2013-11-12 12:53:34 +04:00
Roman Donchenko
ef4eadd5d3
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
2013-11-12 12:40:14 +04:00
Roman Donchenko
46e423d217
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
2013-11-12 12:26:37 +04:00
perping
8af626d295
fix some bug about haar and match_template.
2013-11-12 13:56:47 +08:00
Ilya Lavrenov
eda6360fa3
added RGB5x5 <-> Gray
2013-11-12 00:32:10 +04:00
Philippe FOUBERT
93120775cd
Using four spaces for indentation.
2013-11-11 20:40:18 +01:00
Roman Donchenko
405227d531
Replaced the image used in the Highgui_Video.ffmpeg_image test.
...
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.
When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
2013-11-11 18:30:04 +04:00
Ilya Lavrenov
daedc6f454
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
2013-11-11 18:14:44 +04:00
Roman Donchenko
eff53e95f9
Fixed the "image sequence" capture not failing when a pattern isn't found.
...
at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.
2013-11-11 18:12:49 +04:00
Ilya Lavrenov
3727168b50
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file
2013-11-11 18:07:23 +04:00
Roman Donchenko
ccbd7f8da9
Added a citation which used to be in the gpu module in 2.4.
2013-11-11 18:00:55 +04:00
Roman Donchenko
bfa40e180f
Removed another usage of __func__, following #1763 .
2013-11-11 17:02:50 +04:00
Roman Donchenko
e4dee5b372
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi
2013-11-11 17:00:31 +04:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Ilya Lavrenov
1f421fce01
added RGB5x5 <-> RGB conversion
2013-11-11 14:50:44 +04:00
Philippe FOUBERT
05d9375759
Trailing whitespace removal.
2013-11-11 10:26:28 +01:00
perping
73b34e3f85
fix warning.
2013-11-11 15:06:58 +08:00
perping
50579d2524
Make Integral sum support cv_32f, sqsum support cv_64f.
2013-11-11 14:31:02 +08:00
Ilya Lavrenov
5beb887247
replaced custom PI by OpenCL M_PI constant
2013-11-11 00:55:59 +04:00
Ilya Lavrenov
3cc9502c90
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor
2013-11-10 23:14:36 +04:00
Philippe FOUBERT
8b0fc04d93
Fix the build of OpenCV with XIMEA on Windows 64 bits:
...
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
- the "CMAKE_CL_64" variable is not initialized when using mingw
PR#1039 modified to be able to merge on branch 2.4
2013-11-10 17:46:59 +01:00
Ilya Lavrenov
581a3e444d
added XYZ to RGB conversion to ocl::cvtColor
2013-11-10 14:37:21 +04:00
Ilya Lavrenov
5e02b20482
added RGB -> XYZ conversion to ocl::cvtColor
2013-11-10 13:38:09 +04:00
Ilya Lavrenov
33ae64201c
color.cpp refactoring: created generic interface for toRGB and fromRGB callers
2013-11-10 00:44:37 +04:00
Ilya Lavrenov
a57030a0cd
added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor
2013-11-09 17:03:30 +04:00
Ilya Lavrenov
eba6754b06
fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA
2013-11-09 00:40:45 +04:00
Ilya Lavrenov
8b57893e40
added an accuracy test for ocl::buildWarpPerspectiveMaps
2013-11-08 18:42:13 +04:00
Ilya Lavrenov
4248f82211
added ROI support to ocl::buildWarp*Maps functions
2013-11-08 18:40:53 +04:00
Roman Donchenko
0ac61240c5
Merge pull request #1771 from kiranpradeep:2.4
2013-11-08 17:16:20 +04:00
Kiran Pradeep
5852a913a8
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'
2013-11-08 14:09:34 +05:30
Roman Donchenko
800d53f76b
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
2013-11-08 12:39:14 +04:00
Roman Donchenko
0be2752366
Merge pull request #1755 from KonstantinMatskevich:dump_info
2013-11-08 12:31:04 +04:00
Roman Donchenko
0fb629915f
Merge pull request #1763 from SpecLad:cv-func
2013-11-08 12:29:50 +04:00
Michael Pratt
8aafd569c8
Support PyString_AsString() in Python 3 < 3.3
...
In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().
In older versions of Python 3, there is no public function to provide
the same functionality. However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().
With this patch, cv2 should compile for Python 3.[0-2].
2013-11-07 23:47:33 -05:00
Baichuan Su
9a0d06247a
Fix the whitespace warning.
2013-11-07 15:04:17 -08:00
Ilya Lavrenov
760b718981
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
2013-11-08 01:42:48 +04:00
Baichuan Su
99a00d3dd9
Fix merge conflicts
2013-11-07 09:56:59 -08:00
Baichuan Su
befcbf56fe
A minor fix.
2013-11-07 08:52:40 -08:00
Baichuan Su
f0de1a08b8
Fix ocl::calcHarris not support CV_32FC1 bug.
2013-11-07 08:52:39 -08:00
Roman Donchenko
07db81a4bb
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
2013-11-07 17:29:16 +04:00
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
2013-11-07 17:22:02 +04:00
Konstantin Matskevich
e9edfd1c54
update
2013-11-07 17:21:56 +04:00
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
2013-11-07 12:03:30 +04:00
Bo Hu
c88fa27b1d
Removed trailing whitespace in cap_qtkit.mm.
2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b
Added proper testing of the end of quicktime video files.
...
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
2013-11-06 13:32:11 -08:00
Ilya Lavrenov
fa15769f39
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
2013-11-06 23:14:04 +04:00
Ilya Lavrenov
56d943388d
speeded up ocl::distanceToCenters
2013-11-06 20:02:31 +04:00
Andrey Pavlenko
296f76a135
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
2013-11-06 18:26:39 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Konstantin Matskevich
5304e9f259
extending openCL info dump
2013-11-06 15:20:05 +04:00
Roman Donchenko
370235c07b
Merge pull request #1711 from SpecLad:cap-broken-mat
2013-11-06 14:53:08 +04:00
Alexander Alekhin
03646e7e01
ocl: workaround for subbuffer memory leaks
2013-11-06 14:02:41 +04:00
Roman Donchenko
b5777efee6
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
2013-11-06 13:59:44 +04:00
Ilya Lavrenov
e9b54ab844
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
2013-11-06 13:53:44 +04:00
Andrey Pavlenko
43c9157220
Merge pull request #1750 from alalek:ocl_update_documentation
2013-11-06 13:32:00 +04:00
Andrey Pavlenko
a3fa7a243d
Merge pull request #1740 from ilya-lavrenov:ocl_corners
2013-11-06 13:31:44 +04:00
Andrey Pavlenko
95767676b7
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar
2013-11-06 13:31:11 +04:00
Roman Donchenko
5c44afa427
Merge pull request #1743 from ilya-lavrenov:ocl_repeat
2013-11-06 13:24:22 +04:00
Roman Donchenko
65389e41db
Revert commit 994e07db0 (PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
2013-11-06 12:32:03 +04:00
peng xiao
53d1873776
Revert back test image.
2013-11-06 11:19:26 +08:00
Alexander Alekhin
3952a0df44
ocl: update comments in ocl.hpp
2013-11-05 23:53:52 +04:00
Alexander Alekhin
5a333bfff4
ocl: update documentation
2013-11-05 23:53:51 +04:00
Andrey Pavlenko
be37d99567
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround
2013-11-05 23:49:37 +04:00
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
2013-11-05 23:49:12 +04:00
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
2013-11-05 19:43:07 +04:00
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
2013-11-05 18:23:34 +04:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Alexander Alekhin
7704dbf866
ocl: svm: restore non BLAS version
2013-11-05 15:15:26 +04:00
Alexander Alekhin
9a63508f50
Revert "disable SVM when AMD BLAS is not available"
...
This reverts commit d63a38e9bf
2013-11-05 15:13:30 +04:00
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
2013-11-05 12:02:22 +01:00
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
2013-11-05 11:18:20 +01:00
Ilya Lavrenov
e7e7e04dce
came back to relative error
2013-11-05 14:17:31 +04:00
Ilya Lavrenov
2df53d97c5
added ocl::repeat
2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
2013-11-05 10:40:27 +08:00
Ilya Lavrenov
c89dfd333c
fixed warnings in OpenCL kernels
2013-11-04 15:30:00 +04:00
Ilya Lavrenov
a8426e1c12
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
2013-11-04 15:16:00 +04:00
peng xiao
8c1eb5bf0e
Overload detectMultiScale API for ocl::haar.
2013-11-04 14:59:28 +08:00
Vincent Rabaud
e1b2f593d6
fix crash when path has spaces
...
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
2013-11-01 19:30:58 +01:00
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
2013-11-01 18:37:35 +04:00
Andrey Pavlenko
2767be9a5e
Merge pull request #1731 from perping:2.4_haar
2013-11-01 16:46:18 +04:00
Roman Donchenko
9d263db8aa
Merge pull request #1734 from asmorkalov:android_manager_version_inc
2013-11-01 16:39:43 +04:00
Alexander Alekhin
99ae9d9cc1
ocl: corner*: fix memory access in kernels; change error check to relative
2013-11-01 16:38:04 +04:00
Andrey Pavlenko
6c21b85fce
Merge pull request #1733 from ilya-lavrenov:cv_remap
2013-11-01 15:53:21 +04:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Ilya Lavrenov
5546f4d77f
consistency SSE2 and plain versions of convertMaps and remap
2013-11-01 14:50:41 +04:00
Alexander Alekhin
3b293d6855
ocl: fix testdata for blendLinear
2013-11-01 14:44:13 +04:00
perping
af77111cd6
remove whitespace.
2013-11-01 17:53:35 +08:00
Roman Donchenko
e7e6d9d63c
Merge pull request #1729 from ilya-lavrenov:ocl_moments
2013-11-01 11:56:49 +04:00
Roman Donchenko
a9a39a3aa2
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn
2013-11-01 11:52:09 +04:00
Roman Donchenko
b1bed14ebc
Merge pull request #1728 from apavlenko:refactor_vcap_jni
2013-11-01 11:39:44 +04:00
perping
af33c118b4
fixed a bug of haar.
2013-11-01 14:07:10 +08:00
Ilya Lavrenov
a8b7573db0
fixed ocl::Moments test
2013-11-01 00:09:11 +04:00
Ilya Lavrenov
1f9ab2e0ca
fixed warnings in ocl kernels
2013-10-31 23:48:02 +04:00
Andrey Pavlenko
dfa5a27bee
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
2013-10-31 15:32:34 +04:00
Andrey Pavlenko
fbabc323ed
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
2013-10-31 14:03:36 +04:00
Andrey Pavlenko
bf58049d11
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
2013-10-31 13:55:04 +04:00
Andrey Pavlenko
e80f5bed2d
Merge pull request #1710 from melody-rain:2.4_moments_ocl
2013-10-31 13:54:46 +04:00
Ilya Lavrenov
c8aed4996e
fixed ocl::warpPerspective
2013-10-31 13:53:11 +04:00
Andrey Pavlenko
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
2013-10-31 12:42:12 +04:00
Jin Ma
3dbcd05407
fixed a typo.
2013-10-31 16:25:50 +08:00
Jin Ma
145ece8f9c
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.
2013-10-31 16:21:08 +08:00
Jin Ma
599cf6bea0
Resolved a bug and used ocl::multiply.
2013-10-31 16:09:33 +08:00
Ilya Lavrenov
1d5f5d2364
vectorized ocl::threshold for single channel images
2013-10-31 12:00:53 +04:00
Jin Ma
1bb47f4bdf
modified the copyright info.
2013-10-31 08:47:59 +08:00
Andrey Pavlenko
ef9f690598
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
2013-10-31 00:22:37 +04:00
Andrey Pavlenko
5795bb326d
Merge pull request #1723 from ilya-lavrenov:ocl_norm
2013-10-31 00:21:29 +04:00
Andrey Pavlenko
ead37e4a29
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
2013-10-31 00:21:10 +04:00
Andrey Pavlenko
68c916aa26
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
2013-10-31 00:20:51 +04:00
Andrey Pavlenko
089cf423a0
Merge pull request #1717 from alalek:ocl_adjust_worksize
2013-10-31 00:20:34 +04:00
Andrey Pavlenko
9751b3204d
Merge pull request #1715 from asmorkalov:android_java_bincompat_fix
2013-10-31 00:04:03 +04:00
Roman Donchenko
2f4d68c746
Merge pull request #1718 from SpecLad:have-opencv-ocl
2013-10-30 17:33:03 +04:00
Ilya Lavrenov
16df5b007d
disabled upload and download perf tests
2013-10-30 17:08:57 +04:00
Ilya Lavrenov
c674d3cf49
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
2013-10-30 16:48:12 +04:00
Alexander Alekhin
0104f59feb
ocl: filter2D: fix processing of kernel with double datatype
2013-10-30 16:27:46 +04:00
Roman Donchenko
c70fbb95a3
Merge pull request #1712 from alalek:ocl_split
2013-10-30 16:18:50 +04:00
Ilya Lavrenov
8dfde47f89
changed eps in ocl::GaussianBlur test
2013-10-30 16:04:48 +04:00
Alexander Alekhin
7b0f018a74
ocl: adjust worksize for filter2D and boxFilter
2013-10-30 15:30:47 +04:00
Roman Donchenko
4bc105c40b
Merge pull request #1652 from nghiaho12:kalman
2013-10-30 15:11:26 +04:00
Alexander Alekhin
50d2c1066b
ocl: split: update tests and implementation
2013-10-30 14:08:37 +04:00
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
2013-10-30 14:07:34 +04:00
Alexander Smorkalov
994e07db07
Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
...
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
2013-10-30 12:51:49 +04:00
Roman Donchenko
d11921f1a4
Merge pull request #1675 from krodyush:opencl-optimization
2013-10-30 12:28:31 +04:00
Jin Ma
7469c2eb9d
fixed a bug when double is not supported.
2013-10-30 14:37:13 +08:00
Ilya Lavrenov
bf6b5ee925
fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function
2013-10-29 19:59:21 +04:00
Roman Donchenko
d6a7a6d503
VideoCapture: copy the captured frame, to avoid dangling Mats
...
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.
Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
2013-10-29 18:47:08 +04:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Roman Donchenko
f68b73f831
Merge pull request #1521 from nailbiter:optimCG
2013-10-29 16:14:32 +04:00
Roman Donchenko
334292083e
Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix
2013-10-29 16:03:51 +04:00
Jin Ma
b6b190df5c
Rewrote moments of opencl version.
2013-10-29 18:05:29 +08:00
Roman Donchenko
75087580de
Merge pull request #1704 from SpecLad:merge-2.4
2013-10-29 13:13:05 +04:00
Andrey Pavlenko
616db74e49
Merge pull request #1663 from vpisarev:ocl_experiments3
2013-10-29 11:14:16 +04:00
Andrey Pavlenko
c5e8a9a29b
Merge pull request #1702 from alalek:ocl_memory_corruption_check
2013-10-29 11:07:04 +04:00
Andrey Pavlenko
c6a01f2641
Merge pull request #1688 from alalek:ocl_fix_filters
2013-10-29 11:05:10 +04:00
Andrey Pavlenko
ea64589164
Merge pull request #1687 from bitwangyaoyao:2.4_fix
2013-10-29 11:03:34 +04:00
Andrey Pavlenko
f4b8babbc8
Merge pull request #1677 from pengx17:patch-1
2013-10-29 11:00:26 +04:00
Andrey Pavlenko
42c4f91ef4
Merge pull request #1495 from StevenPuttemans:bugfix_3282
2013-10-29 10:51:01 +04:00
Andrey Pavlenko
9bfa346c38
Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear
2013-10-29 10:49:46 +04:00
Andrey Pavlenko
e52459a324
Merge pull request #1708 from ilya-lavrenov:ocl_threshold
2013-10-29 10:43:44 +04:00
Andrey Pavlenko
106d5eda5f
Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf
2013-10-29 10:43:27 +04:00
Andrey Pavlenko
acadfcff2d
Merge pull request #1707 from ilya-lavrenov:ocl_morph
2013-10-29 10:38:23 +04:00
Andrey Pavlenko
2b05dc7d1e
Merge pull request #1699 from ilya-lavrenov:ocl_minMax
2013-10-29 10:35:58 +04:00
Andrey Pavlenko
5fa6d70ab0
Merge pull request #1695 from ilya-lavrenov:ocl_showDiff
2013-10-29 10:35:42 +04:00
Ilya Lavrenov
c49c3e0a91
fixed and generalized ocl::blendLinear
2013-10-28 23:56:40 +04:00
Ilya Lavrenov
58be2546ca
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 20:09:49 +04:00
Alexander Alekhin
b10e1e5c7e
ocl: filters: update documentation
2013-10-28 20:09:49 +04:00
Alexander Alekhin
98f73705df
ocl: fix morph filters
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0f95f0d8b3
ocl: rewrite filter2D
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0bf9ece998
ocl: rewrite boxFilter
2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1
ocl: update filter tests
2013-10-28 20:09:49 +04:00
Roman Donchenko
529f086b62
Merge pull request #1691 from SpecLad:ffmpeg-test
2013-10-28 19:35:08 +04:00
Alexander Alekhin
447c052e59
ocl: memory corruption check
2013-10-28 19:33:00 +04:00
Andrey Pavlenko
95bd32b516
Merge pull request #1705 from ilya-lavrenov:ocl_flip
2013-10-28 19:02:24 +04:00
Andrey Pavlenko
bb15c00665
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
2013-10-28 19:01:51 +04:00
Andrey Pavlenko
d3c0b36cd0
Merge pull request #1701 from alalek:ocl_fix_canny
2013-10-28 19:01:13 +04:00
Andrey Pavlenko
1cc58f9770
Merge pull request #1698 from ilya-lavrenov:ocl_warp
2013-10-28 18:59:08 +04:00
Ilya Lavrenov
7afbae57ba
fixed ocl::minMax for FP-types
2013-10-28 18:49:16 +04:00
Ilya Lavrenov
eb2f8a2948
ocl tests: show diff when cv::countNonZero(diff) > 0
2013-10-28 18:20:02 +04:00
Ilya Lavrenov
1f7f9c9682
rewrote and generalized ocl::threshold
2013-10-28 18:11:24 +04:00
Ilya Lavrenov
e70dfe5a50
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 16:46:41 +04:00
Ilya Lavrenov
cf5df1a7e7
fixed ocl::flip
2013-10-28 13:57:29 +04:00
Roman Donchenko
d3bcf609f1
Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters
2013-10-28 13:46:32 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
yao
0fd872bfa9
fix bug #1480
2013-10-28 17:36:43 +08:00
yao
632452cdd8
fix the mismatch running on cpu devices
2013-10-28 16:32:46 +08:00
Roman Donchenko
88f5ef9acc
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
2013-10-28 12:18:42 +04:00
Peng Xiao
ab2bd58f5c
Fixed a missing barrier.
2013-10-28 14:17:59 +08:00
konstantin
973137c78e
fix bugs on host and device sides for imgprog_sobel3.cl
2013-10-28 00:14:07 +04:00
Alexander Alekhin
eb4f50ca59
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
2013-10-28 00:10:47 +04:00
Ilya Lavrenov
900c303636
added performance tests for ocl::bitwise_or and ocl::bitwose_xor
2013-10-27 20:08:50 +04:00
Alexander Alekhin
9e527fc9f4
ocl: Canny: replace unsafe buffer to oclMat
2013-10-27 18:55:42 +04:00
Ilya Lavrenov
839245e420
fixed tests for ocl::warpAffine and ocl::warpPerspective
2013-10-27 14:49:37 +04:00
konstantin
ddd2b106fb
rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency
2013-10-25 21:44:01 +04:00
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 19:47:38 +04:00
Andrey Pavlenko
fc64a4071c
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
2013-10-25 19:41:56 +04:00
Andrey Pavlenko
4e57f92e6e
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
2013-10-25 19:39:21 +04:00
Andrey Pavlenko
d60924f4f2
Merge pull request #1694 from apavlenko:fix_typo
2013-10-25 19:35:19 +04:00
Andrey Pavlenko
2e5db6e56c
fixing typo
2013-10-25 18:53:24 +04:00
Andrey Pavlenko
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
Ilya Lavrenov
e1596d69cc
fixed extrapolation in ocl::adaptiveBilateralFilter
2013-10-25 17:29:21 +04:00
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
2013-10-25 17:08:44 +04:00
Vadim Pisarevsky
485d36d3c0
changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.
2013-10-25 16:46:03 +04:00
Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
2013-10-25 16:08:14 +04:00
peng xiao
68a8a11161
Rewrite distanceToCenters.
...
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
of double.
NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added
added ROI support in accuracy test of distanceToCenters
2013-10-25 15:02:00 +04:00
Roman Donchenko
1188894133
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
2013-10-25 14:37:54 +04:00
Roman Donchenko
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
2013-10-25 14:34:02 +04:00
Roman Donchenko
5a5d569d72
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
(cherry picked from commit 424a7b0ab0
2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
(cherry picked from commit 3f3ae33327
2013-10-25 14:29:37 +04:00
Ilya Lavrenov
9ea6001d08
enabled ocl::bilateralFilter ROI testing
2013-10-25 13:32:35 +04:00
Andrey Pavlenko
f177e65871
Merge pull request #1683 from alalek:ocl_restore_showdiff
2013-10-25 13:19:02 +04:00
yao
dd0fa63ca8
fix the bug of ocl::bruteForceMatcher
2013-10-25 16:01:41 +08:00
Vadim Pisarevsky
6416c33020
fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( )
2013-10-25 11:19:40 +04:00
Vadim Pisarevsky
ace0d4bad0
hopefully, the last test failures are fixed now
2013-10-24 23:31:00 +04:00
Vadim Pisarevsky
5920bd4f2e
fixed whitespace errors
2013-10-24 23:18:05 +04:00
Vadim Pisarevsky
caa33b2242
added first very simple test for UMat<=>Mat conversion
2013-10-24 22:33:41 +04:00
Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
2013-10-24 22:19:17 +04:00
Leszek Swirski
6e4fb8f275
Replace $(Configuration) with $<CONFIGURATION>
2013-10-24 18:20:16 +01:00
Roman Donchenko
496859a944
Merge pull request #1643 from alalek:cmake_fix_java_link_rules
2013-10-24 19:38:43 +04:00
Alexander Alekhin
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
2013-10-24 19:04:59 +04:00
Roman Donchenko
f51e490bad
Fixed a Wmissing-declarations warning when compiling with MinGW.
2013-10-24 18:35:08 +04:00
Vadim Pisarevsky
b1aa4a4913
yet another attempt to fix test failures
2013-10-24 18:00:15 +04:00
Vadim Pisarevsky
e14171fd33
fixed crash in Python bindings
2013-10-24 17:37:33 +04:00
Roman Donchenko
7e1ded0ebd
Merge pull request #1664 from SpecLad:merge-2.4
2013-10-24 17:27:30 +04:00
Vadim Pisarevsky
a9065b7d0c
trying to fix failures in tests
2013-10-24 17:23:48 +04:00
Vadim Pisarevsky
303df78cca
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
2013-10-24 16:08:15 +04:00
Roman Donchenko
dfe07df87b
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
2013-10-24 14:09:08 +04:00
Ilya Lavrenov
dab3000778
fixed bug in ocl::equalizeHist
2013-10-24 13:59:25 +04:00
Andrey Pavlenko
2279c209c8
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
2013-10-24 11:23:55 +04:00
Andrey Pavlenko
931a2ae14f
Merge pull request #1673 from ilya-lavrenov:ocl_norm
2013-10-24 11:23:36 +04:00
Andrey Pavlenko
e7f39eb46e
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
2013-10-24 11:23:19 +04:00
Andrey Pavlenko
4cf598a862
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
2013-10-24 11:23:01 +04:00
Peng Xiao
4b712eeded
Update imgproc_canny.cl
...
Reordering condition checking.
2013-10-24 12:07:54 +08:00
Alexander Alekhin
133d889e33
ocl: show diff
2013-10-24 03:44:56 +04:00
konstantin
9f0995fbe0
try to made compatible with mac
2013-10-23 23:56:22 +04:00
Ilya Lavrenov
5864895ec6
fixed ocl::copyMakeBorder
2013-10-23 23:52:05 +04:00
konstantin
ebb2c3e01f
try to fix build error
2013-10-23 23:18:21 +04:00
Ilya Lavrenov
7c1443cbdd
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
2013-10-23 22:13:18 +04:00
konstantin
2f62940a0e
Added few opencl optimizations (as Intel platform codepath):
...
1. HaarDetetctor: repack nodes to reduce memory footprint
2. cornerMinEigVal: 4 ocl kernels are fused into 1 for sobel calculation
2013-10-23 20:38:11 +04:00
Ilya Lavrenov
29499ed51a
moved to relative errors in ocl::norm tests
2013-10-23 19:53:04 +04:00
Ilya Lavrenov
87fc3441f2
workaround for cv::multiply bug
2013-10-23 18:42:55 +04:00
Roman Donchenko
424a7b0ab0
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
2013-10-23 17:42:00 +04:00
Roman Donchenko
3f3ae33327
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
This should actually remove the need for the workaround from
the previous commit.
2013-10-23 14:56:37 +04:00
Roman Donchenko
eb86d37b26
Removed some dubious FFmpeg hack that no longer works.
2013-10-23 14:56:37 +04:00
Vadim Pisarevsky
5a34272150
fixed build on Windows
2013-10-23 00:17:18 +04:00
Vadim Pisarevsky
de521fc9fa
fixed some more compile bugs (including Python bindings)
2013-10-22 23:34:16 +04:00
Roman Donchenko
bb461fab34
Merge pull request #1649 from asandwhich:2.4
2013-10-22 19:16:09 +04:00
Vadim Pisarevsky
d3076c5014
hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors
2013-10-22 17:41:28 +04:00
Roman Donchenko
779acfa715
Suppressed -Wundef in bioinspired, because of OpenCL headers.
2013-10-22 15:16:22 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
2013-10-22 14:05:15 +04:00
Vadim Pisarevsky
278fb617d2
the first draft of transparent API and new UMat class.
2013-10-22 14:04:49 +04:00
Roman Donchenko
6640846e95
Merge pull request #1653 from jlblancoc:master
2013-10-22 13:53:12 +04:00
Roman Donchenko
1e556e08dc
Merge pull request #1661 from look4pritam:my-branch
2013-10-22 13:45:25 +04:00
look4pritam
8c121d372a
Small OpenCV-CUDA bugs are fixed.
2013-10-22 12:08:43 +05:30
Jose-Luis Blanco-Claraco
80e667b647
Minimized the number of arguments required to workaround the MSVC2013 compiler bug.
2013-10-21 21:43:26 +02:00
Jose-Luis Blanco-Claraco
77023e2366
Added comment to features2d_init.cpp explaining the reason for the extra parameters.
2013-10-21 21:17:15 +02:00
Alexander Alekhin
e7fd053478
ocl: fix FFT initialization
2013-10-21 19:48:36 +04:00
Alexander Alekhin
9acca12d2d
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
2013-10-21 19:16:33 +04:00
Jose-Luis Blanco-Claraco
c33ca77838
Undo changing whitespace.
2013-10-21 15:59:26 +02:00
Jose-Luis Blanco-Claraco
bec35eeddb
Avoid duplicated variable declarations.
2013-10-21 15:57:11 +02:00
Roman Donchenko
29f37fc130
Merge pull request #1575 from jet47:gpu-buffer-pool
2013-10-21 16:35:14 +04:00
Roman Donchenko
21233656bd
Merge pull request #1540 from jet47:gpuarithm-cudev
2013-10-21 16:34:45 +04:00
Roman Donchenko
e290436a4c
Merge pull request #1492 from jet47:gpucodec-cudev
2013-10-21 16:30:15 +04:00
Roman Donchenko
f25b77ff1e
Merge pull request #1534 from jet47:fix-cuda-5.0-build
2013-10-21 16:29:37 +04:00
Andrey Pavlenko
aec7d9c1db
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
2013-10-21 16:06:36 +04:00
Andrey Pavlenko
0ad04d66e3
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
2013-10-21 16:00:13 +04:00
Andrey Pavlenko
e82fd12a67
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
2013-10-21 15:59:19 +04:00
Andrey Pavlenko
bd1a1cc031
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
2013-10-21 15:59:00 +04:00
Ilya Lavrenov
9d923b50ac
fixed ocl::Laplacian for case when scale != 1
2013-10-21 14:27:34 +04:00
Ilya Lavrenov
6085c416a7
missed initialization of kernel size
2013-10-21 14:27:14 +04:00
Roman Donchenko
599d51ec14
Merge pull request #1651 from ilya-lavrenov:misprint
2013-10-21 14:00:23 +04:00
peng xiao
7285341083
1. Let btvRegWeights to be constant per process call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
2013-10-21 10:21:37 +08:00
Jose-Luis Blanco-Claraco
52a904e17b
Fixed MSVC 2013 build errors and workaround for an internal compiler crash.
2013-10-20 17:28:45 +02:00
Nghia Ho
2238e711b5
Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step.
2013-10-20 13:00:11 +11:00
Ilya Lavrenov
4f68f35a78
added reflect, reflect101, replicate, wrap border types to ocl::remap
2013-10-19 23:38:50 +04:00
Ilya Lavrenov
bebc1c9330
misprint
2013-10-19 22:59:47 +04:00
Kevin
8f995fac88
Change intrinsic camera matrix initialization
...
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
2013-10-19 02:10:20 -05:00
Ilya Lavrenov
e9cef2990e
made more demonstrative message about test fails
2013-10-19 01:17:46 +04:00
Andrey Pavlenko
d50f0d2ed2
Merge pull request #1587 from alalek:opencl_khronos_headers
2013-10-18 18:41:13 +04:00
Roman Donchenko
83b36dcbcf
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
2013-10-18 18:39:08 +04:00
Roman Donchenko
d700cc60be
Merge pull request #1641 from jet47:imshow-opengl-fix
2013-10-18 18:23:00 +04:00
Ilya Lavrenov
022b5d6c74
refactored ocl matrix operations accuracy tests
2013-10-18 17:36:38 +04:00
Ilya Lavrenov
b3e1a4598c
enabled double in copyMakeBorder kernel
2013-10-18 16:46:51 +04:00
Ilya Lavrenov
2681cef5d7
rewrote ocl::remap
2013-10-18 16:41:09 +04:00
Ilya Lavrenov
3fe74ad124
fixed ocl::copyMakeBorder
2013-10-18 16:39:47 +04:00
Ilya Lavrenov
36342eb425
added ROI support to ocl::convolve
2013-10-18 16:36:11 +04:00
Ilya Lavrenov
110a92c126
added ROI support to ocl::columnSum
2013-10-18 16:33:48 +04:00
Ilya Lavrenov
60f9ba0c64
added ROI support to ocl::CLAHE
2013-10-18 16:31:52 +04:00
Ilya Lavrenov
4a81be7d0b
refactored all the tests in ocl/test/test_imgproc.cpp
2013-10-18 16:29:10 +04:00
Alexander Alekhin
fd4e705b14
ocl: update autogenerated code
2013-10-18 15:47:11 +04:00
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
2013-10-18 15:47:11 +04:00
Andrey Pavlenko
4cbf0cb31e
Merge pull request #1640 from alalek:ocl_fix_exp_test
2013-10-18 13:45:12 +04:00
Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00
Vladislav Vinogradov
fa70f95272
fix imshow under Windows with OpenGL support:
...
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
2013-10-17 20:58:33 +04:00
Alexander Alekhin
4bfeeb0738
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
2013-10-17 19:00:36 +04:00
Roman Donchenko
578e984739
OpenCV 2.4.6.2 (Tegra detection and native camera update)
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
=WeoS
-----END PGP SIGNATURE-----
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
2013-10-17 17:19:04 +04:00
Roman Donchenko
fb7b4d2d60
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
2013-10-17 17:00:45 +04:00
Roman Donchenko
88cc054f10
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
2013-10-17 15:42:38 +04:00
Ilya Lavrenov
07aee1a25c
made LOOP_TIMES as a command line option with default value=1
2013-10-17 12:40:16 +04:00
Roman Donchenko
d411041c53
Merge pull request #1637 from SpecLad:run-py-java-fix
2013-10-17 12:25:31 +04:00
Ilya Lavrenov
da3b7c79b8
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
2013-10-17 12:23:56 +04:00
Andrey Pavlenko
7605426dc3
Merge pull request #1613 from alalek:ocl_cvtcolor
2013-10-17 12:07:20 +04:00
Alexander Alekhin
ce0647c9b6
ocl: rewrite CvtColor tests, added roi support
2013-10-16 22:46:21 +04:00
Roman Donchenko
5bb6949bd6
Fix running Java tests with run.py on everything other than Windows.
...
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.
The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
2013-10-16 19:22:01 +04:00
Alexander Alekhin
2a9d24323c
cmake: add opencv_java into list of exported targets (fix for android)
2013-10-16 17:23:44 +04:00
Tony
5368f12b33
Rework gtk3 window resize and draw cleanup
...
The gtk3 resize functions fail to shrink the window after it has been
resized. This edit changes this and allows the window to be shrunk
back to its original size.
This edit also cleans up the draw/expose functions.
2013-10-15 21:49:20 +01:00
lluis
b50185e160
Fix a bug in the er tree clean-up process (see discussion in https://github.com/Itseez/opencv/pull/1520 ). It's not necessary to walk the er tree in order to clean up the memory since it's possible to cleanup the regions in the stack just by iterating over the er_stack vector instead of walking the tree structure. This turns out to be safer because the tree structure of those regions may have been modified previously in er_save function.
2013-10-15 19:44:08 +02:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Roman Donchenko
b420c0b160
Merge pull request #1630 from SpecLad:java-deprecated-assert
2013-10-15 18:36:15 +04:00
Roman Donchenko
a61d1e6494
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
...
We don't use it, anyway.
2013-10-15 17:10:12 +04:00
Roman Donchenko
7ff91665cf
In Java bindings, wrap version constants into functions to prevent inlining.
...
Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.
This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
2013-10-15 15:44:26 +04:00
Roman Donchenko
7fb18a2311
Merge pull request #1620 from SpecLad:record-build-type
2013-10-15 14:59:53 +04:00
Ilya Lavrenov
741e0242b3
replaced to_string by cv::format
2013-10-15 13:26:01 +04:00
Roman Donchenko
cf71ff0845
Record OpenCV build type among the test properties.
...
Because apparently I love running performance tests for debug builds.
2013-10-15 12:09:31 +04:00
Roman Donchenko
1eb322fa5d
Merge pull request #1622 from a0byte:2.4
2013-10-15 11:51:40 +04:00
Andrey Pavlenko
97da1419e1
Merge pull request #1573 from alalek:perf_simple_strategy
2013-10-14 19:28:49 +04:00
Andrey Pavlenko
7f15ec9d54
Merge pull request #1617 from ilya-lavrenov:ocl_info
2013-10-14 19:27:01 +04:00
Han Qiang
88f68a3fe0
Fixed typo in document.
...
Signed-off-by: Han Qiang <a0byte@gmail.com>
2013-10-14 23:23:59 +08:00
Ilya Lavrenov
ca26028415
demonstrative device info output
2013-10-14 17:18:25 +04:00
Andrey Pavlenko
9e12306d95
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
2013-10-14 16:43:18 +04:00
Andrey Pavlenko
e90a9e810d
Merge pull request #1612 from alalek:ocl_fix_string_info
2013-10-14 16:41:43 +04:00
Andrey Pavlenko
ae56eaa563
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
2013-10-14 16:41:25 +04:00
Roman Donchenko
3f8db9d708
Merge pull request #1450 from adrians:neon-pull3
2013-10-14 15:08:37 +04:00
Ilya Lavrenov
28f566b843
misprint in disabling ocl::svm
2013-10-13 23:54:09 +04:00
Ilya Lavrenov
b18101b15a
some optimization of binary ocl::bitwise operations
2013-10-13 23:25:59 +04:00
Ilya Lavrenov
da607c6711
ocl::cvtColor works with ROI properly
2013-10-13 23:09:14 +04:00
Alexander Alekhin
376cd8f84f
perf: added simple collection strategy
2013-10-12 18:05:57 +04:00
Alexander Alekhin
f617c0d4a2
ocl: fix for get string info from OpenCL
2013-10-12 16:56:21 +04:00
Andrey Pavlenko
c5afaa4e8d
Merge pull request #1610 from alalek:ocl_fix_perf_kalman
2013-10-12 16:31:02 +04:00
Andrey Pavlenko
19dca324ae
Merge pull request #1608 from alalek:fix_warn_upd_haar
2013-10-12 16:24:04 +04:00
Andrey Pavlenko
f9fe1b9b09
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
2013-10-12 16:12:05 +04:00
Andrey Pavlenko
a55cc60136
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
2013-10-12 16:10:04 +04:00
Andrey Pavlenko
9f5cda799f
Merge pull request #1602 from alalek:ocl_test_dump_info
2013-10-12 16:08:24 +04:00
Andrey Pavlenko
4e31a3df24
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
2013-10-12 16:04:05 +04:00
Kyrylo Shegeda
d37d46d279
Fix a typo in kernel size
2013-10-11 23:31:31 -04:00
Alexander Alekhin
4413bee693
ocl: reverted type of perf test params for Kalman filter
2013-10-12 02:36:53 +04:00
Ilya Lavrenov
dfbea3518a
refactored ocl/src/imgproc.cpp
2013-10-11 23:39:41 +04:00
Ilya Lavrenov
5a309e8f6e
fft cleanup ignoring
2013-10-11 20:25:03 +04:00
ilya-lavrenov
d63a38e9bf
disable SVM when AMD BLAS is not available
2013-10-11 19:25:34 +04:00
Alexander Alekhin
723af15228
ocl: fix warnings from GCC 4.8, update Haar
2013-10-11 18:42:17 +04:00
Alexander Alekhin
1980aad8d7
ocl: dump device info in tests
2013-10-11 18:24:59 +04:00
Alexander Alekhin
3b0823db7e
ocl: fix CV_EXPORTS usage (misplaced in functions declarations)
2013-10-11 18:07:38 +04:00
Alexander Alekhin
ce1177151e
ocl: fix cleanup in static builds
2013-10-11 18:07:38 +04:00
Alexander Alekhin
57120c1a60
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
2013-10-11 17:16:03 +04:00
ilya-lavrenov
ca32583fdd
fixed ocl optical flow: sparse and tvl1
2013-10-11 13:55:49 +04:00
Andrey Pavlenko
171e0e62ec
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
2013-10-11 12:40:12 +04:00
Andrey Pavlenko
b7f1edccfb
Merge pull request #1595 from alalek:cl_code_cleanup
2013-10-11 12:37:42 +04:00
Alexander Alekhin
238550cdad
ocl: code cleanup, fix .clb files
2013-10-11 01:19:46 +04:00
Andrey Pavlenko
dfbd5021fd
Merge pull request #1598 from alalek:ocl_fix_build_mac
2013-10-11 00:40:06 +04:00
Ilya Lavrenov
1be77dd2f3
enabled accuracy tests for the functions that use inside AMD Blas/Fft
2013-10-11 00:37:52 +04:00
Alexander Alekhin
0760fdcbdb
ocl: fix build on Mac
2013-10-10 23:11:48 +04:00
Ilya Lavrenov
1f51e6c0de
fixed kernel compilation warnings on MacOSX
2013-10-10 22:56:39 +04:00
Adrian Stratulat
3561bc1bbc
rename vBinOp64f to vBinOp64, minor fixups
2013-10-10 21:28:05 +03:00
Ilya Lavrenov
39c1e5ff73
added perf tests for min, max, abs
2013-10-10 21:54:38 +04:00
Andrey Pavlenko
ad1ba56fcf
Merge pull request #1597 from alalek:ocl_fix_cleanup
2013-10-10 19:02:29 +04:00
Andrey Pavlenko
c820777967
Merge pull request #1596 from alalek:test_fix_run_py
2013-10-10 19:02:10 +04:00
Andrey Pavlenko
3b1c53fa8d
Merge pull request #1551 from alalek:cmake_install_win
2013-10-10 18:20:35 +04:00
Alexander Alekhin
3eba2011b9
test: run.py: return valid errorCode in case of the single test run
2013-10-10 17:17:10 +04:00
Alexander Alekhin
6b9f74ae84
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
2013-10-10 16:58:45 +04:00
Adrian Stratulat
cb445d697c
Refactor vectorized arithmetical operations
2013-10-10 15:52:48 +03:00
Andrey Pavlenko
d5723480e1
Merge pull request #1592 from alalek:ocl_program_cache_update
2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6
catching OpenCL double not supported exceptions
2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d
ocl: fix compilation warnings, update openCLExecuteKernelInterop
2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d
ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
2013-10-09 23:53:25 +04:00
Tony
d4df373999
Code cleanup
...
Remove redundent #if defs from code
2013-10-09 20:50:35 +01:00
Alexander Alekhin
bc089bb18c
cmake: update java module install rules
2013-10-09 17:49:11 +04:00
Alexander Alekhin
4adede4246
cmake: python module updates
2013-10-09 17:49:11 +04:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Ilya Lavrenov
d57a7008f1
fixed cmd parser when arg is like -+
2013-10-09 17:42:36 +04:00
Ilya Lavrenov
fccd37de7e
changes eps for NORM_L1
2013-10-09 14:18:07 +04:00
Ilya Lavrenov
488e6aafaf
fixed the PR 1582
2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c
Merge pull request #1579 from ilya-lavrenov:ocl_norm
2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
2013-10-09 13:49:34 +04:00
Roman Donchenko
3d4ec7ad98
Merge pull request #1583 from SpecLad:name-enum-2
2013-10-09 13:45:40 +04:00
Roman Donchenko
dfb698dc64
Merge pull request #1581 from SpecLad:merge-2.4
2013-10-09 12:33:50 +04:00
Alexander Alekhin
076eeffd4d
ocl: fix CL_RUNTIME_EXPORT for master branch
2013-10-08 19:13:58 +04:00
Ilya Lavrenov
245ff93544
ocl setto fix for windows
2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4
ocl setto fix for windows
2013-10-08 18:52:32 +04:00
Sebastian Krmer
3696174b14
fix documentation warning
2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f
fixed ocl::norm (previously the function used double as a work type)
2013-10-08 18:43:49 +04:00
Roman Donchenko
cc7a13ea57
Named GraphCutSeamFinderBase to allow its usage in makePtr.
...
Sequel to bcb6f038
2013-10-08 18:13:56 +04:00
Roman Donchenko
f07769e9d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-08 17:57:23 +04:00
Sebastian Krämer
4ffd3fb905
add ocl::abs
2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82
documentation update for ocl::min and ocl::max
2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae
add ocl::min and ocl::max (includes accuracy tests update)
2013-10-08 15:23:13 +02:00
Vladislav Vinogradov
342e007dc6
now Allocator accepts GpuMat* instead of 3 pointers
2013-10-08 17:21:25 +04:00
Vladislav Vinogradov
3b412b51ac
moved BufferPool management functions to public
2013-10-08 17:21:22 +04:00
Vladislav Vinogradov
5ea8085220
added BufferPool class
2013-10-08 17:20:29 +04:00
Vladislav Vinogradov
988ab79acb
added BufferAllocator
2013-10-08 17:20:20 +04:00
Roman Donchenko
ae851af648
Merge pull request #1574 from alalek:svm_workaround
2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1
Merge pull request #1576 from alalek:ocl_fix_cl_double
2013-10-08 14:20:11 +04:00
Roman Donchenko
685eceb68a
Merge pull request #1567 from ilya-lavrenov:warn_fix
2013-10-08 13:50:49 +04:00
Roman Donchenko
895308a811
Merge pull request #1538 from StevenPuttemans:bugfix_3283
2013-10-08 13:00:39 +04:00
Roman Donchenko
ec409a436d
Merge pull request #1545 from alalek:ocl_test_fix_rng
2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40
enabled OpenCL 1.2 branch in oclMat::setTo
2013-10-08 12:49:29 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Roman Donchenko
95b3a344d9
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix
2013-10-08 12:32:57 +04:00
Alexander Alekhin
1d6327ba2a
ocl: fix Context::CL_* usage
2013-10-08 12:23:46 +04:00
Alexander Alekhin
f63b0dfaf4
svm: disable failed tests
2013-10-07 18:17:10 +04:00
Roman Donchenko
b08233a3ca
Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles
2013-10-07 17:47:41 +04:00
Roman Donchenko
920e15b41d
Merge pull request #1572 from emchristiansen:includeLimits
2013-10-07 16:59:24 +04:00
Roman Donchenko
f91f8663b6
Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk
2013-10-07 15:53:20 +04:00
Roman Donchenko
801054d611
Merge pull request #1566 from SpecLad:Wshadow-openni
2013-10-07 15:48:40 +04:00
Vladislav Vinogradov
e5188c7e94
added GpuMat::Allocator interface
2013-10-07 09:42:43 +04:00
Greg Hale
88b1847d09
add include limits, for compilers that dont add it implicitly
2013-10-06 01:21:43 -04:00
Eric Martin Christiansen
c8a3a85e26
adds include to fix build
2013-10-05 15:52:19 -07:00
Ilya Lavrenov
036e99d03a
fixed ipp-related warnings
2013-10-05 14:54:00 +04:00
Ilya Lavrenov
8c82decf5b
added plain branch to HoughCircle perf test
2013-10-04 19:51:26 +04:00
Roman Donchenko
46eeb106e2
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
2013-10-04 18:25:44 +04:00
Ilya Lavrenov
72c35d3a89
fixed mog2
2013-10-04 18:19:01 +04:00
Roman Donchenko
744f4b1609
Merge pull request #1565 from SpecLad:cmake-new-ptr
2013-10-04 18:14:34 +04:00
Roman Donchenko
2660f4bc59
Merge pull request #1562 from ilya-lavrenov:ocl_integral
2013-10-04 18:12:43 +04:00
Ilya Lavrenov
fb73e7b4bd
fixed pyrlk optical flow
2013-10-04 17:56:02 +04:00
Roman Donchenko
aa80250a3d
Merge pull request #1532 from alalek:stereo_csbp
2013-10-04 16:43:51 +04:00
Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
2013-10-04 16:36:44 +04:00
Roman Donchenko
1b51270617
Merge pull request #1558 from SpecLad:Wparentheses-equality
2013-10-04 16:32:09 +04:00
Roman Donchenko
f04cade607
Merge pull request #1559 from SpecLad:Wnull-conversion
2013-10-04 16:08:54 +04:00
Alexander Alekhin
de0f310e81
ocl: tests: RNG usage refactoring
2013-10-04 15:39:39 +04:00
Roman Donchenko
3cfad385ec
Fix a -Wshadow warning in cap_openni.cpp.
2013-10-04 14:23:06 +04:00
Roman Donchenko
ca65fe4548
Merge pull request #1535 from asmorkalov:android_ndk_r9
2013-10-04 14:14:20 +04:00
Roman Donchenko
b03c19a8ac
Merge pull request #1554 from pablospe:fix_viz_module_compilation
2013-10-04 14:02:17 +04:00
Roman Donchenko
32630dbf61
Adapt cap_openni.cpp to the new Ptr.
2013-10-04 13:51:58 +04:00
StevenPuttemans
2f474db27f
Fix of bug #3283 and bug #3301
...
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
2013-10-04 11:19:45 +02:00
Alexander Alekhin
90df620deb
ocl: stereo_csbp: divUp -> roundUp
2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9
autogenerated code
2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5
ocl: runtime, fix 32-bit builds
2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc
fixed ocl::integral and enabled perf test for it
2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699
refactored arithm binary operations in order to make them more scalable
2013-10-04 12:13:22 +04:00
Alexander Alekhin
d74ca7b39d
ocl: update module documentation
2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf
ocl: merge with upstream/2.4
2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031
removed ocl::minMax_buf, updated doc (operation on matrices)
2013-10-03 18:19:15 +04:00
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
2013-10-03 12:11:50 +04:00
Roman Donchenko
fa9d092c43
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
2013-10-03 12:04:57 +04:00
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
2013-10-03 11:54:41 +04:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Ilya Lavrenov
adca219f18
fixed convertC3C4 and convertC4C3 functions in case cols == 1
2013-10-03 10:45:15 +04:00
Pablo Speciale
f47afe5799
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
2013-10-03 02:10:27 +02:00
Tony
81d6842b8e
These changes introduce Gtk3 support into the highgui module.
...
A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected).
window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3.
To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
2013-10-02 21:16:40 +01:00
Andrey Pavlenko
88419f8923
Merge pull request #1507 from pengx17:2.4_fix_test
2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2
Merge pull request #1542 from alalek:cl_runtime
2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e
removed invalid comment
2013-10-02 19:35:21 +04:00
Roman Donchenko
447e03bc28
Merge pull request #1543 from SpecLad:name-enum
2013-10-02 19:22:35 +04:00
Andrey Pavlenko
b396916cdb
Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm
2013-10-02 19:14:16 +04:00
Andrey Pavlenko
b2fe053f4d
Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not
2013-10-02 19:14:00 +04:00
Alexander Alekhin
5ab49c4cc2
ocl: cl_runtime: added autogenerated code
2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6
enabled ocl::norm perf test
2013-10-02 16:57:15 +04:00
Roman Donchenko
d019344c9d
Merge pull request #1547 from SpecLad:gtest-1.7
2013-10-02 16:46:19 +04:00
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb8 .
...
Original author: me.
2013-10-02 16:09:45 +04:00
Ilya Lavrenov
a613a1a1da
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
2013-10-02 16:09:29 +04:00
Roman Donchenko
4c19e0273a
Cherry-picked mariusmuja/flann@b615f26947 .
...
Original author: Alex Wilson.
2013-10-02 16:06:56 +04:00
Roman Donchenko
78c4ffec99
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
...
This reverts commit a9975b144a
2013-10-02 16:02:11 +04:00
Roman Donchenko
e65eb4e042
Updated Google Test to 1.7.0.
2013-10-02 14:41:00 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
4c7ecf20d8
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
2013-10-02 12:52:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Andrey Pavlenko
75d89f4331
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
2013-10-01 20:17:52 +04:00
Andrey Pavlenko
154fe4f657
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
2013-10-01 20:16:48 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
2013-10-01 18:22:03 +04:00
Ilya Lavrenov
4322c47bb2
removed test_norm.cpp from ocl tests
2013-10-01 17:53:14 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Alexander Alekhin
a8ac3ec72a
ocl: perf test: disable MOG2 (random hungs), enable upload/download
2013-10-01 16:49:11 +04:00
Alexander Alekhin
66e4aead97
perf tests: added SANITY_CHECK_NOTHING()
2013-10-01 16:49:11 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Vladislav Vinogradov
8ed47c01b7
used new device layer for cv::cuda::norm
2013-10-01 15:28:51 +04:00
Vladislav Vinogradov
23cc31e041
used new device layer for cv::cuda::LUT
2013-10-01 15:24:17 +04:00
Nghia Ho
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
Nghia Ho
d7bf71c24a
Merge remote-tracking branch 'upstream/master'
2013-10-01 19:56:47 +10:00
Ilya Lavrenov
065b40c6c3
fixed and extended ocl::norm
2013-10-01 13:21:43 +04:00
Vladislav Vinogradov
06f07944c8
removed dependecy from cudalegacy
2013-10-01 12:18:40 +04:00
Vladislav Vinogradov
7839dbd2c4
used new device layer for cv::gpu::integral
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
224f18b06c
bitwise operation optimization
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
eb449968b6
removed unroll_detail.hpp
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
1ef211b889
used new device layer for cv::gpu::reduce
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
31a7814395
used new device layer for cv::gpu::countNonZero
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
020624c481
used new device layer for cv::gpu::minMaxLoc
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
e1aa2fd06c
added gridMinMaxLoc function
2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
3fb9c52272
cast to reference
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
bbd519be42
fixed warnings
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
045a856c24
used new device layer for cv::gpu::minMax
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
b705e0d886
used new device layer for cv::gpu::sum
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
9fe92e2111
renamed grid/glob_reduce.hpp -> grid/reduce.hpp
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
e820c5c65f
used new device layer for cv::gpu::mulSpectrums
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
3f62e78592
used new device layer for cv::gpu::copyMakeBorder
2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
7b3bbcea71
used new device layer for cv::gpu::transpose
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
6dbb32a05d
switched to new device layer in split/merge
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
3ab7f4b26a
removed arithm_func_traits.hpp
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
7c8c836a7b
switched to new device layer in polar <-> cart
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
5522f43b18
used new device layer for cv::gpu::threshold
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
e83be009a3
used new device layer for cv::gpu::addWeighted
2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
c7a3a7d4d9
switched to new device layer in min/max
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
b11cccaaca
switched to new device layer in bitwize operations
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
fdfffa5291
fixed warnings
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
ef9917ecf1
used new device layer for cv::gpu::compare
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
43e811118b
fixed assertion
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
766d950ff3
used new device layer in math per element operations
2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
7628e57fc6
used new device layer for cv::gpu::absdiff
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
574ff47146
used new device layer for cv::gpu::divide
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
e7dba695b3
used new device layer for cv::gpu::multiply
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
156f86ea0b
used new device layer for cv::gpu::subtract
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
9c5da2ea22
used new device layer for cv::gpu::add
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
32d578f5f0
fixed gridTransform overloads problems
2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
f4fb7fe1be
fixed compilation error "ambiguous symbol" on CUDA 5.0:
...
disabled Texture Reference API for old CUDA toolkits
2013-10-01 12:15:30 +04:00
Roman Donchenko
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
2013-10-01 12:09:17 +04:00
John Stowers
51341738ba
Add cv::logPolar, cv::linearPolar, and a python example
2013-09-30 22:31:19 +02:00
Tony
0d06b1dced
Change true for TRUE
...
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
2013-09-30 21:04:43 +01:00
Alexander Alekhin
958604a68e
perf test: update error message about relative error
2013-09-30 20:11:39 +04:00
Vadim Pisarevsky
c810d03d5c
some more attempts to fix compile bug on Android
2013-09-30 19:28:11 +04:00
Roman Donchenko
e35bc11504
Merge pull request #1457 from pengx17:2.4_oclsvm
2013-09-30 17:50:29 +04:00
Roman Donchenko
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
2013-09-30 17:44:45 +04:00
Ilya Lavrenov
a562b5c985
fixed ocl::meanStddev and created accuracy test for this function
2013-09-30 17:37:19 +04:00
Roman Donchenko
54c902dccd
Merge pull request #1509 from perping:2.4_docs
2013-09-30 17:37:19 +04:00
Nghia Ho
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
2013-09-30 22:59:29 +10:00
Ilya Lavrenov
7379152afb
fixed ocl::setIdentity
2013-09-30 16:54:09 +04:00
Vadim Pisarevsky
c3748a5f95
fixed the trailing whitespaces
2013-09-30 16:06:48 +04:00
Ilya Lavrenov
7edcefb2be
fixed ocl::phase
2013-09-30 16:02:14 +04:00
Vadim Pisarevsky
ca0956a7e2
this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy
2013-09-30 16:00:39 +04:00
Ilya Lavrenov
b864f48274
fixed ocl::sum, ocl::sqrSum, ocl::absSum
2013-09-30 15:12:38 +04:00
Vadim Pisarevsky
bc1f9d6268
fixed description of createLineSegmentDetector
2013-09-30 15:07:32 +04:00
Vadim Pisarevsky
cd84742556
attempts to fix build errors on Android
2013-09-30 14:53:48 +04:00
Alex Leontiev
0324932fb3
Added the copyright statements
...
Added the copyrights missing in all files that required so.
2013-09-30 18:53:32 +08:00
Juan Manuel Perez
f6fc39ce8f
Putting definitions of SCD and SCDMatcher separated from sc_dis.cpp file
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
4672a70c1f
Replaced dynamic_cas with Ptr::dynamicCast<>, and & with &&
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
1bf4298251
Macro removal
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
aa73dafbbb
2 Compile error fix for Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
752d88f5d2
Compile error fix for Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
5a1e9876fc
Corrected compilation errors Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
ead966709d
Remove ~ file
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
fe7bab499f
Corrections for compiling issues in Win, And and Doc
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
61c27ac81e
Shape module added
2013-09-30 14:39:17 +04:00
Vadim Pisarevsky
851a8a1cd0
fixed whitespace error
2013-09-30 14:31:39 +04:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
0a8d62e5fd
createLineSegmentDetectorPtr -> createLineSegmentDetector
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
f0b050fa88
exposed LineSegemntDetector to python
2013-09-30 14:30:00 +04:00
StevenPuttemans
f6c802b563
Applied fix suggested in bug 3282 and shortened code
2013-09-30 11:48:01 +02:00
peng xiao
315c054379
Fix new blank line at EOF.
2013-09-30 16:20:43 +08:00
peng xiao
422396ef6a
fix build error
2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d
Add opencl svm.
2013-09-30 16:17:19 +08:00
Alex Leontiev
3ac3ba0415
Minor fixes
...
Fix failed builds that opencv's buildbot has got.
2013-09-28 22:33:13 +08:00
Alex Leontiev
891bcd8491
Finish implementing the Nonlinear Conjugate Gradient
...
Now everything is prepared for the pull request.
2013-09-28 15:20:45 +08:00
lluis
047b568f6d
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
...
Updated documentation and sample to use the new function API
2013-09-27 19:19:45 +02:00
Ilya Lavrenov
b54228fb83
fixed ocl::countNonZero
2013-09-27 17:35:06 +04:00
Ilya Lavrenov
9dca7555b4
fixed ocl::minMax
2013-09-27 16:25:10 +04:00
Alexander Smorkalov
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
2013-09-27 12:17:55 +04:00
perping
1bc20ae6f8
fix warning about addWeighted and remove magnitudeSqr().
2013-09-27 09:50:37 +08:00
Tony
97fc1e10a7
Replace obsolete Gtk symbols
...
This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
preparation for adding Gtk3 support. These edits aim to be fully
compatible with Gtk2.x, allowing backward compatibility.
The following symbols have been replaced in this commit:
Gtk symbols that have been moved to the Gdk library:
- GtkType -> Gtype
- GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
- GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
- gtk_signal_connect -> g_signal_connect
- GTK_SIGNAL_FUNC -> G_CALLBACK
- gtk_type_class -> g_type_class_peek
- gtk_type_new-> g_object_new
- GtkTypeInfo -> GtypeInfo (Not required for
g_type_register_static_simple)
- gtk_type_unique -> g_type_register_static_simple
- gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
NB: This requires porting to use cairo contexts and GdkPixbufs.
The following gtk symbols are changed for their modern equivalent:
- GTK_WIDGET_REALIZED -> gtk_widget_get_realized
- GTK_OBJECT_FLAGS -> gtk_widget_set_realized
Symbols without replacement:
- gtk_range_set_update_policy -> No replacement; as default policy is
set to continuous we can delete this line.
2013-09-26 18:31:44 +01:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Andrey Pavlenko
3e91350a31
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
2013-09-26 15:50:54 +04:00
Nghia Ho
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
Nghia Ho
e6a9c22b9d
Merge remote-tracking branch 'upstream/master'
2013-09-26 19:13:01 +10:00
Alexander Smorkalov
26a1a93295
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
2013-09-26 12:16:02 +04:00
perping
074f9e33cb
fix three warning about mog, mog2 and KNearestNeighbour.
2013-09-26 15:30:44 +08:00
Alexander Smorkalov
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
perping
f65286d3c6
Update the OpenCL documents.
2013-09-26 14:04:11 +08:00
Alexander Smorkalov
241aa6e5a8
Merge pull request #1497 from jet47:fix-bug-3277
2013-09-26 09:31:06 +04:00
peng xiao
28ac23c1a1
If device does not support double, returns immediately.
...
Double floating points are not default supported by OpenCL.
2013-09-26 12:59:21 +08:00
Ilya Lavrenov
f5af3ab851
changes in OpenCL matrix operations docs
2013-09-25 19:47:15 +04:00
Alexander Smorkalov
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
2013-09-25 17:19:39 +04:00
Ilya Lavrenov
c8821bd909
replaced manually new/delete by AutoBuffer
2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8
fixed minMaxLoc kernel (removed compilation errors)
2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e
reverted and generalized original ocl::transpose
2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17
Resolved the bug that the work group size is not valid.
2013-09-25 17:42:56 +08:00
Alexander Smorkalov
6057414a93
Merge pull request #1199 from devernay:2.4-qtkit
2013-09-24 15:36:16 +04:00
Vladislav Vinogradov
e675684c81
fix bug #3277 (findCirclesGrid failures):
...
findHomagraphy can return empty Mat in master branch
2013-09-24 14:45:13 +04:00
Ilya Lavrenov
c87d2d414d
removed arithm_absdiff.cl
2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d
refactored arithm.cpp. Extended param list for all the tests
2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218
refactoed and extended ocl::transpose
2013-09-24 14:07:54 +04:00
Ilya Lavrenov
799afab23b
refactored and extended ocl::exp and ocl::log
2013-09-24 14:02:01 +04:00
Ilya Lavrenov
0730963576
refactored and extended ocl::compare
2013-09-24 13:58:18 +04:00
Ilya Lavrenov
8e0e352d77
refactored and extended binary bitwise operations
2013-09-24 13:54:46 +04:00
Ilya Lavrenov
161674bff2
refactored and extended ocl::addWeighted
2013-09-24 13:51:37 +04:00
Ilya Lavrenov
b20bd470fe
refactored and extended ocl::LUT
2013-09-24 13:49:38 +04:00
shawke
720241de87
Make similar default typedefs for Point_, Size_ and Rect_
...
Currently, there are different default typedefs for Point_, Size_, and Rect_. This pull request at least makes sure that default typedefs exist for int, float and double variants of each of these types.
2013-09-24 11:48:04 +02:00
Ilya Lavrenov
311a7233c2
removed comments from filtering.cpp and imgproc.cpp in ocl module
2013-09-24 13:46:08 +04:00
Ilya Lavrenov
bd36e556a1
removed ocl::magnitudeSqr
2013-09-24 13:39:07 +04:00
Ilya Lavrenov
0ad03162df
refactored and extended arithm operations add/sub/mul/div/absdiff
2013-09-24 13:34:55 +04:00
Ilya Lavrenov
5ff5fdd73d
marked some methods of ocl::Context as const
2013-09-24 13:17:09 +04:00
Ilya Lavrenov
d64fb235f7
removed needless arithm_2_mat.cl file
2013-09-24 13:15:05 +04:00
StevenPuttemans
1b1fb131b3
Attempt at fixing bug 3186
2013-09-23 16:51:02 +02:00
Nghia Ho
b4ffb0878d
Merge remote-tracking branch 'upstream/master'
2013-09-23 20:05:51 +10:00
Alexander Smorkalov
b5f3709ab9
Merge pull request #1484 from lluisgomez:scene_text_detection_documentation
2013-09-23 14:00:08 +04:00
Alexander Smorkalov
d6d8e96003
Merge pull request #1489 from melody-rain:2_4_knearest_neighbor
2013-09-23 13:34:39 +04:00
Alexander Smorkalov
0cd3d1f4d6
Merge pull request #1482 from ilya-lavrenov:ocl_setTO
2013-09-23 12:56:20 +04:00
lluis
5670e4f6cd
fixed typos
2013-09-23 10:17:47 +02:00
Vladislav Vinogradov
776c0cb08c
switched to new device layer in gpucodec module
2013-09-23 12:16:57 +04:00
Jin Ma
b88f5302e2
Removed unused constructor.
2013-09-23 15:10:00 +08:00
Alexander Smorkalov
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
Jin Ma
1bfe39f485
Added knearest neighbor of OpenCL version.
...
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307
Added knearest neighbor of OpenCL version.
...
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:22:09 +08:00
Alex Leontiev
581d454536
Refined interface for Conjugate Gradient
...
Some interface was refined (most notably, the method for returning
Hessian was removed and the method for getting gradient was added as
optional to base Solver::Function class) and basic code for
setters/getters was added. Now is the time for the real work on an
algorithm.
2013-09-22 00:27:00 +08:00
Csaba Kertesz
6fb3b4f41c
Fix a memory leak in CvNormalBayesClassifier::train()
2013-09-20 22:36:49 +02:00
lluis
5556f051f1
added rst documentation for the Class-specific Extremal Regions for Scene Text Detection
2013-09-20 21:39:11 +02:00
John Stowers
14d225134d
Redefine CPU_xx constants in cv::namespace
...
This makes them visible from the python bindings
2013-09-20 20:04:33 +02:00
Nghia Ho
4171767d19
Merge remote-tracking branch 'upstream/master'
2013-09-21 02:20:25 +10:00
Vadim Pisarevsky
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04:00
Ilya Lavrenov
362a67a695
fixed ocl::oclMat::setTo for 2-channel images
2013-09-20 15:57:38 +04:00
Alex Leontiev
eb1333d0a8
Initial commit for Conjugate Gradient method
...
Implementation is based on
http://www.cs.cmu.edu/~quake-papers/painless-conjugate-gradient.pdf
So far we only have basic interface and empty test. But it compiles at
least.
2013-09-20 15:12:48 +08:00
Alexander Smorkalov
1445a29e1c
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
2013-09-20 10:54:53 +04:00
Ovidiu Parvu
2bf36c312f
Removed static variables which were not read-only and used more function parameters instead.
2013-09-19 18:32:03 +01:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Ovidiu Parvu
52cdae6e2b
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
2013-09-19 15:37:10 +01:00
Ovidiu Parvu
21390d806f
Removed non-ASCII characters from the comments
2013-09-19 15:12:07 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Alexander Smorkalov
0ecd7913f8
Merge pull request #1472 from alalek:master_fix_debug_builds_on_win
2013-09-19 14:41:55 +04:00
lluis
2837bfd9fa
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
2013-09-19 10:30:25 +02:00
Alexander Smorkalov
c550e452f9
Merge pull request #1384 from hbristow:matlab_public
2013-09-19 10:25:02 +04:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Ovidiu Parvu
73f476bd4b
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
2013-09-18 15:51:10 +01:00
Fedor Morozov
90b6af1496
Merge new changes
2013-09-18 18:21:45 +04:00
Fedor Morozov
b1af5cc478
Remove ghost removal
2013-09-18 18:15:51 +04:00
Ozan Tonkal
5780b418c9
delete duplicate bunny.ply, remove tabs and extra lines
2013-09-18 13:46:43 +01:00
Ovidiu Parvu
737c5fe781
Updated the return type of the cvMinEnclosingTriangle function in the documentation
2013-09-18 13:09:55 +01:00
Alexander Alekhin
81ac97c6bd
fix for broken debug builds (MSVS2010/2012)
2013-09-18 16:05:21 +04:00
Ozan Tonkal
8de46e1f81
removed trailing spaces
2013-09-18 12:50:55 +01:00
Ovidiu Parvu
dc64dd7315
Made the following changes after code inspection (min_enclosing_triangle.cpp):
...
* Corrected minor typos in comments/function signatures
* Added new details to copyright statement
* Removed unreferenced macros
* Removed the assert statement which was checking the type of the OutputArray triangle
* When returning results using Mat::copyTo instead of Mat::convertTo
* Changed C-style casts to static_casts
* Added division by zero check to distanceFromPointToLine() function
* Updated reference webpages last access dates
* Moved the declaration of the gammaOfA variable outside the while loop in moveAIfLowAndBIfHigh() function for efficiency reasons
2013-09-18 12:21:24 +01:00
hbristow
d84ab09ab7
Updated documentation
2013-09-18 18:52:23 +10:00
Ozan Tonkal
824c28a588
Merge remote-tracking branch 'itseez/master'
2013-09-18 08:44:37 +01:00
hbristow
1dd017e9d0
Fixed a memory leak in mxarray
2013-09-18 17:10:54 +10:00
Alexander Smorkalov
99a43257d5
Merge pull request #1465 from jet47:cudev-old-cc
2013-09-18 10:39:53 +04:00
Alexander Alekhin
f1b5cbc8fe
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
2013-09-18 01:14:41 +04:00
Alexander Smorkalov
3fa3722641
Merge pull request #1458 from look4pritam:my-branch
2013-09-17 22:50:48 +04:00
Ozan Tonkal
a117400577
ignore viz tutorials when BUILD_opencv_viz is not set
2013-09-17 18:55:10 +02:00
Ozan Tonkal
e3e5fd5baa
Merge remote-tracking branch 'itseezstream/master'
2013-09-17 17:50:14 +02:00
Andrey Pavlenko
ad404ef44f
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
2013-09-17 17:50:46 +04:00
Vladislav Vinogradov
20f636fcee
fixed cudev compilation for old pre-Fermi archs
2013-09-17 17:43:12 +04:00
Alexander Smorkalov
6fae07ba88
Merge pull request #1460 from ilya-lavrenov:ocl_divUp
2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387
Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations
2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388
Merge pull request #1439 from ilya-lavrenov:convertTo
2013-09-17 15:12:02 +04:00
Alexander Smorkalov
9cf301e257
Merge pull request #1449 from SpecLad:dc1394-095
2013-09-17 14:36:30 +04:00
Alexander Smorkalov
8853d19e74
Merge pull request #1452 from alalek:fix_cv_export_templates
2013-09-17 14:35:40 +04:00
Andrey Pavlenko
b3bb42773b
Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp
2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21
Merge pull request #1455 from ilya-lavrenov:ocl_test_output
2013-09-17 13:18:52 +04:00
Fedor Morozov
89508bf7ab
NO exr now
2013-09-17 00:46:15 +04:00
Fedor Morozov
76c6fa9348
No EXR in tests
2013-09-17 00:39:22 +04:00
Ilya Lavrenov
6a26c4483f
added performance tests for data transfer operations
2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0
removed needless divUp
2013-09-16 15:48:30 +04:00
Alexander Smorkalov
06a7a1ac47
Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed.
...
QVector range check exception fixed.
2013-09-16 13:42:15 +04:00
look4pritam
a430abd02e
The thin prism distortion coefficient related small bug is fixed.
2013-09-16 13:39:11 +05:30
Ovidiu Parvu
b570a4ac47
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
2013-09-15 23:40:40 +01:00
Ovidiu Parvu
130b4d8e26
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
2013-09-15 23:25:36 +01:00
Ovidiu Parvu
7ac768651f
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
2013-09-15 22:40:57 +01:00
Ovidiu Parvu
0117d77cd1
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
2013-09-15 22:25:58 +01:00
Ilya Lavrenov
e0325fe057
removed useless output
2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617
fixed ocl::pyrUp for 2-byte types
2013-09-15 19:56:05 +04:00
Ozan Tonkal
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
Ovidiu Parvu
caaa9e0f2d
- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture depicting a sample output)
2013-09-15 15:07:17 +01:00
Alexander Alekhin
0ee47502d9
remove CV_EXPORT from templates
2013-09-15 13:48:54 +04:00
Ozan Tonkal
f570b3e18d
cmake check if VTK version is lower than 5, and give fatal error if it is
2013-09-15 11:24:20 +02:00
hbristow
86b7e3d15d
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
2013-09-15 17:36:13 +10:00
lluis
d25309f82e
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
2013-09-13 16:29:21 +02:00
lluis
75fdfba281
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
2013-09-13 16:19:52 +02:00
Roman Donchenko
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
Roman Donchenko
eff21788a8
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
2013-09-13 15:01:14 +04:00
lluis
95d92c099c
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
2013-09-13 12:54:23 +02:00
Vadim Pisarevsky
84022b0c19
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
2013-09-13 13:32:42 +04:00
Roman Donchenko
c511d5d649
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
2013-09-13 13:31:14 +04:00
Roman Donchenko
0033d453f2
Merge pull request #1426 from nailbiter:optimPD
2013-09-13 13:27:02 +04:00
Roman Donchenko
e3b92a9591
Merge pull request #1441 from look4pritam:prism-stereo
2013-09-13 13:17:06 +04:00
Ilya Lavrenov
9311f84109
disabled MOG tests if no video input support
2013-09-13 12:47:25 +04:00
hbristow
530ad447bc
Added fixes to CMakeLists.txt
2013-09-13 17:22:12 +10:00
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Ozan Tonkal
3f27ba54e0
re-render the scene after changing camera properties
2013-09-12 19:23:05 +02:00
Mathieu Barnachon
0934344a3d
Update sample and code with external computation of HOG detector.
2013-09-12 18:38:49 +02:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01:00
Ovidiu Parvu
9902affae6
Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.
2013-09-12 14:34:08 +01:00
Roman Donchenko
e3710488a8
Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp
2013-09-12 16:54:21 +04:00
Roman Donchenko
d669559ec3
Bumped version to 3.0.
2013-09-12 16:40:14 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
Ovidiu Parvu
4fce8e6b0e
Changed the semantics of the minEnclosingTriangle function such that:
...
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
2013-09-12 13:29:10 +01:00
Roman Donchenko
887825e831
Added an additional version component - the development status.
...
This will allow us to distinguish between regular releases, prereleases
and development versions.
2013-09-12 16:20:09 +04:00
Roman Donchenko
dee2a65978
Merge pull request #1440 from SpecLad:wcast-align
2013-09-12 13:56:23 +04:00
look4pritam
7fd7bbc9f1
The prism distortion coefficients are added for the stereo calibration.
2013-09-12 15:17:11 +05:30
Ovidiu Parvu
510ad8e779
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
...
- Adapted the source code to accommodate this change
2013-09-12 10:11:38 +01:00
Roman Donchenko
ad52dd37a9
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
...
This reverts commit 41b8479d03531471b0aa
2013-09-12 12:58:10 +04:00
Roman Donchenko
ac9bc6423a
Merge pull request #1428 from ilya-lavrenov:ocl_pyr
2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8
extended ocl::convertTo
2013-09-12 12:39:03 +04:00
Roman Donchenko
fec697b390
Silenced a few -Wcast-align warnings in the headers.
...
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
2013-09-12 12:33:56 +04:00
Roman Donchenko
f31d06f980
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
2013-09-12 12:19:37 +04:00
Jin Ma
f4d0c9b13c
Revised the code according to the feedback of the community.
2013-09-12 09:43:30 +08:00
Ovidiu Parvu
e6b58c4e79
- Added the minEnclosingTriangle function declaration to the imgproc header
...
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
2013-09-11 18:07:19 +01:00
Ozan Tonkal
620d92824c
hide VizMap and VizPair from public interface
2013-09-11 13:23:57 +02:00
Roman Donchenko
caf9fdbdc3
Merge pull request #1432 from SpecLad:unseq
2013-09-11 13:50:36 +04:00
Roman Donchenko
6fcd9e3830
Merge pull request #1431 from asmorkalov:android_recording_hint
2013-09-11 13:50:03 +04:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
Jin Ma
b9d7e67589
Removed whitespace.
2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38
Added performance for Kalman Filter.
2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral
2013-09-10 18:59:41 +04:00
Roman Donchenko
acc2ca484c
Merge pull request #1425 from pengx17:master_retina_ocl_fix
2013-09-10 18:29:25 +04:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Alexander Smorkalov
98cb1dcc9a
MediaRecorder hint enabled for all Android devices with API level 14 and above.
...
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
2013-09-10 18:05:45 +04:00
Roman Donchenko
51ed1873de
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.
...
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
2013-09-10 18:05:23 +04:00
Ilya Lavrenov
6b9c451938
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
2013-09-10 17:36:18 +04:00
Roman Donchenko
7238479813
Merge pull request #1415 from znah:sfm_py
2013-09-10 11:37:05 +04:00
Roman Donchenko
747f7178ca
Merge pull request #1417 from ilya-lavrenov:merge_fix
2013-09-10 11:33:25 +04:00
Roman Donchenko
68901ab471
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog
2013-09-10 11:32:35 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Roman Donchenko
260b283fb3
Merge pull request #1413 from melody-rain:2.4_kalman_filter
2013-09-10 11:28:22 +04:00
peng xiao
8767c47463
Fix whitespaces.
2013-09-10 15:13:53 +08:00
pengxiao
a92721b569
Fix retina ocl on NV.
...
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
2013-09-10 14:33:23 +08:00
Alex Leontiev
a29863ee7b
Eliminate use of 32-bit floating pt type
...
Replace all "float" by "double" (64-bit) to avoid "lose precision"
warnings.
2013-09-10 13:53:26 +08:00
Alex Leontiev
1207cd132b
Minor fixes
...
Fixed integer vs unsigned integer comparison in .cpp test source and
trailing whitespaces in source code
2013-09-10 13:53:26 +08:00
Alex Leontiev
11fa0651c6
Minor fixes
...
As the opencv's build-bot did not want to compile this revision, I had
to do some changes. In particular,
1) Removed unsigned int vs int comparisons, that were treated as errors
2) Removed unused variables and functions
3) Removed functions without previous declaration
4) Fixed whitespaces
2013-09-10 13:53:26 +08:00
Alex Leontiev
ccc71ac190
Primal-dual algorithm
...
This is an implementation of primal-dual algorithm, based on the C++
source code by Vadim Pisarevsky. It was extended to handle the denoising
based on multiple observations. It also contains documentation and
tests.
2013-09-10 13:53:26 +08:00
lluis
ad94628038
Using cv::magnitude instead of custom loop and Mat<float> instead of Mat<double> to compute gradient magnitude channel.
2013-09-09 18:37:55 +02:00
Roman Donchenko
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
Roman Donchenko
41b8479d03
Merge pull request #1376 from StevenPuttemans:bugfix_3186
2013-09-09 18:33:11 +04:00
Ilya Lavrenov
16357418d5
increased time limit for bilateral filter performance tests
2013-09-09 18:16:53 +04:00
Roman Donchenko
d5aaab745f
Merge pull request #1282 from nailbiter:optimDS
2013-09-09 18:10:13 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Ilya Lavrenov
b07b9aca5a
fixed HOG perf test
2013-09-09 17:16:47 +04:00
Roman Donchenko
531471b0aa
Merge pull request #1412 from jet47:gpu-match-template-nocuda
2013-09-09 16:49:33 +04:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Vadim Pisarevsky
61f2107829
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
2013-09-09 16:13:39 +04:00
Ilya Lavrenov
7d8bde3330
fixed ocl::merge in case of 2 and types CV_32S and CV_32F
2013-09-09 16:12:01 +04:00
Alexander Mordvintsev
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
lluis
e8d3732aaf
added computeNMChannels helper function to compute the diferent channels to be processed independently in the N&M algorithm.
2013-09-09 11:37:58 +02:00
Jin Ma
a4ab3f4ea8
Removed whitespace.
2013-09-09 17:00:33 +08:00
Vladislav Vinogradov
1036ce807c
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-09 12:57:35 +04:00
Roman Donchenko
cb0fc230f1
Merge pull request #1387 from vpisarev:ipp_imgwarp
2013-09-09 12:54:32 +04:00
Roman Donchenko
45512a93e0
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
2013-09-09 12:39:12 +04:00
Roman Donchenko
77a2529eb7
Merge pull request #1408 from jet47:new-ptr-fixes
2013-09-09 12:27:27 +04:00
Jin Ma
2d5a1dacd0
Added Kalman Filter of OpenCL version.
2013-09-09 16:08:23 +08:00
Roman Donchenko
74578f56a9
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
2013-09-09 12:05:57 +04:00
Roman Donchenko
a03c6decaf
Merge pull request #1409 from SpecLad:imgproc-test-memerr
2013-09-09 12:03:58 +04:00
Vladislav Vinogradov
6ad72bfcb4
removed detail:: prefix int video_reader
...
it conflicts with cv::detail
2013-09-09 10:57:51 +04:00
Vladislav Vinogradov
a0771630b0
restored original behaviour or release functions for (Buffer and Texture)
2013-09-09 10:57:45 +04:00
Vladislav Vinogradov
c439702f0c
added missing gpu::matchTemplate implementation for non-CUDA build
2013-09-09 10:51:44 +04:00
Ozan Tonkal
9895093524
check if vtk 5.10.0 exists, if not require 6.0.0
2013-09-08 19:41:35 +02:00
Ozan Tonkal
56f9168ac1
support VTK 6.0.0: cmakelist.txt might need to be refactored
2013-09-08 19:07:15 +02:00
Ozan Tonkal
26005a19bd
add license headers
2013-09-08 19:05:24 +02:00
Ozan Tonkal
c773061457
updated documentation
2013-09-08 19:03:55 +02:00
Ozan Tonkal
3bdb55e1ef
another constructor for CameraPositionWidget for displaying image by also using field of view instead of intrinsic matrix
2013-09-08 19:03:55 +02:00
Ozan Tonkal
2170559bed
text3dwidget offers now users to decide whether it should face the camera or not
2013-09-08 19:03:54 +02:00
Ozan Tonkal
286f81f305
fix crucial bug in get method, hide add and remove methods from user
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fcf437cf69
combine representation methods to one as setRepresentation
2013-09-08 19:03:54 +02:00
Ozan Tonkal
94ca5d65d0
remove VIZ prefix from rendering properties, fix setRenderingProperties and getRenderingProperties methods
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
2013-09-08 19:03:54 +02:00
Jin Ma
2fb0d23104
Removed unnecessary process for conversion to 4-channel format.
2013-09-07 10:40:30 +08:00
lluis
cd33ca0009
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
2013-09-06 19:10:53 +02:00
Anatoly Baksheev
9a91a12fb2
VIZ disabled by default, VTK search is performed iff BUILD_opencv_viz is enabled
2013-09-06 19:50:47 +04:00
Anatoly Baksheev
477ca067f0
compilation for macos
2013-09-06 19:32:35 +04:00
Anatoly Baksheev
eed7bf6902
compilation for windows
2013-09-06 18:43:14 +04:00
Fedor Morozov
a7bcf63765
Robertson docs
2013-09-06 18:21:59 +04:00
Fedor Morozov
c118f3c529
Robertson update
2013-09-06 17:30:43 +04:00
Roman Donchenko
ff1eb0d582
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog
2013-09-06 16:58:21 +04:00
Roman Donchenko
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
lluis
6ef1d456dd
fixed rebase conflicts
2013-09-06 14:00:11 +02:00
Roman Donchenko
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
Vladislav Vinogradov
b7eff94137
fixed compilation issues with new Ptr
2013-09-06 15:52:07 +04:00
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Fedor Morozov
deeaddb0a9
Doc update
2013-09-06 14:49:19 +04:00
Fedor Morozov
f4792f8a44
Doc update
2013-09-06 14:43:04 +04:00
lluis
512111af9c
removed blank line at EOF
2013-09-06 12:32:10 +02:00
lluis
1cc6502db3
removed unnecessary commented block
2013-09-06 12:32:10 +02:00
lluis
04913f5af7
removed trailing whitespaces
2013-09-06 12:32:10 +02:00
lluis
f4d01175b8
fixed a bug in the calculation of the number of inflexion points feature
2013-09-06 12:31:49 +02:00
lluis
765921cc25
fixed a typo error in the default min_Probability param of CreateERFilterNM2
2013-09-06 12:30:22 +02:00
lluis
dba336c0e3
fixed a bug in the non-max-suppression filter procedure
2013-09-06 12:27:19 +02:00
ilya-lavrenov
27947474ec
fixed data path
2013-09-06 13:25:56 +04:00
Roman Donchenko
7d62fdc62c
GPU resize: removed a few parameter names to avoid unused parameter warnings.
2013-09-06 12:46:58 +04:00
Roman Donchenko
439e90f4f4
retina_ocl.cpp: removed two unused arrays.
2013-09-06 12:34:37 +04:00
Roman Donchenko
af594c8e44
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
2013-09-06 12:33:54 +04:00
hbristow
74accbd969
Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers
2013-09-06 16:42:32 +10:00
Jin Ma
172242a94e
Revised performance test according to the feedback of the community.
2013-09-06 13:39:41 +08:00
hbristow
6964f6aacc
Removed unused Dynamic from matlab namespace - clashing with Eigen
2013-09-06 15:26:05 +10:00
Ozan Tonkal
5eed0d6bef
remove common.h include from widgets.hpp
2013-09-05 21:03:40 +02:00
Ozan Tonkal
31501ebf4f
replace tabs by spaces
2013-09-05 21:03:39 +02:00
Ozan Tonkal
a5b75769a3
initial documentation
2013-09-05 21:03:39 +02:00
Ozan Tonkal
2822845ba6
set get RenderingProperty id comes first
2013-09-05 21:03:39 +02:00
Ozan Tonkal
9d4fe6984b
remove setWindowName method to avoid complications
2013-09-05 21:03:39 +02:00
Ozan Tonkal
21be9796ae
comments on widgets where constructors might be confusing
2013-09-05 21:03:39 +02:00
ozantonkal
2705113bc4
remove common.cpp, remove commented code in common.h
2013-09-05 21:03:39 +02:00
ozantonkal
ffbb5e9524
resetCamera, resetViewpoint in Viz3d
2013-09-05 21:03:39 +02:00
ozantonkal
4aa61dee50
minor refactoring interactor_style
2013-09-05 21:03:39 +02:00
ozantonkal
af8a918e04
fix minor bug, minor cleaning, cv_assert with messages
2013-09-05 21:03:39 +02:00
ozantonkal
69f135ec57
fix memory leak in viz3d
2013-09-05 21:03:39 +02:00
ozantonkal
6c0c217562
removed reference counter in widgets, fixed memory leak
2013-09-05 21:03:39 +02:00
ozantonkal
4b443059ec
reverted widget reference count in order to avoid memory leak
2013-09-05 21:03:39 +02:00
ozantonkal
8007e07ad2
load mesh function is finalized: color range is always 0-255 and RGB due to vtkPLYReader limitations
2013-09-05 21:03:39 +02:00
ozantonkal
e4b13f2ef0
update reader after setting file name
2013-09-05 21:03:39 +02:00
ozantonkal
3da7dd9849
fix yellow and magenta color bgr codes
2013-09-05 21:03:39 +02:00
ozantonkal
9086cf5d79
remove unused includes and libraries from linking
2013-09-05 21:03:39 +02:00
ozantonkal
3038ffb886
setDesiredUpdateRate implementation in Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
ed0162ad0b
remove reference counting in widgets
2013-09-05 20:56:33 +02:00
ozantonkal
08917908f3
remove eigen dependency
2013-09-05 20:56:33 +02:00
ozantonkal
f98614ece0
remove cloudactormap, shapeactormap. only vtkProp is stored and view transformation can be obtained using GetUserMatrix of vtkProp3D
2013-09-05 20:56:33 +02:00
ozantonkal
f6e1a093cd
implement window relevant methods in Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
4f416352e1
implemented actor representation methods in viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
cf36b8f817
rendering properties in Widget and Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
b032b4dded
move frompolyfile to widget class as static method, remove addpolygon and its alikes
2013-09-05 20:56:33 +02:00
ozantonkal
0bbaf5d47a
removeAllWidgets implementation, removed other remove methods
2013-09-05 20:56:33 +02:00
ozantonkal
e106dcc606
remove include vtk headers from outside of precomp.hpp
2013-09-05 20:56:32 +02:00
Ilya Lavrenov
be98cd2f7f
replaced explicit __stdcall by CV_STDCALL
2013-09-05 19:25:03 +04:00
Roman Donchenko
86b841563b
Added tests for Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
c7d2fdc4b2
Fixed some dubious uses of tbb::task_scheduler_init.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a97ffe6513
Rewrote the documentation for Ptr to fit the new implementation.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a50d75d362
Made Filestorage able to not own its CvFileStorage instance.
...
This allows to get rid of the last remaining Ptr<T>::addref calls.
2013-09-05 19:03:00 +04:00
Roman Donchenko
3e189a2b41
Replaced calls to Ptr<T>::ptr to ::dynamicCast.
2013-09-05 19:03:00 +04:00
Roman Donchenko
24dee16b12
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
...
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
2013-09-05 19:03:00 +04:00
Roman Donchenko
dadee3752c
Adapt Python bindings to the new Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
2f942efdf7
Java: removed usages of Ptr<T>::addref().
...
Now the features2d class wrappers use composition instead of inheritance.
2013-09-05 19:03:00 +04:00
Roman Donchenko
eaa7fcc3e6
Boring changes - legacy.
2013-09-05 19:02:59 +04:00
Roman Donchenko
34127ba80f
Boring changes - contrib.
2013-09-05 19:02:59 +04:00
Roman Donchenko
3bca57ac25
Boring changes - ocl.
2013-09-05 19:02:59 +04:00
Roman Donchenko
fc0e835762
Boring changes - gpuwarping.
2013-09-05 19:02:59 +04:00
Roman Donchenko
d33ff4bb11
Boring changes - gpustereo.
2013-09-05 19:02:59 +04:00
Roman Donchenko
d6146e9543
Boring changes - gpulegacy.
2013-09-05 19:02:59 +04:00
Roman Donchenko
a007c7b980
Boring changes - gpuimgproc.
2013-09-05 19:02:58 +04:00
Roman Donchenko
b165016ba7
Boring changes - gpufilters.
2013-09-05 19:02:58 +04:00
Roman Donchenko
a57f93ee92
Boring changes - gpucodec.
2013-09-05 19:02:58 +04:00
Roman Donchenko
2c033251db
Boring changes - gpubgsegm.
2013-09-05 19:02:58 +04:00
Roman Donchenko
f8f0685397
Boring changes - gpuarithm.
2013-09-05 19:02:58 +04:00
Roman Donchenko
57595a8308
Boring changes - gpu.
2013-09-05 19:02:58 +04:00
Roman Donchenko
0dcb4f1f66
Boring changes - videostab.
2013-09-05 19:02:58 +04:00
Roman Donchenko
808e0cf10b
Boring changes - video.
2013-09-05 19:02:58 +04:00
Roman Donchenko
93f757f8a2
Boring changes - superres.
2013-09-05 19:02:58 +04:00
Roman Donchenko
f21851f0f4
Boring changes - stitching.
2013-09-05 19:02:58 +04:00
Roman Donchenko
cce0f48d3e
Boring changes - softcascade.
2013-09-05 19:02:58 +04:00
Roman Donchenko
32205d3c5b
Boring changes - photo.
2013-09-05 19:02:58 +04:00
Roman Donchenko
b12894d95a
Boring changes - objdetect.
2013-09-05 19:02:58 +04:00
Roman Donchenko
de6a934f66
Boring changes - nonfree.
2013-09-05 18:26:44 +04:00
Roman Donchenko
345bc633cc
Boring changes - ml.
2013-09-05 18:26:44 +04:00
Roman Donchenko
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +04:00
Roman Donchenko
bd70a033fc
Boring changes - calib3d.
2013-09-05 18:26:43 +04:00
Roman Donchenko
711fb6bd92
Boring changes - bioinspired.
2013-09-05 18:26:43 +04:00
Roman Donchenko
beeb932d22
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Roman Donchenko
8200a95ced
Boring changes - core.
...
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:
* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
(depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()
and similar changes that are numerous, but primitive.
2013-09-05 18:26:43 +04:00
Jin Ma
1366df8250
MOG&MOG2: Modified the performance test according to the feedback of the community.
2013-09-05 19:33:27 +08:00
Roman Donchenko
461c98fa86
Replaced Ptr with my new implementation.
2013-09-05 14:54:20 +04:00
Fedor Morozov
e33a4f79f8
Merge branch 'devel' of https://github.com/f-morozov/opencv into devel
2013-09-05 14:49:18 +04:00
Fedor Morozov
85eb52b8af
Debevec Calibrate
2013-09-05 14:41:35 +04:00
fm
cb27740de4
Linux compilation
2013-09-05 14:26:21 +04:00
Fedor Morozov
0f703b8162
Calibrate Debevec changes
2013-09-05 14:10:53 +04:00
Roman Donchenko
70711ac6c2
Merge pull request #1400 from ilya-lavrenov:ocl_test_mog
2013-09-05 11:58:52 +04:00
Roman Donchenko
ecc51817d9
Merge pull request #1399 from pengx17:master_retina_ocl_fix
2013-09-05 11:57:46 +04:00
Roman Donchenko
b9ae8623b2
Merge pull request #1398 from ilya-lavrenov:ocl_perf_gemm
2013-09-05 11:56:24 +04:00
Mathieu Barnachon
464985205c
Update PR after mdim review.
2013-09-05 16:05:54 +12:00
Daniel Angelov
25c0d5978c
Update on the compare lines method.
2013-09-05 00:02:24 +03:00
ilya-lavrenov
722bdc52a0
enabled gemm and dft erf test
2013-09-04 20:02:02 +04:00
ilya-lavrenov
0f8f489658
changed data path and eps
2013-09-04 18:46:46 +04:00
Roman Donchenko
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
2013-09-04 16:13:27 +04:00
Daniel Angelov
b5e1eb7d48
Removed IOArray constness.
2013-09-04 14:59:57 +03:00
Roman Donchenko
33d8d8ffd1
Merge pull request #1392 from SpecLad:flann-uninit
2013-09-04 15:49:14 +04:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Roman Donchenko
a9975b144a
Fixed a bug in FLANN resulting in uninitialized accesses.
...
This is fixed upstream in mariusmuja/flann@b615f26 , but that fix
would break binary compatibility, so I had to make a different one.
Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
2013-09-04 14:06:34 +04:00
pengxiao
e45f92a9e1
Fix a bug of ocl retina on NVIDIA platform.
2013-09-04 16:38:36 +08:00
Roman Donchenko
fd3b2326b4
Merge pull request #1373 from abidrahmank:pykeypoints
2013-09-04 11:53:33 +04:00
Vladislav Vinogradov
f46b7fcf86
fixed warnings in resize.cu
2013-09-04 11:15:18 +04:00
Jin Ma
dd73016c8b
Removed whitespace.
2013-09-04 15:00:36 +08:00
Jin Ma
e528f39def
Added the performance test for mog and mog2.
2013-09-04 14:37:46 +08:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Roman Donchenko
009919872f
Merge pull request #1389 from SpecLad:merge-2.4
2013-09-03 19:42:06 +04:00
Abid K
0902f183ca
alignment of parameters as per speclad
2013-09-03 21:12:03 +05:30
Roman Donchenko
79457f8f49
Merge pull request #1224 from mbarnach:pca_io
2013-09-03 18:43:54 +04:00
Roman Donchenko
c42d61e464
Merge pull request #1283 from melody-rain:new_mog_mog2
2013-09-03 18:43:03 +04:00
Roman Donchenko
b3e73cf7d6
Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE
2013-09-03 18:30:15 +04:00
Alexander Shishkov
e354fa3fd1
fixed test data in highgui test for HDR
2013-09-03 14:24:14 +04:00
Alexander Shishkov
924f7ce373
small changes for compilation
2013-09-03 14:05:14 +04:00
Roman Donchenko
e7f83619c5
Merge pull request #1378 from StevenPuttemans:bugfix_3115
2013-09-03 12:07:24 +04:00
Roman Donchenko
f50a829943
Merge pull request #1383 from pengx17:2.4_clblas
2013-09-03 12:05:01 +04:00
yao
a70bdfc13f
a little fix to tests and sample
2013-09-03 15:02:18 +08:00
pengxiao
ea16539448
Fix a crash of ocl program if clAmdBlas is not linked.
2013-09-03 10:30:37 +08:00
peng xiao
7b3e3f69fb
Modify according to @alalek.
2013-09-03 09:31:13 +08:00
hbristow
7e5bbec895
Removing trailing whitespace and expanded tabs
2013-09-03 10:14:45 +10:00
Anatoly Baksheev
35e7952909
simplify modules/viz/CMakeLists.txt
2013-09-03 01:59:00 +04:00
Roman Donchenko
18bb951574
Nuked the rest of the precomp.cpp files.
...
Consider this a part of merging #1357 .
2013-09-02 19:53:45 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vadim Pisarevsky
e85e4d3ab9
fixed bug in IPP-accelerated morphology; added several IPP imgwarp functions (by Klim)
2013-09-02 18:34:50 +04:00
kdrobnyh
e6ec3dd17f
Add IPP support in resize, warpAffine, warpPerspective functions
2013-09-02 18:04:06 +04:00
Roman Donchenko
757e7f842b
Merge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 17:01:38 +04:00
Roman Donchenko
99043f6fc2
Merge pull request #1385 from asmorkalov:winrt_glob_fix
2013-09-02 16:05:15 +04:00
Fedor Morozov
e15eabe3fa
Ghostbusters
2013-09-02 16:03:10 +04:00
Alexander Smorkalov
6d3102141c
Globbing accuracy test fail on Windows RT fixed.
2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee
Merge pull request #1302 from kdrobnyh:compare
2013-09-02 15:11:20 +04:00
Vladislav Vinogradov
ba4bf04c6c
fixed incorrect GPUs -> CUDAs replacement
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
a41006754e
fix documentation
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
429bfad225
removed precomp.cpp files
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cbe437571e
fixed docs
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
f936c1283b
fixed sanity test for cuda module
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
29386f1449
renamed gpubgsegm -> cudabgsegm
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
259ceb7eaa
renamed gpufeatures2d -> cudafeatures2d
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
5660d6a680
renamed gpuoptflow -> cudaoptflow
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
a0ae602bb7
renamed gpuimgproc -> cudaimgproc
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
219b662127
renamed gpufilters -> cudafilters
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
71d61e07b1
renamed gpustereo -> cudastereo
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
6d216d78d9
renamed gpulegacy -> cudalegacy
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dbeb3e2968
renamed gpucodec -> cudacodec
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
fef646d4f8
removed mark_nvidia.py script
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
a6308118b4
removed perf4au test
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
5a85f1b6da
renamed gpucodec namespace -> cudacodec
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
8282f6ebc1
renamed gpu::cudev namespace -> cuda::device
...
cudev is used for new device layer
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e12496d150
removed gpu name usage from ocl module
2013-09-02 14:00:41 +04:00
StevenPuttemans
7e638cb0b5
Bugfix 3115: Added not to documentation for python version for
...
facerecognizer interface + white + whitespaces remove
2013-09-02 11:59:35 +02:00
Roman Donchenko
bd7930ada1
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
2013-09-02 13:09:22 +04:00
hbristow
c112c9aa00
Made binding compilation less verbose
2013-09-02 16:43:58 +10:00
hbristow
31c95ff7f8
Added new OpenCV definitions to bridge
2013-09-02 14:29:46 +10:00
hbristow
cf078be3d6
Merge branch 'matlab' into matlab_public
...
Conflicts:
CMakeLists.txt
README.md
samples/
2013-09-02 14:23:11 +10:00
peng xiao
3c2a8912ee
Let clAmdBlas library initialize once during program lifetime.
2013-09-02 10:06:01 +08:00
hbristow
1d25e5f1ba
manually added optical flow header to build
2013-09-01 17:10:44 +10:00
Daniel Angelov
24e916059f
Added LineSegmentDetector documentation and an output image.
2013-08-31 13:46:24 +03:00
Daniel Angelov
9d78b8003e
Update on LSD no to use any Mat* (IOArrays instead).
...
Updated to new license.
2013-08-31 13:46:24 +03:00
Roman Donchenko
7e4c0ac4d6
Merge pull request #1371 from HapeMask:fix-png-warnings
2013-08-30 17:56:06 +04:00
Roman Donchenko
46d74d7c6b
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
2013-08-30 17:55:07 +04:00
Gabe Schwartz
b2bedef26f
Added interlace handling to PNG decoder.
...
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
2013-08-30 09:49:24 -04:00
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
2013-08-30 09:49:24 -04:00
Alex Leontiev
af74ec6044
Minor fixes
...
In response to the pull request comments by Vadim Pisarevsky. In
particular, the following was done:
*)cv::reduce use instead of custom code for calculating
per-coordinate sum
*) naming style of private methods is made consisted with overall --
mixed-case style
*) irrelevant create()'s were removed -- I did not know that copyTo()
method itself calls create
2013-08-30 21:37:27 +08:00
Alex Leontiev
f2fd0ad153
Fixed .rst indentation
...
This caused warnings.
2013-08-30 21:37:27 +08:00
Alex Leontiev
b92c88ddd1
Removed trailing spaces
...
Continuation of work done in previous commit.
2013-08-30 21:35:47 +08:00
Alex Leontiev
b1f029ccc5
Removed trailing spaces
...
This caused warnings.
2013-08-30 21:35:47 +08:00
Alex Leontiev
554e002747
Prepare Downhill Simplex for pull request
...
This is an implementation of so-called downhill simplex method
(https://en.wikipedia.org/wiki/Nelder%E2%80%93Mead_method )
Please, let me know if you have any comments, whoever you'd be.
2013-08-30 21:35:47 +08:00
Roman Donchenko
42b4d830e8
Merge pull request #1266 from kdrobnyh:core_stat_functions
2013-08-30 17:26:20 +04:00
Roman Donchenko
96a0afce50
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
2013-08-30 17:25:07 +04:00
StevenPuttemans
e7921c3fe7
Added changes suggested by bug #3186 : fixing the unplugging of webcam
2013-08-30 13:16:18 +02:00
StevenPuttemans
15f1a48ec4
Updated with comments of speclad
2013-08-30 12:50:06 +02:00
abidrahmank
7fd8a19fe8
warning corrections
2013-08-30 15:58:10 +05:30
Roman Donchenko
114bec52fe
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
2013-08-30 12:24:24 +04:00
hbristow
a64c34c3ec
Updated cv help to include reference to named arguments
2013-08-30 16:48:41 +10:00
hbristow
d16d637eb2
Fixed handling of optional arguments under ArgumentParser. Fixed default constructor error in MxArray
2013-08-30 16:10:32 +10:00
hbristow
25ee1f9099
Improved error messages for incorrect arguments
2013-08-30 15:48:20 +10:00
abidrahmank
14af369640
Python bindings for KeyPoint methods
...
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
2013-08-30 11:11:06 +05:30
hbristow
a780c3a7d1
Swapped out function assertions in favour of ArgumentParser
2013-08-30 15:06:57 +10:00
hbristow
8f62a52b9b
Brought matlab module into cv namespace
2013-08-30 12:39:01 +10:00
hbristow
bc93edac34
Removed all OpenCV-specific functionality from mxarray into bridge. mxarray is now standalone
2013-08-30 11:18:08 +10:00
kdrobnyh
f4aa7ff919
Add IPP support in meanStdDev, minMaxIdx, norm functions
2013-08-29 21:09:19 +04:00
hbristow
153549c7f6
Added LICENSE and Americanizations
2013-08-30 01:09:29 +10:00
hbristow
33c377b305
complete rewrite of ArgumentParser
2013-08-30 01:04:43 +10:00
Alexander Smorkalov
114e04ee12
OpenCV version++. Current OpenCv version 2.4.6.2
2013-08-29 19:00:13 +04:00
Alexander Smorkalov
ba26f6d48a
Native camera libraries updated.
...
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
(cherry picked from commit fff91eef0b
2013-08-29 18:46:45 +04:00
ilya-lavrenov
a6084d2970
enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal
2013-08-29 18:39:09 +04:00
ilya-lavrenov
968c095403
gpu -> ocl
2013-08-29 18:32:06 +04:00
StevenPuttemans
caaf440bd8
Added fix in CMakeLists.txt for contrib module.
2013-08-29 16:09:48 +02:00
kdrobnyh
7a7aa148d4
Add IPP support in compare function
2013-08-29 17:55:57 +04:00
Roman Donchenko
fc37df05ec
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
2013-08-29 16:35:38 +04:00
Roman Donchenko
86f4cd253a
Merge pull request #1309 from pengx17:master_retina_ocl
2013-08-29 16:26:55 +04:00
Alexander Smorkalov
5af2cc6223
AutoBuffer with initial zero size fixed.
2013-08-29 15:03:53 +04:00
Jin Ma
114f3266d8
Removed performance test.
2013-08-29 17:35:47 +08:00
Jin Ma
4f3349ffe4
Added perf namespace.
2013-08-29 16:24:26 +08:00
Jin Ma
0233c4c198
Removed whitespace.
2013-08-29 15:49:02 +08:00
Jin Ma
14e083f1e0
Removed trailing whitespace
2013-08-29 14:09:00 +08:00
Jin Ma
5728612f95
Removed the trailing whitespace
2013-08-29 14:06:03 +08:00
yao
ab235cda74
fix warnings
2013-08-29 11:59:19 +08:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08:00
hbristow
d5abe79f74
untracked io for initial pull request
2013-08-29 10:49:15 +10:00
hbristow
9726346bc9
removed unused files from repo
2013-08-29 10:44:27 +10:00
hbristow
57505b9af9
Added LICENSE preamble to include files
2013-08-29 10:20:53 +10:00
Vadim Pisarevsky
f12702be24
fixed bugs in rectangular morphology case
2013-08-28 19:53:40 +04:00
Roman Donchenko
11dcd4f4f3
Merge pull request #1356 from SpecLad:homography-uninit
2013-08-28 18:05:10 +04:00
Vadim Pisarevsky
771feb61c2
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
2013-08-28 17:00:26 +04:00
Roman Donchenko
2b90b20be2
Merge pull request #1357 from SpecLad:less-precomps
2013-08-28 14:52:28 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Roman Donchenko
cdf6cf2cd8
Merge pull request #1213 from kdrobnyh:color
2013-08-28 13:31:09 +04:00
Roman Donchenko
122d0f8685
Deleted the now-empty ocl perf_precomp.cpp.
...
See pull request #1241 for why.
2013-08-28 13:26:30 +04:00
Roman Donchenko
5e4ebf3403
Fixed incomplete matrix initialization in HomographyRefineCallback.
2013-08-28 13:20:14 +04:00
Roman Donchenko
8bb9994094
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
2013-08-28 12:46:01 +04:00
peng xiao
9f0a88c1d6
Remove trailing whitespace.
2013-08-28 16:23:46 +08:00
Roman Donchenko
10cb9a0c4a
Merge pull request #1342 from nevion:master
2013-08-28 12:00:39 +04:00
hbristow
569e8006e3
updated README.md formatting
2013-08-28 17:58:08 +10:00
hbristow
2a0e357cd0
updated syntax highlighting
2013-08-28 17:56:39 +10:00
hbristow
b87197dc37
updated syntax highlighting
2013-08-28 17:53:25 +10:00
hbristow
eb83a9ed9f
Enabled syntax highlighting
2013-08-28 17:49:20 +10:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
hbristow
2ac31a87c9
Added tutorial for writing your own mex files
2013-08-28 17:40:20 +10:00
hbristow
78dc2c5423
Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler
2013-08-28 17:06:19 +10:00
hbristow
52dc51a62c
Added custom OpenCV mex compiler
2013-08-28 12:01:34 +10:00
peng xiao
287c8a3330
Let ocl::context only be initialized once in retina_ocl test.
2013-08-28 09:17:05 +08:00
Fedor Morozov
9f9873017c
HDR test changes
2013-08-28 02:17:49 +04:00
ilya-lavrenov
3c86aa4ae1
appended ocl::finish to test_cycle defines
2013-08-28 00:39:58 +04:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
dd25f416a6
War on Whitespace, master edition: tabs.
2013-08-27 17:13:53 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
45a0b39a73
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
2013-08-27 12:37:33 +04:00
Jason Newton
affab4f156
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
2013-08-27 00:34:22 -07:00
Vladislav Vinogradov
bff0fad6c3
gpu TVL1 Optical Flow optimization:
...
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
2013-08-27 11:21:41 +04:00
peng xiao
040b3b8265
Remove trailing whitespace.
2013-08-27 13:02:34 +08:00
peng xiao
c74c517ce3
Fix build error.
2013-08-27 11:56:11 +08:00
peng xiao
168d1dc18c
Make some tweaks to make sum operations less frequently
2013-08-27 11:42:54 +08:00
Roman Donchenko
525b6eca2e
Merge pull request #1311 from leszekhanusz:png_palette_alpha
2013-08-26 16:59:45 +04:00
Roman Donchenko
b43890a7e1
Merge pull request #1326 from ilya-lavrenov:perf_ocl
2013-08-26 16:54:59 +04:00
Roman Donchenko
0daac6fd9d
Merge pull request #1327 from alalek:ocl_master_tests_fix
2013-08-26 16:44:37 +04:00
Roman Donchenko
d44adcd6e8
Merge pull request #1336 from jet47:gpu-resize
2013-08-26 16:40:50 +04:00
Fedor Morozov
833f8d16fa
Robertson and tutorial
2013-08-26 15:23:37 +04:00
ilya-lavrenov
d02ccc9590
the code was refactored and old test system code was removed
2013-08-26 12:36:31 +04:00
ilya-lavrenov
4c28a6f0f6
most of the performance tests was rewritten in google-test manner
2013-08-26 11:43:44 +04:00
ozantonkal
d83be1dccc
fixes based on the feedback: window name prefix is automatically added when it is not there, singleton class returns reference instead of pointer, destructor is private, release function implemented
2013-08-23 18:49:21 +02:00
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
2013-08-23 18:46:54 +04:00
Maria Dimashova
989be02562
fixed cpp wrappers of ML tree-based models
2013-08-23 18:13:10 +04:00
Vladislav Vinogradov
21c4753fed
used global memory access for up-scaling
2013-08-23 18:08:06 +04:00
Roman Donchenko
3182e68b8a
Merge pull request #1334 from MarkBelmont:bugfix_1
2013-08-23 16:49:51 +04:00
Roman Donchenko
cae4480834
Merge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-23 14:47:49 +04:00
Vladislav Vinogradov
d1f6a23abf
improved texture usage:
...
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
241cc417f9
added custom implementation for nearest and linear interpolation
2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
3b05acf936
reorganize code for further modifiction
2013-08-23 13:56:35 +04:00
MarkBelmont
cf34b3d65b
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
2013-08-23 16:39:39 +08:00
Vladislav Vinogradov
f826bd8bce
removed NPP implementation
2013-08-23 12:16:41 +04:00
peng xiao
2519a21935
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
...
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
2013-08-23 15:35:55 +08:00
Alexander Alekhin
7685b983db
OCL: tests: repair moments implementation in master branch, enable tests
2013-08-22 23:37:06 +04:00
Fedor Morozov
e2e604eb18
HDR writing bug fix
2013-08-22 21:13:50 +04:00
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
2013-08-22 18:17:19 +04:00
Ilya Lavrenov
6c4ad9b597
fixer error with incorrect condition
2013-08-22 17:38:55 +04:00
Ilya Lavrenov
ec461a2ff0
added a test for ocl::norm
2013-08-22 17:37:48 +04:00
Alexander Alekhin
b7b584984e
OCL: tests: repair/disable failed tests in ocl module
2013-08-22 17:06:47 +04:00
Roman Donchenko
20bf1aa244
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix
2013-08-22 12:46:00 +04:00
Roman Donchenko
fe4c7ae4ae
Merge pull request #1317 from jet47:gpu-tvl1-optimization
2013-08-22 11:55:24 +04:00
Roman Donchenko
43aec5ad4a
Merge pull request #1318 from SpecLad:wow
2013-08-22 11:49:45 +04:00
Jin Ma
1e8194fd3c
Optimized mog and mog2, which have much better performance.
2013-08-22 15:42:07 +08:00
Alexander Smorkalov
8aae54b7f4
WindowsRT mode build warning fix.
2013-08-21 23:59:27 -07:00
Mathieu Barnachon
4fbd5707f7
Fix warning on precision lost due to double to float conversion.
2013-08-22 17:34:31 +12:00
Mathieu Barnachon
7f3273c77f
Adding an export for HOGDetector compatibility.
...
An SVM train with HOG could export a single vector for HOGDetector.
2013-08-22 15:00:32 +12:00
Roman Donchenko
9c60a2c24c
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
ebb6c842f9
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
2013-08-21 18:28:36 +04:00
Alexander Smorkalov
b15addec70
C4447 warning about main function format suppressed.
2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a
Invalid usage of cv::Ptr for arrays fixed.
2013-08-21 07:20:35 -07:00
Vladislav Vinogradov
de214950c4
minor gpu TVL1 optical flow optimization:
...
don't calc diff term if it is not used for epsilon criterion
2013-08-21 18:17:45 +04:00
Roman Donchenko
1a7c2eefb8
Merge pull request #1306 from jet47:gpu-bitwize-fix
2013-08-21 16:18:31 +04:00
Roman Donchenko
893e8b4371
Merge pull request #942 from achalddave:patch-1
2013-08-21 16:06:31 +04:00
Hanusz Leszek
32635a6834
using unsigned char instead of uint8_t to compile under windows
2013-08-21 12:33:51 +02:00
Roman Donchenko
84a9755597
Merge pull request #1215 from jet47:cuda-5.5-sanity
2013-08-21 13:25:28 +04:00
peng xiao
9b20b51389
Fix build error on Mac
2013-08-21 14:23:10 +08:00
Vladislav Vinogradov
2899d558ac
record cuda gpu name to output report
2013-08-21 10:12:44 +04:00
Vladislav Vinogradov
b7ec673001
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
2013-08-21 10:00:40 +04:00
Hanusz Leszek
cf39ba5801
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
...
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
2013-08-21 05:31:44 +02:00
peng xiao
3cccded86d
Fix build error when WITH_OPENCL is disabled.
2013-08-21 11:18:02 +08:00
ozantonkal
6bc393676d
cv::viz::get(window_name) implementation
2013-08-20 20:22:14 +02:00
ozantonkal
c37f091cc5
remove redundant statement
2013-08-20 18:18:01 +02:00
Roman Donchenko
a1b633e28e
Merge pull request #1298 from jet47:gpu-eliminate-doubles
2013-08-20 18:04:54 +04:00
Vladislav Vinogradov
cb2985c526
fixed gpu bitwize operation:
...
incorrect types for template instantiation
2013-08-20 16:28:45 +04:00
Roman Donchenko
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
2013-08-20 14:10:22 +04:00
ozantonkal
669abd58bc
initial shared pointer implementation for Viz3d, singleton VizAccessor, cv::viz::get function initial implementation
2013-08-19 20:09:47 +02:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Alexander Smorkalov
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
2013-08-19 16:27:06 +04:00
Vladislav Vinogradov
cd2b7448f4
eliminate unnecessary double arithmetics in CUDA
2013-08-19 15:56:45 +04:00
kdrobnyh
c1de14c27a
Fix bilateralFilter function
2013-08-19 15:52:34 +04:00
Roman Donchenko
0b270e2b08
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
2013-08-19 14:26:12 +04:00
Roman Donchenko
70fffa48e5
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
2013-08-19 14:14:22 +04:00
Vladislav Vinogradov
7bda6992e5
fixed gpu BGR <-> YUV color conversion
2013-08-19 13:17:55 +04:00
Vladislav Vinogradov
9f33de7071
added cvconfig.hpp header file to gpu tests
...
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
2013-08-19 12:46:57 +04:00
Roman Donchenko
473ca0849d
Merge pull request #1285 from SpecLad:enum-compare
2013-08-19 12:00:18 +04:00
Vladislav Vinogradov
cfbd791465
fixed gpu cvtColor for BGR <-> YUV
2013-08-19 11:56:58 +04:00
Mathieu Barnachon
43c9818895
Adding class for BOW image matcher (Feature #3005 ).
...
Same prototype as BOWImgDescriptorExtractor, but do only the matching.
If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
Add a class to compute the keypoints, descriptors and matching from an image should be added to.
2013-08-18 11:32:04 +12:00
kdrobnyh
3c9f307193
macros -> template in IPP support cvtColor
2013-08-17 20:04:03 +04:00
Nghia Ho
c6858c3fb0
Buffer is accessed out of bounds.
2013-08-17 20:32:13 +10:00
Nghia Ho
d36dbe6ad6
Merge https://github.com/Itseez/opencv
2013-08-17 20:07:37 +10:00
Roman Donchenko
449b99a6d7
Merge pull request #1286 from SpecLad:optflow-sf-init
2013-08-16 19:59:26 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Roman Donchenko
7d768d2159
In calcOpticalFlowSF, fixed several uninitialized uses of matrices.
...
This should fix that pesky test failure that pops up from time to time.
I don't actually know if the default values should be zeros, but the tests
pass, so...
2013-08-16 14:43:18 +04:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
2013-08-16 13:58:14 +04:00
Roman Donchenko
2304a561ca
Fixed a -Wenum-compare warning in cudev.
2013-08-16 13:53:37 +04:00
Jin Ma
1bcd1fd3a2
Used perf_precomp.hpp instead of precomp.hpp for test.
2013-08-16 17:39:17 +08:00
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
2013-08-16 12:52:48 +04:00
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
2013-08-16 12:22:18 +04:00
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
2013-08-16 12:10:07 +04:00
Jin Ma
a3aa7966ae
Resolved compiling errors under Linux.
2013-08-16 16:07:53 +08:00
Roman Donchenko
35cb59bb22
Merge pull request #1258 from apavlenko:java_video_capture
2013-08-16 12:05:13 +04:00
Jin Ma
916b92bc3b
Resolved a compiling warning under Windows.
2013-08-16 15:33:43 +08:00
Jin Ma
8feaadc69f
Resolved a compiling error under Linux.
2013-08-16 15:25:11 +08:00
Jin Ma
3fb0bf6e99
Added MOG and MOG2.
2013-08-16 14:19:46 +08:00
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
2013-08-15 23:49:32 +04:00
Roman Donchenko
95143fdc13
Merge pull request #1275 from rdm12:bug_1922
2013-08-15 19:12:23 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52
applied comments after review
2013-08-15 16:18:01 +04:00
Nghia Ho
d194bb6143
Merge https://github.com/Itseez/opencv
2013-08-15 21:51:36 +10:00
Roman Donchenko
556028eff5
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
2013-08-15 11:54:55 +04:00
Bahram Dahi
83e21568ee
Minor bug fix, missing const in method signature
2013-08-14 15:54:13 -07:00
Bahram Dahi
6cf9070b9a
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
2013-08-14 15:08:34 -07:00
kamjagin
ed29d91d42
adding std to cstdint typedef of uint32_t
2013-08-14 17:16:52 +02:00
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
2013-08-14 17:16:52 +02:00
Roman Donchenko
d09c89c63e
Merge pull request #1265 from abidrahmank:misc_docs2
2013-08-14 19:03:45 +04:00
Roman Donchenko
7b95bb20f7
Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4
2013-08-14 18:50:26 +04:00
Roman Donchenko
902aa309f8
Merge pull request #1270 from rdm12:bugfix_3094
2013-08-14 18:49:38 +04:00
Dmitry Retinskiy
f013baf739
bug #1922 : restored most of the class definitions in basic_structures.rst
2013-08-14 17:37:59 +04:00
Roman Donchenko
6ae9870de4
Merge pull request #1254 from pengx17:2.4_filter2d_
2013-08-14 17:27:18 +04:00
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
2013-08-14 17:25:01 +04:00
Nghia Ho
2c9c4188ae
Merge https://github.com/Itseez/opencv
2013-08-14 22:38:39 +10:00
kamjagin
69287c936b
missed # in if defined
2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926
added HAVE_QTKIT to tests
2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
Dmitry Retinskiy
4eb85189e5
bug #3094 : added CV_Assert to PyrDown_ to check if source matrix is not empty
2013-08-14 15:30:35 +04:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Roman Donchenko
bcba3fc6b8
Merge pull request #1263 from abidrahmank:pyCLAHE_24
2013-08-14 12:10:22 +04:00
Roman Donchenko
18358521f2
Merge pull request #1162 from jet47:cudev-integration
2013-08-14 12:00:34 +04:00
Achal Dave
0bc609257d
Comparing rejected stage index with minimum required neighbors does not make sense
...
As described here, http://code.opencv.org/issues/3064 , the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
2013-08-13 20:42:04 -07:00
peng xiao
124ede611b
Update with apavlenko's suggestions.
2013-08-14 10:00:09 +08:00
abidrahmank
1b93ecfae8
docs changes
2013-08-13 22:07:44 +05:30
abidrahmank
92d04d439e
docs changes
2013-08-13 21:58:49 +05:30
abidrahmank
96c1df14f4
CLAHE Python bindings
2013-08-13 19:51:32 +05:30
Roman Donchenko
43c7a8ae93
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
2013-08-13 16:34:19 +04:00
Andrey Pavlenko
f3b1933a92
LinkedList -> ArrayList
2013-08-13 15:51:37 +04:00
Nghia Ho
79965c9ee9
Replaced isfinite() with cvIsInf and cvIsNan
2013-08-13 21:26:21 +10:00
Nghia Ho
723bc3cae9
Merge https://github.com/Itseez/opencv
2013-08-13 19:50:43 +10:00
Andrey Pavlenko
4902db1c42
also fixing JNI library name in JUnit tests
2013-08-13 13:18:01 +04:00
peng xiao
2fb2ac8836
Apply bugfix #3121 for OCL.
2013-08-13 17:17:07 +08:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
peng xiao
29eefe52bb
Add OpenCL accelerated implementation for Retina.
2013-08-13 16:27:12 +08:00
Andrey Pavlenko
d4e098f401
enabling of VideoCapture(String) [fixing issue #3207 ]
...
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
2013-08-13 12:04:36 +04:00
peng xiao
7fe8403074
Let ocl::filter2D support kernel size >= 3.
2013-08-13 13:58:55 +08:00
Roman Donchenko
390b67e5a0
Merge pull request #1251 from StevenPuttemans:bugfix_3209
2013-08-12 18:56:35 +04:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
Roman Donchenko
d8c6e89a54
Merge pull request #1238 from SpecLad:cmake-min-ver
2013-08-12 15:50:23 +04:00
Roman Donchenko
57c1e8f333
Merge pull request #1242 from asmorkalov:android_native_cam
2013-08-12 14:47:48 +04:00
Roman Donchenko
504ebda7c4
Merge pull request #1235 from WonderRico:bugfix_dshow
2013-08-12 14:33:30 +04:00
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
fd056235d3
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
2013-08-12 11:44:38 +02:00
WonderRico
d067749c21
fix _index / index
2013-08-12 11:19:53 +02:00
Roman Donchenko
98cd04c191
Merge pull request #1163 from kdrobnyh:Morphology
2013-08-12 12:06:31 +04:00
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
2013-08-12 10:04:15 +02:00
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
2013-08-12 09:49:19 +02:00
ozantonkal
b69a97bef3
access focal length and principal point in camera
2013-08-12 09:07:50 +02:00
hbristow
ef2c1e1a24
Changed bad cast in MxArray
2013-08-12 11:38:59 +10:00
hbristow
fb41d7bf4e
Commenting spree no.2
2013-08-12 00:52:27 +10:00
hbristow
bfa88384c7
Updated documentation
2013-08-11 16:12:05 +10:00
hbristow
e63369fe64
Updated nest list in markdown
2013-08-11 15:14:09 +10:00
hbristow
1e78a187db
Updated nest list in markdown
2013-08-11 14:49:33 +10:00
hbristow
7786ed7bcb
Updated nest list in markdown
2013-08-11 14:48:29 +10:00
hbristow
a269e3216e
Updated nest list in markdown
2013-08-11 14:46:28 +10:00
hbristow
542c88c60b
Updated nest list in markdown
2013-08-11 14:44:25 +10:00
hbristow
5ed9365bac
Updated nest list in markdown
2013-08-11 14:43:15 +10:00
hbristow
115a1471ae
Updated nest list in markdown
2013-08-11 14:42:30 +10:00
hbristow
6f811f5cb3
Documentation spree no.1
2013-08-11 14:36:50 +10:00
WonderRico
a048387376
fix formating
2013-08-09 16:13:40 +02:00
Alexander Smorkalov
fff91eef0b
Native camera libraries updated.
...
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
2013-08-09 17:43:21 +04:00
ozantonkal
4a1573de9b
principal point is always set even though the intrinsic parameters are not given (center of window), fixed computation mistakes in setWindowSize in camera class
2013-08-09 10:39:30 +02:00
Roman Donchenko
167abf0dae
Merge pull request #1244 from vkocheganov:bugfix_3179
2013-08-09 11:49:27 +04:00
hbristow
7aaefd4dce
Improved escaped character formatting in docs
2013-08-09 15:15:08 +10:00
kocheganovvm
e4b201be25
Fix unsequenced modifications (Bug #3179 ).
2013-08-08 18:55:47 +04:00
Roman Donchenko
4dc63273f0
Renamed ocl tests' precomp files according to convention.
...
Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
2013-08-08 18:18:54 +04:00
ozantonkal
bb057491ea
create camera from projection matrix (used for getCamera in viz)
2013-08-08 12:14:27 +02:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
kdrobnyh
7da5fa01d4
Removed extra {} in erosion and dilation functions
2013-08-08 12:30:28 +04:00
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
2013-08-08 12:03:41 +04:00
Roman Donchenko
79b6f68f54
Merge pull request #1233 from vpisarev:24_ipp_78
2013-08-08 12:00:52 +04:00
hbristow
a659562c36
Changed command-line separator from module:file to module=file so that it works cross-platform
2013-08-08 05:26:56 +10:00
hbristow
3bf41c2832
Formatted URLs in the documentation so that they are redirected to the system browser instead of the builtin Matlab browser
2013-08-08 04:46:45 +10:00
Vadim Pisarevsky
d5539975d7
polished the patch
2013-08-07 22:34:29 +04:00
hbristow
fad7b35b9a
Updated documentation formatting
2013-08-08 03:51:44 +10:00
Andrey Pavlenko
1c55096c01
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
2013-08-07 21:05:43 +04:00
hbristow
059d63cceb
Added diagnostic/build information function
2013-08-08 02:42:17 +10:00
Nghia Ho
95ee02ba8e
Added extra comment to test buildbot
2013-08-08 01:33:21 +10:00
ozantonkal
71dc5f8291
simulate real cameras by working around vtkUserTransform to set projection matrix
2013-08-07 16:20:23 +02:00
ozantonkal
422b967e9a
fix computeProjectionMatrix in Camera class, also check if there is principal point defined
2013-08-07 15:52:24 +02:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Roman Donchenko
e23f31311d
xls-report.py: separated image width and height for easier analysis.
2013-08-07 13:43:03 +04:00
hbristow
f705020348
Linked online documentation now opens a browser window to the exact function reference using div tags
2013-08-07 19:28:58 +10:00
Roman Donchenko
95bdd4b670
Merge pull request #1189 from pengx17:2.4_sort_by_key
2013-08-07 11:41:23 +04:00
ozantonkal
5335489daa
viz getWindowSize, setWindowSize
2013-08-07 09:28:39 +02:00
Fedor Morozov
19082e0504
Documentation update
2013-08-07 11:15:41 +04:00
peng xiao
5aaed77cbc
Fix a bug of retinaParameters.
...
When colorMode is set to 0 via Retina::_init method, _retinaParameters's
colorMode variable is not correctly assigned.
2013-08-07 14:36:24 +08:00
hbristow
3483bf14b9
Added auto-generated docs to all OpenCV functions
2013-08-07 16:34:30 +10:00
Nghia
18e7aa5d19
Update intersection.cpp
...
Added #ifdef _WIN32 for finite number testing
2013-08-07 14:57:12 +10:00
Andrey Pavlenko
04c86f28b1
Merge pull request #1228 from vkocheganov:bug_3191
2013-08-06 21:01:40 +04:00
Andrey Pavlenko
a7da129984
Merge pull request #1187 from kdrobnyh:mean_and_sum
2013-08-06 20:54:52 +04:00
WonderRico
7e7fb0b75d
Bug #3201 fix
2013-08-06 18:35:49 +02:00
hbristow
faeb0aa92a
Now using python ArgumentParser to parse command line arguments in preparation for adding doc generation
2013-08-07 01:41:10 +10:00
hbristow
c5ffd1fdea
Updated main Matlab help string
2013-08-07 01:10:51 +10:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
hbristow
7ef3be3429
By default, all function now export at least one return value back into the Matlab workspace, even if none are requested. This is in line with Matlab's calling convention, where functions called without an lvalue or a semicolon have their first output printed to the terminal
2013-08-07 00:14:13 +10:00
Fedor Morozov
3725c1fb4c
Documentation updates
2013-08-06 18:13:34 +04:00
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
131458847b
Make ts always static.
...
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
2013-08-06 17:56:25 +04:00
Fedor Morozov
e914fc2471
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-08-06 17:49:29 +04:00
Fedor Morozov
4a4c5190f0
Documentation updates
2013-08-06 17:49:02 +04:00
Alexander Shishkov
3c218717a9
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-08-06 15:41:39 +04:00
Alexander Shishkov
c4fb0e9dbb
few changes for compilation
2013-08-06 15:41:32 +04:00
Fedor Morozov
bef8d8192e
Minor fixes, new MergeDebevec
2013-08-06 15:24:01 +04:00
hbristow
8f92973b8c
Started documentation skeleton
2013-08-06 21:16:38 +10:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
kocheganovvm
e9b9a6fc03
Fix unsequenced assignment (Bug #3191 ).
2013-08-06 08:08:13 +04:00
hbristow
b654413567
Added mixed-precision check when attempting to link to an OpenCV version with different bitness. Bindings now compiling and linking on my Windows 7 VM with VS2012 and Matlab R2013a
2013-08-06 13:01:57 +10:00
ozantonkal
731a931c0c
field of views are in radians
2013-08-05 19:35:20 +02:00
ozantonkal
32985aa724
fix camera constructor, add tentative KinectCamera method
2013-08-05 19:22:43 +02:00
ozantonkal
9c20e77013
fix conversion functions to use appropriate vtk function
2013-08-05 18:39:36 +02:00
Fedor Morozov
4c0f7f9e59
Tonemapping documentation update
2013-08-05 20:35:48 +04:00
Fedor Morozov
cb999a231e
Mantiuk's tonemapping
2013-08-05 19:31:10 +04:00
Fedor Morozov
17609b90c7
Mantiuk's tonemapping
2013-08-05 19:22:42 +04:00
hbristow
48aac747ca
removed pkg_resources (setuptools) dependency from jinja. Matlab module now has no python dependencies beyond the core python libs
2013-08-06 00:40:57 +10:00
ozantonkal
f8ad3c0204
fix field of view computation in setWindowSize
2013-08-05 16:06:02 +02:00
ozantonkal
119d97f1f6
remove old camera, rename new camera
2013-08-05 15:37:08 +02:00
ozantonkal
f060eee5a5
fix window_size setter, remove camera related old methods from viz3d
2013-08-05 15:10:17 +02:00
ozantonkal
439ba98e0a
initial implementation of projection matrix, 3D to window coordinates, window coordinates to 3D ray (not yet tested)
2013-08-05 13:01:21 +02:00
Roman Donchenko
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
2013-08-05 12:58:37 +04:00
Roman Donchenko
4fb2e9a85a
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
2013-08-05 12:52:15 +04:00
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
2013-08-05 11:45:17 +04:00
hbristow
d00f4e267b
Added Windows dll versioning and Debug library postfix checks. Dependent libraries now being found by linker :)
2013-08-05 17:37:48 +10:00
Andrey Pavlenko
a06891851d
fixing compilation with -Werror=format-security enabled
2013-08-05 11:11:54 +04:00
Andrey Pavlenko
4c03afe006
Merge pull request #1079 from AlexeySpizhevoy:master
2013-08-05 10:54:44 +04:00
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Andrey Pavlenko
487ff4f3aa
Merge pull request #1151 from jet47:gpubgsegm-refactoring
2013-08-05 10:20:00 +04:00
hbristow
ecb506842b
Added Windows-specific configuration lookup for linker paths
2013-08-05 14:49:12 +10:00
Mathieu Barnachon
ff85575b28
Adding read/write functions to PCA class. Update PCA test.
2013-08-05 12:06:55 +12:00
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +04:00
Alexander Smorkalov
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
ozantonkal
0bb89e767a
fix field of view formula in camera class, implement get camera
2013-08-04 17:01:41 +02:00
hbristow
dfda79e673
Added passthrough of CXX FLAGS to mex compiler
2013-08-05 00:44:38 +10:00
ozantonkal
f445f76213
initial setCamera implementation
2013-08-03 16:33:11 +02:00
ozantonkal
4953786de1
remove boost include (caused by Kdevelop autocomplete)
2013-08-03 15:42:10 +02:00
ozantonkal
e4e9ed876f
spheres trajectory widget implementation
2013-08-03 15:40:36 +02:00
ozantonkal
a76cc9ef88
initial camera implementation (camera2), fix bug (zeros method)
2013-08-03 15:24:15 +02:00
ozantonkal
8fa6b6a6ef
initial setViewerPose implementation
2013-08-03 15:24:15 +02:00
Alexander Shishkov
6df203c449
Fixes for Linux compilation, small changes
2013-08-03 01:45:20 +04:00
Andrey Pavlenko
ee8687ba19
Merge pull request #1214 from StevenPuttemans:feature_3169_others
2013-08-02 17:59:06 +04:00
Vladislav Vinogradov
d13ecd0d76
increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5
2013-08-02 17:31:34 +04:00
Andrey Pavlenko
f0d854ce39
Merge pull request #1205 from asmorkalov:winrt_api_cert_fix
2013-08-02 16:27:23 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Alexander Smorkalov
63786c389f
Warning and review notes fixes.
...
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
2013-08-02 04:10:56 -07:00
Anatoly Baksheev
54774f6d3b
updated license header
2013-08-02 13:45:43 +04:00
Anatoly Baksheev
69e66d7bb5
fixed little bug in makeCameraPose
2013-08-02 13:37:15 +04:00
Vladislav Vinogradov
55cb26551f
use NPP version for Fermi
2013-08-02 09:05:21 +04:00
Fedor Morozov
c51b50b44c
Algorithm names in code
2013-08-02 00:01:15 +04:00
Vladislav Vinogradov
a28cb99e88
optimized version of histEven for CV_8UC1
2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
bfca1afd9e
rewrite histEven test
2013-08-01 18:00:05 +04:00
Vladislav Vinogradov
c8d1fccdac
compare cv::gpu::calcHist with cv::calcHist
2013-08-01 18:00:05 +04:00
Fedor Morozov
ed0828d0a8
New HDR documentation
2013-08-01 15:34:03 +04:00
kdrobnyh
c1ad6a9ffb
Add IPP support in cvtColor function
2013-08-01 15:15:36 +04:00
peng xiao
fd77a49e76
Fix ocl compilation error when using Intel OpenCL SDK.
2013-08-01 13:06:33 +08:00
Fedor Morozov
302bf23f82
All hdr functions as Algorithms
2013-08-01 03:24:47 +04:00
Nghia Ho
bc3dd2452f
Added test cpp
2013-07-31 23:59:23 +10:00
Nghia Ho
61386e1abd
Merge https://github.com/Itseez/opencv
...
Keeping up to date
2013-07-31 23:40:34 +10:00
Nghia Ho
00f63fa8f7
Finished test code, added image to the doc
2013-07-31 23:08:02 +10:00
Alexander Smorkalov
e03ffde346
WinRT API Certification fixes for core and contrib.
2013-07-31 05:43:53 -07:00
Alexander Smorkalov
62b85a41da
TLS calls on WinRT replaced on variables with C++11 "thread" attribute.
2013-07-31 05:43:52 -07:00
Alexander Smorkalov
6257df1c4b
API restricted on WinRT partially removed from core.
...
Additional CMAKE flag WITH_WINRT added.
2013-07-31 05:43:51 -07:00
Andrey Pavlenko
9b5d1596dc
Merge pull request #891 from NCBee:2.4
2013-07-31 16:38:16 +04:00
Fedor Morozov
4d2ea847fa
Tonemap as 3.0 algorithm
2013-07-31 16:05:31 +04:00
Andrey Pavlenko
4c35449b7d
Merge pull request #1139 from StevenPuttemans:bugfix_3101
2013-07-31 15:14:03 +04:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
76a938c7ef
Merge pull request #1197 from apavlenko:fix_unstable_perf_tests
2013-07-31 15:07:19 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72
Added bugfix #2795
...
- changing license header
- fixed bug in QtKit when changing camera resolution
2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
hbristow
5e50791a9d
Generator and compiler now working on Windows. Moved matlab to correct VS solution folder
2013-07-31 12:37:05 +10:00
hbristow
58ca8ed97f
Improved finding Matlab on Windows machines. Needs testing on computers that have multiple version installed
2013-07-31 11:24:28 +10:00
Nghia Ho
27bcc0bf07
Merge https://github.com/Itseez/opencv
...
Keep up to date
2013-07-31 06:10:57 +10:00
berak
03c4a6299b
expanded the CV_Assert in pyrdown_ to check for empty mats
2013-07-30 17:32:48 +02:00
Andrey Pavlenko
0851766806
Merge pull request #1121 from pengx17:2.4_gftt_perf_test
2013-07-30 18:40:10 +04:00
Andrey Pavlenko
6a77bfb503
Merge pull request #1172 from StevenPuttemans:bugfix_3166_24
2013-07-30 18:39:41 +04:00
Andrey Pavlenko
c4e1edbb83
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
2013-07-30 18:22:08 +04:00
hbristow
627b9df85f
removed experimental IO from build
2013-07-31 00:00:50 +10:00
hbristow
6549e5e052
Added flaky support for finding Matlab on Windows machines
2013-07-30 23:58:32 +10:00
Nghia Ho
3fcdbbe734
Merge https://github.com/Itseez/opencv
2013-07-30 23:58:10 +10:00
Andrey Pavlenko
2b8d868560
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
2013-07-30 17:50:50 +04:00
Andrey Pavlenko
93923141d5
Merge pull request #1108 from nailbiter:optimLP
2013-07-30 17:50:31 +04:00
Andrey Pavlenko
b31293c984
Merge pull request #1194 from SpecLad:no-const-inputarray
2013-07-30 17:41:26 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Andrey Pavlenko
c43b896541
Merge pull request #1177 from janstarzy:refactor
2013-07-30 17:39:09 +04:00
Andrey Pavlenko
bc78e87a61
Merge pull request #1123 from bitwangyaoyao:2.4_fix
2013-07-30 17:13:27 +04:00
Andrey Pavlenko
26a3cabbf8
Merge pull request #1193 from SpecLad:exports-for-contrarians
2013-07-30 16:50:29 +04:00
Andrey Pavlenko
eb0d26b5be
fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')
2013-07-30 16:42:45 +04:00
Andrey Pavlenko
cd62f9f7cb
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
2013-07-30 16:14:24 +04:00
Andrey Pavlenko
c5e569d178
Merge pull request #1204 from berak:Bug_3170
2013-07-30 16:13:03 +04:00
Andrey Pavlenko
ea6002ebc7
Merge pull request #1185 from znah:cumpute_method_for_2_4
2013-07-30 15:46:48 +04:00
kdrobnyh
94bc4c4429
Some changes in erosion and dilation functions
2013-07-30 15:13:04 +04:00
Andrey Pavlenko
41d180f90a
Merge pull request #1198 from znah:py_flann_fix
2013-07-30 14:17:33 +04:00
peng xiao
8b90cb375a
Fix doc build error.
2013-07-30 14:12:22 +08:00
peng xiao
892c088e1b
Some modifications to sortByKey API.
...
Add documentation.
2013-07-30 11:53:25 +08:00
abidrahmank
fa1b96bd36
imshow docs improvement bug#2490
2013-07-30 07:00:51 +05:30
abidrahmank
9628bb0b44
morphologyex docs bug#2169
2013-07-30 06:46:59 +05:30
Alex Leontiev
3013ad6624
Minor fixes
...
Request to comments on pull request for simplex method. In particular
*) while(1) is replaced with for(;;)
*) if(true){...} constructions in tests are replaced with #if 1 ...
#endif
2013-07-30 04:14:36 +03:00
kdrobnyh
6af10a2937
Some changes in sum and mean functions
2013-07-30 00:54:27 +04:00
abidrahmank
29ddbbaa86
epilines pydocs
2013-07-30 00:27:58 +05:30
Fedor Morozov
258b98d15b
Tonemap as Algorithm
2013-07-29 21:35:10 +04:00
ozantonkal
f5816c883f
fix setting color of 3D objects
2013-07-29 15:10:48 +02:00
ozantonkal
b64e6ccc6c
static function for appending clouds in cloud collection widget
2013-07-29 15:06:05 +02:00
Andrey Pavlenko
301de6e038
Merge pull request #1202 from hansmi:docfix3149
2013-07-29 15:29:22 +04:00
Andrey Pavlenko
e213af6c0d
Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres
2013-07-29 15:25:56 +04:00
ozantonkal
42266b04a5
makeCameraPose implementation
2013-07-29 12:25:46 +02:00
berak
1b10860f36
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
2013-07-29 12:16:37 +02:00
ozantonkal
250dac5b71
fix: trajectory path is now relative to the global frame
2013-07-29 11:01:59 +02:00
Michael Hanselmann
cdc2ee9789
Documentation fix for cv::compare (issue 3149)
...
Since commit d8417af086
2013-07-28 16:19:19 +02:00
Nghia Ho
cb16f733b9
Added C interface
2013-07-28 15:31:58 +10:00
Nghia Ho
a40f217a38
changed from isnormal to isfinite, the prev ignored zero
2013-07-28 01:06:55 +10:00
Nghia Ho
a0576d7b2a
Fixed ret
2013-07-28 00:46:44 +10:00
Nghia Ho
e2f00ce846
New intersection function for rotated rectangles
2013-07-28 00:12:24 +10:00
Shervin Emami
7dc147c1f2
Changed cornerHarris description to say it finds corners, not edges
2013-07-26 19:13:25 -07:00
Frédéric Devernay
6be8757e8b
fix signedness error
...
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c
fix cap_qtkit.mm for multithreaded applications
...
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.
Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
2013-07-26 18:39:03 +02:00
ozantonkal
3fe5984e46
cloud collection widget implementation
2013-07-26 16:55:03 +02:00
Alexander Mordvintsev
25b9ac18e6
fixed Bug #3143 - flann 'not implemented' error
2013-07-26 17:59:38 +04:00
Andrey Pavlenko
3a0e26b89d
adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so)
2013-07-26 17:27:31 +04:00
ozantonkal
edfad34d39
trajectory with spheres and lines (based on the code snippet in gdocs)
2013-07-26 14:50:11 +02:00
Dmitry Retinskiy
1d571b1eaa
bugfix #3121 : corrected calculation of blue channel index
2013-07-26 16:31:39 +04:00
Vladislav Vinogradov
60e2dbe810
removed ffmpeg dependency from gpucodec module:
...
used implementation from highgui module
2013-07-26 16:13:37 +04:00
Roman Donchenko
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
2013-07-26 14:52:56 +04:00
Roman Donchenko
ee182eb086
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
...
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
2013-07-26 14:35:40 +04:00
Vladislav Vinogradov
dfd2957841
fixed gpu_perf4au perf test (added cuda impl)
2013-07-26 11:13:39 +04:00
peng xiao
a6d558042c
Fix build errors
2013-07-26 14:32:37 +08:00
Jin Ma
027b8021b1
Added farneback to superres module.
2013-07-26 14:14:40 +08:00
yao
270b2c7918
generating the lut table instead of hard coding one
2013-07-26 11:17:27 +08:00
kdrobnyh
4dfd40bec0
Add IPP mean and sum functions
2013-07-25 21:27:35 +04:00
Roman Donchenko
4ac2db271d
Removed CV_EXPORTS from all template classes (that I could find).
...
It doesn't make sense to export template classes, since there's no way
the user can learn that it can import them. In fact, it is somewhat
deleterious, because every module will export every instantiation
that it uses, but doesn't inline.
2013-07-25 19:40:08 +04:00
ozantonkal
b661d72252
CameraPositionWidget: a workaround for setting frustum color in the presence of an image
2013-07-25 16:47:30 +02:00
ozantonkal
ec756afe87
trajectorywidget display modes are combined with & instead of |
2013-07-25 16:08:23 +02:00
ozantonkal
64cdd82146
trajectory widget constructor with field of view
2013-07-25 15:08:45 +02:00
Jan Starzynski
d6b86d43c9
removed declaration of throwJavaException
2013-07-25 14:53:22 +02:00
Alexander Mordvintsev
57bd485119
compute method for Feature2D
2013-07-25 16:22:31 +04:00
Jan Starzynski
70930a30a1
refactored throwJavaException() and removed useless returns
2013-07-25 13:36:27 +02:00
Alex Leontiev
52b250f466
Minor fixes
...
Fixing failed build.
2013-07-25 14:30:20 +03:00
ozantonkal
7d458e852e
trajectory widget display options: display path, display frames, display both
2013-07-25 10:56:54 +02:00
ozantonkal
aa2594c06c
fix aspect_ratio computation from fovs, add casting for camerapositionwidget, trajectorywidget
2013-07-25 10:23:24 +02:00
Roman Donchenko
8afb7a40c6
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
2013-07-25 12:13:49 +04:00
Alexander Pacha
0b15cfd48c
Added FREAK-descriptor extractor to documentation.
...
Previously it was missing.
Ordered all descriptors by year of first publication.
2013-07-25 16:40:09 +12:00
Jan Starzynski
925e4eec98
removed multiplied code for exception handling
2013-07-24 17:27:03 +02:00
Nghia Ho
eb2720a908
missing fclose when returning early
2013-07-24 23:53:18 +10:00
Roman Donchenko
45f7c83da4
Merge pull request #1119 from 23pointsNorth:lsd
2013-07-24 13:50:11 +04:00
ozantonkal
769512db2d
move image copying structure to viz3d_impl: ConvertToVtkImage
2013-07-24 10:32:21 +02:00
ozantonkal
952029a47b
GridImpl structure to shorten grid widget implementation
2013-07-24 10:13:01 +02:00
ozantonkal
6e5a712f6e
Gridwidget with plane coefficients
2013-07-24 10:02:33 +02:00
ozantonkal
40b50755d3
add const keywords to gridwidget constructor
2013-07-23 15:46:14 +02:00
ozantonkal
4d70671231
intial implementation of frustum + image (the color of the frustum is currently dependent on the first pixel of the image)
2013-07-23 15:43:23 +02:00
lluis
c4f88b0687
removed some unnecessary ERStat members as they are easily computable from others
2013-07-23 15:04:01 +02:00
lluis
43e7e6e475
removed extra cv:: scope qualifiers for better readability
2013-07-23 14:37:45 +02:00
lluis
2087d4602b
using Rect for storing the bounding box instead of an integer array
2013-07-23 13:58:52 +02:00
StevenPuttemans
194af062ff
Adapted the reference underscore to link properly
2013-07-23 09:49:09 +02:00
StevenPuttemans
a92feafc49
Fixed bug 3166 - added paper reference to stardetector code
2013-07-23 08:49:25 +02:00
lluis
ca6b30a568
using explicit keyword in the ERStat constructor for safe contruction
2013-07-23 00:24:17 +02:00
ozantonkal
f9938da67d
image 3d widget with position, normal, up_vector
2013-07-22 17:18:19 +02:00
ozantonkal
d0bd344a42
image 3d widget use texture instead of imageactor for more flexibility (such as resizing)
2013-07-22 16:48:17 +02:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
ozantonkal
27f5cd2afd
overlay image widget constructor with Rect
2013-07-22 16:12:22 +02:00
ozantonkal
540f9a67f3
remove unnecessary declaration
2013-07-22 15:14:33 +02:00
