mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-30 21:25:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,125 Commits 6 Branches 127 Tags 3 GiB
bf84d476fc
Commit Graph

7903 Commits

Author SHA1 Message Date
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
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 (July 2011) cv::compare produces an array with
the same size and type as the input arrays.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
 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
ozantonkal
c0f44ca421 shorten Trajectory widget implementation 2013-07-22 15:03:28 +02:00
ozantonkal
5af739dfc1 plane widget size fix 2013-07-22 14:34:44 +02:00
ozantonkal
16c8c98895 trajectory widget with frustums 2013-07-22 14:11:06 +02:00
ozantonkal
f3b228c91f initial implementation of trajectory widget 2013-07-22 12:53:19 +02:00
Roman Donchenko
ef91d7e883 Merge pull request #1153 from abidrahmank:bgdGMG_docs 2013-07-22 14:52:36 +04:00
Vadim Pisarevsky
8b6afd697d added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin) 2013-07-22 14:20:13 +04:00
yao
3d3e9ab635 Fix the problem of haar caused by merge 2013-07-22 17:53:56 +08:00
Vladislav Vinogradov
6dfd8f184c rewrote matrix operations with cudev module 2013-07-22 13:07:07 +04:00
Roman Donchenko
1432f3a82c Fix xls-report.py not working with more than one comparison. 2013-07-22 12:48:43 +04:00
ozantonkal
13a2516a6a avoid memory leak in mesh widget 2013-07-22 09:11:16 +02:00
Vladislav Vinogradov
2311b0b43b added cudev::GpuMat_<T> support to Input/Output arrays 2013-07-22 10:33:40 +04:00
Vladislav Vinogradov
1c0d2b37a7 added globPtr for GpuMat 2013-07-22 10:33:39 +04:00
Vladislav Vinogradov
c23eb17997 added gridTransform/gridCopy overloads for GlobPtrSz 2013-07-22 10:33:39 +04:00
Daniel Angelov
6fa4834f31 Update on the class. Edited tests and samples. 2013-07-22 00:55:29 +03:00
Andrey Pavlenko
aaf47578e8 Merge pull request #1155 from bitwangyaoyao:master_fix 2013-07-21 18:50:39 +04:00
Andrey Pavlenko
f01cd3d99e Merge pull request #1158 from StevenPuttemans:bugfix_3165 2013-07-21 18:47:16 +04:00
Andrey Pavlenko
cdcb5ed134 Merge pull request #1156 from StevenPuttemans:bugfix_1873_new 2013-07-21 18:46:58 +04:00
Andrey Pavlenko
bd4d24f0fa Merge pull request #1122 from SpecLad:merge-2.4 2013-07-21 18:46:27 +04:00
Andrey Pavlenko
cd103e442f Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api 2013-07-21 18:45:47 +04:00
Fedor Morozov
af2c9077f7 Calibration, various changes 2013-07-21 13:56:20 +04:00
Fedor Morozov
703cf8cef7 Calibration, various changes 2013-07-21 13:48:57 +04:00
abidrahmank
297b67d2b1 pydocs for cv2.findTransformECC 2013-07-21 13:40:11 +05:30
Daniel Angelov
6f3d6ded47 Test case to strict, as overlapping lines (based on random places) may occur. 2013-07-21 10:39:24 +03:00
Daniel Angelov
68e348f960 Added private operator=. 2013-07-21 10:08:11 +03:00
Daniel Angelov
cedd768397 Fixed the M_PI to CV_PI 2013-07-21 01:54:27 +03:00
Daniel Angelov
965b3759b1 Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups. 2013-07-21 01:31:51 +03:00
Philippe FOUBERT
9c04db554f Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS 2013-07-20 15:03:30 +02:00
Alex Leontiev
c123974f42 Eliminated all the calls to std::find() 
This is done by keeping indexToRow vector, that keeps the information,
opposite to those kept by N and B. That is, while N and B help to
determine which variable corresponds to given column in column-vector c
or row in matrix b, indexToRow helps to determine the corresponding
row/column for a given variable.

At this point, I'm waiting for comments from pull request reviewer and
not working on any upgrades. Comments are appreciated, as usual.
 2013-07-20 15:14:02 +03:00
lluis
9fbff009e9 fixed compilation errors and warnings on builds 3298 and 4384 2013-07-20 11:35:56 +02:00
lluis
6adba09463 fixed some warnings on build 4285 2013-07-20 11:13:38 +02:00
abidrahmank
f36b9940e8 ref in inpainting docs 2013-07-20 14:07:19 +05:30
lluis
1d8e80aa3b add opencv_ml headers to precomp 2013-07-20 10:33:42 +02:00
lluis
5abe3b59f5 Class-specific Extremal Region Filter algorithm as proposed in : 
Neumann L., Matas J.: Real-Time Scene Text Localization and Recognition, CVPR 2012.

