Vladislav Vinogradov
9210d8e542
move allocMatFromBuf function to farneback.cpp:
...
* it is the only place, where it is used
* no need to make this function public
2014-12-23 17:42:49 +03:00
Vadim Pisarevsky
d9f159a554
Merge pull request #3513 from mshabunin:compat-30
2014-12-22 11:58:01 +00:00
Vadim Pisarevsky
c0005fd293
Merge pull request #3520 from JoeHowse:master
2014-12-22 11:14:29 +00:00
Vadim Pisarevsky
f12bd999bf
Merge pull request #3524 from jet47:fix-cuda-warnings
2014-12-22 10:58:07 +00:00
Vadim Pisarevsky
a1df295079
Merge pull request #3525 from jet47:fix-cudev-tests
2014-12-22 10:57:07 +00:00
Vadim Pisarevsky
7b20ce4952
Merge pull request #3490 from oresths:symmcolumnsmall_fix
2014-12-22 10:44:47 +00:00
Vadim Pisarevsky
432546e4c4
Merge pull request #3512 from vins31:OpenNi2_AsusXtion
2014-12-22 10:39:42 +00:00
Vadim Pisarevsky
700a388173
Merge pull request #3499 from StevenPuttemans:fix_2432
2014-12-22 10:29:31 +00:00
Vadim Pisarevsky
1ab551487d
Merge pull request #3516 from ana-GT:openni2_defaultMode
2014-12-22 10:26:30 +00:00
Vadim Pisarevsky
060d67517a
Merge pull request #3518 from wangyan42164:ocl_cascade_detect
2014-12-22 10:25:47 +00:00
Vadim Pisarevsky
199f1aec2e
Merge pull request #3519 from fvgoto:patch-1
2014-12-22 10:25:00 +00:00
Vladislav Vinogradov
ec33c4ae36
increase epsilons for tests due to different optimizations (IPP vs CUDA, float vs double)
2014-12-22 11:48:45 +03:00
Vladislav Vinogradov
25f33a7e30
update cudev color conversions according to the latest changes in CPU code
2014-12-22 11:48:45 +03:00
Vladislav Vinogradov
48c9c24da6
disable -Wshadow warning for CUDA modules:
...
it is generated by CUDA headers and we can't fix it
2014-12-22 11:48:19 +03:00
Maksim Shabunin
c485aee464
Included c-headers for better 2.4 compatibility
2014-12-19 17:05:26 +03:00
Joe Howse
13c04120dd
For Java compatibility, avoiding explicit pseudonym in enum
2014-12-16 21:37:14 -04:00
Joe Howse
620a969285
Allow BGR, RGB, or gray capture via libv4l
2014-12-16 20:07:37 -04:00
Florian Verdet
f87f0cc481
fix obvious copy+paste typo in computeDistance()
...
(with this else-branch, argument contour2 would not be used at all)
2014-12-16 12:46:07 +01:00
Yan Wang
efa84d8225
Use preprocessor for constant values in OpenCL kernel instead of
...
the parameter variable.
It could improve the performance of
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*.
Especially,
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/15
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/16
could be improved about 2% in Intel platform.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-16 16:21:05 +08:00
Yan Wang
fd2d800c06
Remove unnecessary local variable "size".
...
It should also be better for optimizing when compiling kernel.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-16 14:25:24 +08:00
Ana Huaman Quispe
0b429fee7b
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set
2014-12-15 18:16:25 -05:00
Vadim Pisarevsky
009aec5164
Merge pull request #3491 from mshabunin:ios-extra-world
2014-12-15 18:07:09 +00:00
Vadim Pisarevsky
3c74c23bad
Merge pull request #3473 from TobyWanKenobi:master
2014-12-15 18:04:01 +00:00
Vadim Pisarevsky
d54b069ae1
Merge pull request #3448 from Ashod:highgui_trackbar_improvements
2014-12-15 18:03:01 +00:00
StevenPuttemans
edb608d206
fix documentation bug 2432
2014-12-15 11:53:55 +01:00
vincentweb
4d12beb723
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
...
sensors which do not have image generators.
2014-12-14 20:52:24 +01:00
Vadim Pisarevsky
25378587e2
Merge pull request #3479 from mshabunin:doxygen-tutorials
2014-12-09 14:06:23 +00:00
Vadim Pisarevsky
10dc5a3759
Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1
2014-12-09 14:05:35 +00:00
Alexander Alekhin
0f7721e915
Merge pull request #3486 from Chuanbo-Weng:repeat-perf
2014-12-08 15:49:21 +00:00
Dmitry-Me
f269828160
Reduce variables scope, move declaration to first use point
2014-12-08 18:21:17 +03:00
TobyWanKenobi
b35f5d115f
Removed "FORMAT_XML" to generalize format
...
Removed the "FileStorage::FORMAT_XML" to generalize format of the String
model.
2014-12-08 09:21:55 +01:00
orestis
c762da9893
Fix SymmColumnSmallVec_32s16s SSE code
...
Specifically, in general antisymmetric case src[-1] (S0) should be
subtracted from from src[1] (S2), and not the opposite.
2014-12-06 19:53:07 +02:00
Ashod Nakashian
006384edaf
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:55:17 -05:00
Vadim Pisarevsky
0a4c616d43
Merge pull request #3487 from taka-no-me:ctrl_s_gtk
2014-12-06 10:04:22 +00:00
Vadim Pisarevsky
ef347f4b62
Merge pull request #3472 from Dmitry-Me:preventDivByZero
2014-12-06 08:09:01 +00:00
Vadim Pisarevsky
ef534537b4
Merge pull request #3478 from akarsakov:rect_fix_typo
2014-12-06 08:08:27 +00:00
Vadim Pisarevsky
bada364eb3
Merge pull request #3481 from mshabunin:python-test
2014-12-06 08:07:39 +00:00
Maksim Shabunin
c28fea32c7
Build separate world-like iOS framework for contrib
2014-12-05 17:48:28 +03:00
Alexander Alekhin
893deb4040
Merge pull request #3483 from wangyan42164:ocl_orb_improve
2014-12-05 12:55:54 +00:00
Andrey Kamaev
05bc48e8f4
Make Ctrl+S open save dialog on Gtk backend
2014-12-05 14:53:19 +03:00
Andrey Kamaev
fac99de7ec
It turns opengl gheck is not needed for win ctrl+s
2014-12-05 14:52:44 +03:00
Yan Wang
2df606f098
Use sincos instead of sin and cos.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-04 15:48:23 +08:00
Yan Wang
1c9f956b88
Remove unnecesary operations and calculations in loop body.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-04 15:25:18 +08:00
Chuanbo Weng
2d8c89c40b
Remove unnecessary kercn limitation of 4.
...
When accessing global memory by DWORD4, memory bandwidth
can be fully utilized on Intel platform. This patch will
make more image format(e.g. 8UC4) be processed in DWORD4
by work-item. After applying this patch, 3 subcase of
./opencv_perf_core --gtest_filter=OCL_RepeatFixture_Repeat.Repeat/*
can be speedup on HD4000 graphics card with Beignet:
OCL_RepeatFixture_Repeat.Repeat/2, 64% improvement.
OCL_RepeatFixture_Repeat.Repeat/6, 50% improvement.
OCL_RepeatFixture_Repeat.Repeat/8, 56% improvement.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-12-04 11:15:13 +08:00
TobyWanKenobi
f54b80d2c8
Re-edition of documentation
...
Re-edited the documentation again.
2014-12-03 17:13:11 +01:00
Maksim Shabunin
84379140ba
Python test: added options to provide local data path
2014-12-03 18:12:01 +03:00
TobyWanKenobi
b3bba3476d
Re-editing Documentation
...
Attempting to re-editing the documentation, to satisfy buildbot error
status.
2014-12-03 15:54:25 +01:00
TobyWanKenobi
270af2ca79
Changing tabs to spaces.
...
Edited previous code to change tabs into spaces.
2014-12-03 15:40:12 +01:00
Alexander Karsakov
bcca34bc96
Fixed typo in description of Rect operations
2014-12-03 16:01:03 +03:00
TobyWanKenobi
a1e04c98aa
Add method in StatModel class, to load from String
...
Added a method "loadFromString" which is based on the "load" one. It
allow to directly pass the XML string which can be usefull and faster
when you have a huge file in a variable.
2014-12-02 15:15:06 +01:00