High-level C++ interface and implementation of algorithm is in the objdetect module.
C++ example, a test image, and the default classifiers in xml files.
 2013-07-20 01:10:05 +02:00
abidrahmank
692d807fa0 gabor filter docs Bug#1894 2013-07-20 00:15:28 +05:30
abidrahmank
84179b8a4e bgdsubtractorGMG docs 2013-07-19 23:11:30 +05:30
ozantonkal
0a3691d6ac CameraPositionWidget: constructor with Vec2f fov (tentative) 2013-07-19 18:30:12 +02:00
StevenPuttemans
27ed32f833 Applied bugfix #3165 : Changed min_eps value 2013-07-19 14:11:04 +02:00
Alex Leontiev
33e7640fb0 Simplify printing procedures 
Use opencv's print() procedure in place of my own procedures to output
matrices and std::vectors.

Interestingly enough, operator<< does not work for matrices, when called
from my .cpp files in src/ subfolder of the optim module, although it
works when called from tests and stand-alone programs, compiled with
opencv. I think, this requires investigation and, maybe, bug report.
 2013-07-19 12:34:33 +03:00
Roman Donchenko
1c35f121bb Merge pull request #1148 from StevenPuttemans:patch_3125 2013-07-19 12:48:49 +04:00
Roman Donchenko
7e15f2ac73 Merge pull request #1141 from apavlenko:fix_warning_unreach_code 2013-07-19 12:22:58 +04:00
Roman Donchenko
73b10bc8ca Merge pull request #1133 from abidrahmank:denoising_pydocs 2013-07-19 12:20:56 +04:00
Roman Donchenko
1b38d1e6b7 Merge pull request #1150 from janstarzy:spelling 2013-07-19 12:15:31 +04:00
StevenPuttemans
52bfa7b850 Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration 2013-07-19 09:29:48 +02:00
yao
18f71fd410 Warning fixes 2013-07-19 14:36:41 +08:00
Alex Leontiev
459c16ca99 Minor fixes 
In request to the comments for the pull request.
 2013-07-19 03:09:39 +03:00
Alexander Shishkov
b87d2e9ec2 cosmetic change 2013-07-19 03:10:38 +04:00
Alexander Shishkov
919f35644e Merge branch 'master' of https://github.com/f-morozov/opencv 2013-07-19 01:08:49 +04:00
Alexander Shishkov
35a39c19a3 minor changes 2013-07-19 01:08:42 +04:00
Fedor Morozov
ec668ce3a7 Documentation 2013-07-19 00:23:49 +04:00
Andrey Pavlenko
6b047ca0eb minor improvement (consistency, readability) 2013-07-18 19:50:51 +04:00
ozantonkal
2294eb82c9 fix aspect_ratio in camera position widget, add scale parameter (tentative implementation of scale) 2013-07-18 17:46:08 +02:00
Andrey Pavlenko
0386488629 Merge pull request #1095 from jet47:gpu-perf-tests 2013-07-18 19:32:37 +04:00
Andrey Pavlenko
74c72a1d7a removing unreachible code 2013-07-18 19:15:49 +04:00
ozantonkal
9d3f3c66da camera position widget: constructor with no parameter, constructor with intrinsic matrix for visualizing frustum 2013-07-18 17:08:58 +02:00
StevenPuttemans
dd0481ef2d Added brackets around line 888-892 for correct code! 2013-07-18 15:34:38 +02:00
Jan Starzynski
9bf216742f fixed cpackage -> package 2013-07-18 15:33:25 +02:00
StevenPuttemans
f9b594bf08 Changed first approach to a more general MS-specific approach. 
Suggested by @SpecLad
 2013-07-18 14:24:19 +02:00
Roman Donchenko
77f2d945f0 Merge pull request #1144 from prclibo:master 2013-07-18 16:05:40 +04:00
Roman Donchenko
28f2755413 Merge pull request #1137 from StevenPuttemans:bugfix_3131_24 2013-07-18 16:02:47 +04:00
Vladislav Vinogradov
7737375106 updated documentation 2013-07-18 15:39:43 +04:00
Vladislav Vinogradov
af2a700671 made module dependency optional 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
62edeeed16 refactored FGD algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
697793090d refactored GMG algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
b8f0d1a0e4 refactored MOG2 algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
a2adab7283 refactored MOG algorithm 
converted it to abstract interface
 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
88e67545ef split mog sources 2013-07-18 15:39:42 +04:00
Jan Starzynski
ee42b65063 corrected some spelling errors 2013-07-18 13:24:55 +02:00
Vladislav Vinogradov
7b87d72d80 refactored generalized hough (both CPU and GPU): 
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
 2013-07-18 15:17:33 +04:00
Roman Donchenko
7eddf887d5 Merge pull request #1147 from jet47:gpu-sanity-test-name 2013-07-18 14:29:47 +04:00
Andrey Pavlenko
6fbda0dfc1 Merge pull request #1138 from janstarzy:mat-dist 2013-07-18 14:23:12 +04:00
Andrey Pavlenko
4b234fa0a5 Merge pull request #1042 from jet47:gpuimgproc-refactoring 2013-07-18 14:22:44 +04:00
Vladislav Vinogradov
f87ef77269 removed GPU_/CPU_ prefix from gpu's sanity test 2013-07-18 13:41:27 +04:00
StevenPuttemans
5caa808879 Fixing bug #3131 adding breakpoints to featuretracker.cpp 2013-07-18 11:36:22 +02:00
peng xiao
e1f43e3b03 Add sort_by_key for oclMat. 
Most codes are ported from AMD's Bolt library.
Four methods are implemented:

SORT_BITONIC,   // only support power-of-2 buffer size
SORT_SELECTION, // cannot sort duplicate keys
SORT_MERGE,
SORT_RADIX      // only support signed int/float keys
 2013-07-18 17:25:00 +08:00
ozantonkal
3260404fdf initial CameraPositionWidget implementation using eye, look_at, up_vector 2013-07-18 10:39:34 +02:00
Vladislav Vinogradov
ebe7ff991f fixed compilation without CUBLAS and CUFFT 2013-07-18 12:04:33 +04:00
Bo Li
27a0ed0018 removed tab in five-point.cpp 2013-07-18 10:09:50 +08:00
Bo Li
9b5eca975b fixed a bug for the mask of recoverPose function 2013-07-18 09:55:39 +08:00
Alexander Shishkov
a29ce401d5 minore changes in test on HDR fromat 2013-07-18 01:32:06 +04:00
Alexander Shishkov
245dc99248 added include precomp 2013-07-18 01:13:35 +04:00
Alexander Shishkov
707048f6e1 removed tonemap_algorithms due to wrapping problems 2013-07-18 00:55:39 +04:00
Alexander Shishkov
8ccca90dca small changes 
added including for precomp
 2013-07-18 00:28:40 +04:00
Jan Starzynski
12c42ac145 fixed strings in n1_dims(): n1_dcols() -> n1_dims() 2013-07-17 18:41:54 +02:00
Roman Donchenko
8b29a6e44a Merge pull request #1127 from SpecLad:np-1.7 2013-07-17 18:48:08 +04:00
Roman Donchenko
73b5cc358e Merge pull request #1132 from apavlenko:master_ver_290 2013-07-17 17:51:56 +04:00
StevenPuttemans
c3dee28394 Fixed bug #3101, problem on ellipse2poly function 2013-07-17 15:21:23 +02:00
Jan Starzynski
1ccfa62f4f adding method dims() to core.Mat 2013-07-17 15:04:34 +02:00
StevenPuttemans
1fc89bb2e0 Added the solution mentioned in patch #3125 2013-07-17 13:20:25 +02:00
Roman Donchenko
5d8af49016 Merge pull request #1128 from SpecLad:ocl-tr1 2013-07-17 15:08:38 +04:00
Andrey Pavlenko
e04517af36 moving version to 2.9.0, 
also adding NVidia copyright
 2013-07-17 15:03:11 +04:00
ozantonkal
40e47e6f3f Image widgets implementation, GridWidget: vtkExtractEdges instead of Wireframe 2013-07-17 11:35:14 +02:00
Roman Donchenko
4f68212e64 Merge pull request #1124 from SpecLad:matx-div 2013-07-17 13:32:26 +04:00
Roman Donchenko
8f2047ada4 Merge pull request #1093 from jet47:fix-gpu-stream-test 2013-07-17 13:18:25 +04:00
Roman Donchenko
b45d61d2ad Merge pull request #1105 from kdrobnyh:Integral-Image-IPP 2013-07-17 13:10:24 +04:00
Roman Donchenko
2cd1c49623 Merge pull request #1126 from asmorkalov:winrt 2013-07-17 13:08:30 +04:00
Vladislav Vinogradov
39a25115e0 fixed compilation 2013-07-17 11:41:48 +04:00
Vladislav Vinogradov
59edad5a00 removed obsolete API 2013-07-17 11:40:01 +04:00
Vladislav Vinogradov
5da724001f made dependecy from gpufilters optional 2013-07-17 11:40:00 +04:00
Vladislav Vinogradov
f614e35443 split hough sources 2013-07-17 11:40:00 +04:00
Vladislav Vinogradov
1d79e13133 removed dependecy from gpuarithm 2013-07-17 11:39:59 +04:00
Vladislav Vinogradov
9498f82085 updated documentation 2013-07-17 11:39:58 +04:00
Vladislav Vinogradov
62a5a70cd0 switched to Input/Output Array in bilateralFilter & blendLinear 2013-07-17 11:39:58 +04:00
Vladislav Vinogradov
de56163f97 refactored gpu::matchTemplate (converted it into Algorithm) 2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
1fcc8074bd switched to Input/Output Array in Mean Shift 2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
70e6dc615a refactored GoodFeaturesToTrackDetector 2013-07-17 11:39:56 +04:00
Vladislav Vinogradov
d7ff3ad0cf refactored cornerHarris and cornerMinEigenVal 
* converted it into Algorithm
 2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
ad4d6bed9d refactored gpu::GeneralizedHough 2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
4087a45e73 refactored HoughCircles (converted it into Algorithm) 2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
1652540a1f refactored HoughLines (converted it into Algorithm) 2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
48fb8c4f8a refactored gpu::Canny (converted it into Algorithm) 2013-07-17 11:39:53 +04:00
Vladislav Vinogradov
fc8476544c switched to Input/Output Array in Histogram Processing 2013-07-17 11:39:52 +04:00
Vladislav Vinogradov
9eea9835ab switched to Input/Output Array in Color Processing 2013-07-17 11:39:52 +04:00
Alexander Smorkalov
16cfc7a531 WindowsRT build warning fixes. 2013-07-17 00:18:46 -07:00
yao
f1060ac514 a little simplify to pyrlk kernel 2013-07-17 14:35:44 +08:00
kdrobnyh
487ded8b27 Add IPP erosion and dilation 2013-07-16 22:35:16 +04:00
Vladislav Vinogradov
4716f63444 fixed gpu performance tests: 
used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism
 2013-07-16 15:43:04 +04:00
Vadim Pisarevsky
be040ff513 revert patch from PR 1074, since it break capturing on MacOSX 2013-07-16 15:02:33 +04:00
Roman Donchenko
28a5c127ea Made the Python bindings not use deprecated NumPy 1.7 API. 2013-07-16 14:33:15 +04:00
Roman Donchenko
523048f99f Fixed a compilation error (get<N> not found). 2013-07-16 14:23:05 +04:00
Roman Donchenko
1160b04fb4 Fixed a build warning in softcascade. 2013-07-16 12:43:49 +04:00
Roman Donchenko
924fc070f0 Changed / for Matx to Matx::div, for symmetry with Matx::mul. 2013-07-16 12:25:26 +04:00
Roman Donchenko
3443fd85cd Merge pull request #984 from albenoit:master 2013-07-16 11:57:52 +04:00
Roman Donchenko
feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
 2013-07-16 11:52:41 +04:00
ozantonkal
769eba7535 cube wire_frame fix using vtkOutlineSource 2013-07-16 09:06:14 +02:00
ozantonkal
4b85c849ca fix rgb and bgr incompatibility 2013-07-16 09:06:14 +02:00
ozantonkal
1bfd7ad17e arrow widget thickness parameter 2013-07-16 09:06:14 +02:00
peng xiao
ff73557304 Fix compilation error on Mac 2013-07-16 08:48:09 +08:00
Daniel Angelov
694d9ff2eb LSD enum now anonymous. 2013-07-15 23:28:19 +03:00
Anatoly Baksheev
dc348ff93d removed Mesh::Ptr since mesh itself consists of shared points (cv::Mat) 2013-07-15 19:18:37 +04:00
Anatoly Baksheev
0e20473c97 minor mesh load fixes 2013-07-15 16:46:39 +04:00
Anatoly Baksheev
4c228c07f1 fixed copilation 2013-07-15 16:31:28 +04:00
ozantonkal
efbebe6236 Merge branch 'implementing_widgets' of https://github.com/ozantonkal/opencv into implementing_widgets 2013-07-15 12:04:24 +02:00
ozantonkal
25f98bc022 mesh widget casting 2013-07-15 12:02:53 +02:00
ozantonkal
b066d1982f mesh widget implementation 2013-07-15 12:02:20 +02:00
peng xiao
e5c396bb24 Add ocl::gftt performance test. 2013-07-15 16:27:27 +08:00
alexandre benoit
12f65c61a8 updated doc wrt new bioinspired namespace convention 2013-07-15 09:58:16 +02:00
Roman Donchenko
52a9378257 Merge pull request #979 from jet47:gpuwarping-refactoring 2013-07-15 11:47:03 +04:00
Roman Donchenko
1590a1a538 Merge pull request #1068 from AoD314:webp2 2013-07-15 11:45:28 +04:00
Roman Donchenko
886c009da6 Merge pull request #1049 from pengx17:2.4_superres_ocl 2013-07-15 11:43:09 +04:00
yao
cdd9234fae fix hog mismatch on cpu ocl 2013-07-15 15:13:09 +08:00
alexandre benoit
7fe78efda3 retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
Daniel Angelov
d35601209e Added define guard for ln10. Fixed some warnings. 2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d Added needed header, changed macro name. 2013-07-14 12:56:22 +03:00
Anatoly Baksheev
6ca1822f36 added comments with future work for VizImpl 
added authors to license header
 2013-07-13 20:42:49 +04:00
Anatoly Baksheev
d6e2b657f9 more refactoring 2013-07-13 19:42:49 +04:00
Anatoly Baksheev
512afe2a90 beatification of test_viz 2013-07-13 18:23:46 +04:00
Anatoly Baksheev
83cb28f169 temp_viz removed 2013-07-13 18:01:56 +04:00
Anatoly Baksheev
3e41f0647e removed q subfolder 2013-07-13 17:45:46 +04:00
abidrahmank
61e50e2fda python docs for non-local means denoising 2013-07-13 16:00:15 +05:30
andrey.morozov
e4e0862c2e added support image with alpha channel 2013-07-13 14:09:37 +04:00
Daniel Angelov
3350533f48 Fixed ambiguouty error, signess compare. 2013-07-13 05:08:15 +03:00
Daniel Angelov
6bd5e12be3 Added a sample to show usage of the class. 2013-07-13 04:11:27 +03:00
Daniel Angelov
e51e00ac5f Added LSD accuracy tests. 2013-07-13 04:09:28 +03:00
Anatoly Baksheev
f480eca668 removed Affine3f from coordinate frame constructor 2013-07-13 01:49:59 +04:00
Daniel Angelov
5350a2f1d9 Added Line Segmen Detector. 2013-07-13 00:21:02 +03:00
Anatoly Baksheev
328f0e32d8 added makeTransformToGlobal() function 2013-07-13 00:00:57 +04:00
Anatoly Baksheev
6045ae856b reshape continuous clouds for better performance. 2013-07-12 23:59:19 +04:00
Anatoly Baksheev
ae2e3a1a93 viz license header template 2013-07-12 16:53:25 +04:00
Fedor Morozov
091b48de60 MTB alignment. Missing main file. 2013-07-12 16:08:06 +04:00
Fedor Morozov
35133df0de MTB alignment. Code, tests, application 2013-07-12 16:03:53 +04:00
Roman Donchenko
616dbd53f0 Merge pull request #1107 from abidrahmank:master 2013-07-12 11:40:33 +04:00
Roman Donchenko
09ec483d02 Merge pull request #1109 from nikman-ru:cap_reuse_24x 2013-07-12 11:38:59 +04:00
Roman Donchenko
18f1964f8a Merge pull request #1111 from nikman-ru:fix_yamldoc 2013-07-12 11:38:14 +04:00
hbristow
9cc949e341 Added more test cases 2013-07-12 17:31:25 +10:00
hbristow
5a34b00737 Added more test cases 2013-07-12 16:57:05 +10:00
hbristow
603d949354 Improved string handling. Swapped transpose interface for slow but correct implementation. Will come back to optimized implementation later. imshow now works correctly 2013-07-12 15:48:03 +10:00
Vladislav Vinogradov
d52ef2f758 added stub library for cudev module 
in order to make CMake scripts work properly
 2013-07-12 08:47:12 +04:00
Vladislav Vinogradov
5e3934446d fixed test compilation for gpu::Stream 2013-07-12 08:45:55 +04:00
Vladislav Vinogradov
afb08b33c7 removed obsolete API from gpuarithm module 2013-07-12 08:40:30 +04:00
Vladislav Vinogradov
0d9e3cfa37 updated documentation 2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
6d6ff26887 refactored gpu::ImagePyramid (converted it to abstract interface) 2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
2932beddcf switched to Input/Output Array in gpuwarping functions 2013-07-12 08:12:48 +04:00
hbristow
346f7d0f3e Fast deep-copy-transpose implemented which attempts to not thrash the cache. Good first step for now, but no transpose at all would be preferrable. Started I/O. 2013-07-12 10:38:48 +10:00
Alex Leontiev
6db2596ca9 Convenience fixes 
Attempting to fix issues pointed out by Vadim Pisarevsky during the pull
request review. In particular, the following things are done:
*) The mechanism of debug info printing is changed and made more
procedure-style than the previous macro-style
*) z in solveLP() is now returned as a column-vector
*) Func parameter of solveLP() is now allowed to be column-vector, in
which case it is understood to be the transpose of what we need
*) Func and Constr now can contain floats, not only doubles (in the
former case the conversion is done via convertTo())
*)different constructor to allocate space for z in solveLP() is used,
making the size of z more explicit (this is just a notation change, not
functional, both constructors are achieving the same goal)
*) (big) mat.hpp and iostream headers are moved to precomp-headers from
optim.hpp
 2013-07-11 22:05:14 +03:00
Nikita Manovich
c55dc3e8ab Fixed "FileStorage (minor) error in doc (Feature #3151)" 
It was just a typo in the documentation.
 2013-07-11 16:06:25 +04:00
Alex Leontiev
e9b432b1d9 Fixing the warnings 
Fixed all of the warnings.
 2013-07-11 14:43:48 +03:00
Nikita Manovich
05aeb70831 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150). 
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
 2013-07-11 15:16:22 +04:00
Anatoly Baksheev
c6a8bd65a8 fixed some warnings for windows 
minor buitification
 2013-07-11 14:45:39 +04:00
Roman Donchenko
06742247be Removed unused PACKAGE_* macros. 2013-07-11 14:30:46 +04:00
Roman Donchenko
6f326220d3 Removed the HAVE_LRINT macro, which is never set. 2013-07-11 14:30:46 +04:00
ozantonkal
acd63c1497 fix grid widget unused color 2013-07-11 11:52:59 +02:00
Alex Leontiev
6c9ae1100b Fixed the warnings 
Fixed the code so to eliminate warnings related to shadowing and unused
parameters. In some settings, these warnings may be treated as an errors
and lead to failed build.

Suggested by Nikita Manovich.
 2013-07-11 12:29:55 +03:00
Roman Donchenko
e2ef2a5781 Refactored image format library finding logic. 
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
 2013-07-11 12:40:16 +04:00
Andrey Pavlenko
75b86c9706 Merge pull request #1104 from nikman-ru:cap_reuse 2013-07-11 11:52:22 +04:00
Andrey Pavlenko
d1fe1a62c3 Merge pull request #1106 from pengx17:2.4_gftt_rename 2013-07-11 11:41:37 +04:00
Andrey Pavlenko
07c2ae508e Merge pull request #1102 from SpecLad:xls-updates 2013-07-11 11:36:47 +04:00
ozantonkal
eef8195569 clean unnecessary methods, make text3d face camera 2013-07-11 09:30:52 +02:00
Alex Leontiev
fe6a7e935d Fix qualifiers on aux functions for solveLP() 
Change qualifiers on auxiliary functions (for solveLP() procedure) from
const (that does not have much sense) to static (that makes them
invisible for outside world and hopefully exacerbates optimization).
 2013-07-11 09:52:13 +03:00
Alex Leontiev
ba537a95db Preparation for pull request 
Additional cleaning for simplex method, removing the parts that are
currently unused. Removing developer's notes. Trying to reach production
level.
 2013-07-11 09:31:10 +03:00
Andrey Pavlenko
decd0c753a Merge pull request #1082 from jet47:gpu-warnings-fix 2013-07-11 09:41:46 +04:00
abidrahmank
1923d87f61 PyDocs for common interface of feature2d 2013-07-11 09:33:32 +05:30
abidrahmank
f91f369788 PyDocs for FAST, ORB etc 2013-07-11 09:32:49 +05:30
abidrahmank
2047838106 feature2d drawing functions PyDocs 2013-07-11 09:31:25 +05:30
abidrahmank
031c77f4eb SIFT+SURF PyDocs 2013-07-11 09:30:21 +05:30
abidrahmank
5d863f7516 drawMatches python bindings 2013-07-11 09:28:37 +05:30
kdrobnyh
df4b67a749 Merge pull request #1 from Itseez/2.4 
Add calculating integral image using IPP
 2013-07-10 10:45:24 -07:00
Alex Leontiev
a95650111f Cleaning the code of simplex method 
In particular, the following things are done:
*) Consistent tabulation of 4 spaces is ensured
*) New function dprintf() is introduced, so now printing of the debug
information can be turned on/off via the ALEX_DEBUG macro
*) Removed solveLP_aux namespace
*) All auxiliary functions are declared as static
*) The return codes of solveLP() are encapsulated in enum.
 2013-07-10 20:11:52 +03:00
Roman Donchenko
ca8b621b4f Refactored detecting several Apple-related technologies. 
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.

This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
 2013-07-10 19:45:56 +04:00
ozantonkal
5813a3a99d text3D widget implementation 2013-07-10 16:34:47 +02:00
Roman Donchenko
241e2d2360 Merge pull request #1077 from bitwangyaoyao:2.4_kmeans 2013-07-10 18:32:14 +04:00
Roman Donchenko
4f9554eead Removed a few more unused configuration macros. 
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.

Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
 2013-07-10 18:29:11 +04:00
Roman Donchenko
894b30b34d Merge pull request #1088 from apacha:brisk_noDescriptors_fix 2013-07-10 18:18:31 +04:00
Roman Donchenko
f0c7cce87a Merge pull request #1080 from hhofbaue:matchTemplate_bugfix 2013-07-10 18:17:06 +04:00
Nikita Manovich
21211308d0 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150). 
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
 2013-07-10 17:48:44 +04:00
ozantonkal
e185900270 grid widget implementation 2013-07-10 15:34:19 +02:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Andrey Pavlenko
2b2e02166e setting version to 2.4.6.1 (hot-fix release for Linux camera support) 2013-07-10 15:12:39 +04:00
Roman Donchenko
ea3239a00e xls-report.py: Added an option to show per-pixel times 2013-07-10 14:58:51 +04:00
Roman Donchenko
5b2dc26f2c Made the crude ability less crude. 2013-07-10 14:58:51 +04:00
Roman Donchenko
215b3e749f Added to the test log parser a crude ability to detect non-implemented tests. 2013-07-10 14:58:51 +04:00
Roman Donchenko
1080c4295a xls-report.py: removed image size and type from the list of other parameters. 
Also, shrunk the corresponding column and the test name column.
 2013-07-10 14:58:18 +04:00
Roman Donchenko
63d151a29c xls-report.py: add ability to specify arbitrary sheet properties 2013-07-10 14:58:17 +04:00
ozantonkal
71c76aecc9 PolyLine widget implementation 2013-07-10 12:51:17 +02:00
ozantonkal
d3dee3a2fe explicit casting among widgets, removed implicit casting 2013-07-10 09:55:42 +02:00
kdrobnyh
f8eb806565 Add IPP support to integral function 2013-07-10 11:25:36 +04:00
peng xiao
5032240c9d Fix ocl gftt file name typo. 2013-07-10 14:51:40 +08:00
Anatoly Baksheev
e4c3416f58 experimental widget casting functionality 2013-07-09 20:16:43 +04:00
Anatoly Baksheev
509a93c7ce minor naming 2013-07-09 19:35:26 +04:00
ozantonkal
200b254bad rearrange widget constructors 2013-07-09 15:18:44 +02:00
Roman Donchenko
2dedfd9762 Merge pull request #1099 from asmorkalov:linux_vcap_fix 2013-07-09 17:13:05 +04:00
ozantonkal
10d955f18b widget2d setcolor implementation 2013-07-09 14:28:55 +02:00
ozantonkal
318b1c00a9 implement assignment operator and copy constructor for all widgets existing 2013-07-09 14:12:49 +02:00
Alexander Smorkalov
f77d1f57ee V4L and V4L2 based Video capture bug fix (Bugfix #3144). 2013-07-09 16:07:55 +04:00
Andrey Pavlenko
fcb4c0e51c fixing working with test data and a small fix for init code 
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
 2013-07-09 13:25:21 +04:00
ozantonkal
195d60f4f8 fix widget delete bug 2013-07-09 11:07:21 +02:00
ozantonkal
d324c03b6a initial redesigning widgets 2013-07-09 10:22:12 +02:00
Andrew Senin
aa2ca3aa8f Improve FPS on black and white Ximea cameras 2013-07-09 00:33:39 +04:00
ozantonkal
b50d777985 cloudwidget private implementation for duplicate code, add cv_assert(exists), fix bug point_step bug in CloudNormalsWidget 2013-07-08 21:48:19 +02:00
ozantonkal
cc08149d7c remove redundant statements 2013-07-08 19:05:35 +02:00
ozantonkal
658e4c5e97 set/get/updateWidgetPose implemented, cloudNormals with color 2013-07-08 18:56:13 +02:00
ozantonkal
e76023be96 cloud normals widget implementation 2013-07-08 18:22:51 +02:00
Roman Donchenko
c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp
 2013-07-08 18:47:38 +04:00
ozantonkal
6e5ae98582 initial cloud widget implementation, fix safedowncasts 2013-07-08 15:12:50 +02:00
ozantonkal
d394e233bb cube widget wireframe 2013-07-08 11:34:11 +02:00
ozantonkal
653eda45f8 text widget implementation 2013-07-08 10:41:42 +02:00
ozantonkal
c4f4727ee5 showWidget takes Affine3f as argument 2013-07-08 10:53:00 +03:00
ozantonkal
eafcdc004d plane widget size 2013-07-07 21:19:21 +03:00
ozantonkal
030400d50f circle widget thickness property 2013-07-07 16:21:47 +03:00
andrey.morozov
8d0452ed59 added test to save image with webp with alpha channel 2013-07-06 17:26:22 +04:00
Fedor Morozov
0aee5b61e3 Exposure fusion. Code, tests. 2013-07-05 16:14:08 +04:00
Anatoly Baksheev
9d684a39da Fixed ref counting bug, minor formatting 2013-07-05 14:35:12 +04:00
Roman Donchenko
f5089100b9 Merge pull request #1073 from asmorkalov:android_cvjavaframe 2013-07-05 13:41:51 +04:00
Roman Donchenko
de58039b46 Merge pull request #1081 from SpecLad:merge-2.4 2013-07-05 13:34:59 +04:00
Roman Donchenko
2f8be2a4b1 Merge pull request #1083 from jet47:cuda-device-layer 2013-07-05 13:30:11 +04:00
Roman Donchenko
c4e59866a2 Merge pull request #1074 from devernay:2.4-cap_qt-multithread 2013-07-05 13:28:38 +04:00
Roman Donchenko
36a4d246f4 Merge pull request #1087 from znah:2.4 2013-07-05 12:07:45 +04:00
Alexey Spizhevoy
dcb049df6a fixed docs 2013-07-05 10:16:22 +04:00
Alexey Spizhevoy
2a48f7c035 fixed include for Windows 2013-07-05 09:44:32 +04:00
yao
88ed74a7ec fix the function name 2013-07-05 08:59:21 +08:00
ozantonkal
7e2643abff removed shape files 2013-07-04 19:05:56 +03:00
Roman Donchenko
2b44172026 xls-report.py: make behaviour more intelligent in case of repeated results 2013-07-04 20:01:27 +04:00
Roman Donchenko
0732905cff xls-report.py: write tests in sorted order 2013-07-04 20:01:27 +04:00
Roman Donchenko
ea054e2888 xls-report.py: made most columns a little wider 2013-07-04 20:01:27 +04:00
Roman Donchenko
4e939e2fce xls-report.py: added an option to include data from unrecognized XMLs 2013-07-04 20:00:59 +04:00
ozantonkal
4c3d1d583a remove ModelCoefficients, remove showShape methods from viz3d 2013-07-04 18:47:52 +03:00
ozantonkal
5bb95c4110 remove widget implementation 2013-07-04 18:36:26 +03:00
ozantonkal
ecdd8513fd coordinate system widget implementation, update pose fix 2013-07-04 18:19:06 +03:00
ozantonkal
03cc439b08 cube widget implementation 2013-07-04 17:59:11 +03:00
ozantonkal
f07486b563 cylinder widget implementation 2013-07-04 17:44:41 +03:00
alexandre benoit
188f889949 Merge branch 'master' of code.opencv.org:opencv 2013-07-04 16:19:24 +02:00
Roman Donchenko
83fd385bbd xls-report.py: don't eat all errors when reading sheet.conf 2013-07-04 18:03:03 +04:00
ozantonkal
f97c3c8b06 circle widget and arrow widget implementation 2013-07-04 16:54:46 +03:00
Alexander Mordvintsev
3677a66403 line realign 2013-07-04 17:43:38 +04:00
Alexey Spizhevoy
406f342dc3 updated docs 2013-07-04 17:41:39 +04:00
ozantonkal
d80a965f97 sphere widget implementation 2013-07-04 16:32:06 +03:00