Renato Florentino Garcia
ec0f901153
Remove an unneeded semicolon.
2015-07-21 14:54:06 -03:00
Alexander Alekhin
c0b544af70
Merge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample
2015-07-21 15:58:20 +00:00
Alexander Alekhin
c1c0f23fd1
Merge pull request #4004 from paroj:camera-api
2015-07-21 15:57:48 +00:00
Alexander Alekhin
c0ee03fab2
Merge pull request #4192 from avershov:opencl-opengl-buffer
2015-07-21 14:10:00 +00:00
Vadim Pisarevsky
c976c1192d
Merge pull request #4181 from themightyoarfish:findEssMatDocTypoFix
2015-07-21 12:06:45 +00:00
Vadim Pisarevsky
61c0ff007a
Merge pull request #4197 from themightyoarfish:projectPointsDocBugfix
2015-07-21 11:56:46 +00:00
Vadim Pisarevsky
03824682ad
Merge pull request #4189 from vladimir-dudnik:update_dx_samples
2015-07-21 11:55:21 +00:00
Vadim Pisarevsky
a7805301cb
Merge pull request #4201 from sturkmen72:new_function_imread_reduced
2015-07-21 11:49:51 +00:00
Vadim Pisarevsky
e26b941e66
Merge pull request #4207 from alalek:fix_calib3d_test
2015-07-21 11:48:14 +00:00
Alexey Ershov
89392b2a6d
added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment
...
rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively
opengl sample: added buffer support
tested and fixed buffer support on Windows
change glFlush() call to glFinish()
added UMat::release() call; fixed functions' names
adopted & implemented API suggestion(s) from Alexander
fixed unreachable code warning
added more info to the mapGLBuffer/unmapGLBuffer description
2015-07-21 13:42:17 +03:00
Alexander Alekhin
b6d88f21af
Merge pull request #4195 from wangyan42164:ocl_pyrlk
2015-07-21 09:25:11 +00:00
Vladimir Dudnik
ef05318c69
fix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov
2015-07-21 01:27:27 +03:00
Vladimir Dudnik
6c452addfe
changed output from fps to time (in msec). Notes for dx10 and dx11: the first measure is wrong (zero), the followiing are correct; measured time includes output text to surface.
2015-07-20 19:05:05 +03:00
Alexander Alekhin
dac071ed78
Merge pull request #4202 from PhilLab:patch-5
2015-07-20 15:13:43 +00:00
Alexander Alekhin
76296fb672
Merge pull request #4206 from sturkmen72:patch-2
2015-07-20 15:13:17 +00:00
Alexander Alekhin
bbe75fe1d2
calib3d: normalize Rodrigues vector in perf test
2015-07-20 17:05:25 +03:00
Suleyman TURKMEN
7522527827
Update window_w32.cpp
2015-07-20 16:35:00 +03:00
Philipp Hasper
2b7637df36
Fixed buffer overflow in string handling
...
pos should never exceed strlen, else the overflow check 'if (!len)' will wrongfully pass
2015-07-20 09:00:24 +02:00
Yan Wang
2c1650ad33
Optimize pyrlk.
...
1. Remove uncessary index calculation.
2. Use mad/mad24 as possible.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-07-20 13:46:01 +08:00
Suleyman TURKMEN
7b7d54df68
new function imread_reduced()
...
by this new function we can set libjpeg "scale_denom" parameter and load jpeg images scaled 1/2 - 1/4 - 1/8
other image formats resized after loading
2015-07-19 03:53:43 +03:00
themightyoarfish
b8f93e08e9
Fixed documentation bug for projectPoints: Distortion coefficients cannot actually be NULL
2015-07-17 17:34:33 +02:00
Maksim Shabunin
0726c4d4ea
Merge pull request #4190 from sbokov:fixingStereoBMissue
2015-07-15 14:43:09 +00:00
Alexander Alekhin
ae71f0c086
Merge pull request #4193 from jklontz:master
2015-07-15 10:12:07 +00:00
Josh Klontz
beed99dbc1
fixed conditional compilation of RGB2Gray<ushort> template specialization
2015-07-14 20:56:43 -04:00
sbokov
e0cea92f6e
Fixing possible invalid memory access in validateDisparity
2015-07-14 18:23:24 +03:00
Maksim Shabunin
00b72df6c5
Merge pull request #4147 from alalek:fix_world_cyclic_deps
2015-07-14 14:54:38 +00:00
Alexander Alekhin
4c1cbffd2a
Merge pull request #4184 from alalek:fix_cmake_status
2015-07-14 10:32:06 +00:00
Vladimir Dudnik
dee05f982b
compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping)
2015-07-13 23:40:45 +03:00
Alexander Alekhin
f77926675f
Merge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_flag_polarity
2015-07-13 11:39:51 +00:00
ultrafro
ed574171bb
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class
2015-07-12 18:28:23 -04:00
Alexander Alekhin
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
Alexander Alekhin
6116a2fcf8
Merge pull request #4182 from vladimir-dudnik:update_dx_samples
2015-07-10 14:30:03 +00:00
themightyoarfish
fcc842f08b
Fixed typo in doc for findEssentialMat
2015-07-10 12:45:45 +02:00
Vladimir Dudnik
38723b0339
simplified sample's interface (remove odd "no processing" branch, add print to screen for processing mode)
2015-07-09 22:41:05 +03:00
Alexander Alekhin
ff90f2736b
Merge pull request #4169 from alalek:issue_4457
2015-07-08 14:30:41 +00:00
Alexander Alekhin
06617392e0
workaround issue with MatExpr
2015-07-08 16:22:59 +03:00
Alexander Alekhin
a6f46d7bb1
issue 4457
2015-07-08 16:22:58 +03:00
Vadim Pisarevsky
0b99f70773
Merge pull request #4154 from alalek:ffmpeg_update_via_binary_repo
2015-07-08 12:23:14 +00:00
Pavel Rojtberg
b1842a4b89
use simplified API selection logic in cvCreateCameraCapture as well
2015-07-08 13:46:57 +02:00
Pavel Rojtberg
2909e07cb2
deny any other interfaces if someone is specified as preference
...
it provides more expectable results to end-users.
based on feedback by Alexander Alekhin
2015-07-08 13:46:56 +02:00
Pavel Rojtberg
41d8c4d879
allow specifying apiPreference in VideoCapture when opening a file. Add
...
a separate function instead of an overload not to change the ABI.
rename VideoCapture paramter 'device' to 'index' in CPP to reflect that
it allows specifying the API.
update comments to explain how to specify the API.
2015-07-08 13:46:56 +02:00
Vadim Pisarevsky
cd8143be0a
Merge pull request #4171 from jet47:install-cudev-test
2015-07-08 10:10:17 +00:00
Vadim Pisarevsky
4997f5dfe9
Merge pull request #4174 from yangj1e:fix_svm_trainauto
2015-07-08 10:04:40 +00:00
Vadim Pisarevsky
743160b6ac
Merge pull request #4158 from alalek:fix-bigdata-copyto
2015-07-08 10:00:46 +00:00
Vadim Pisarevsky
92777281a7
Merge pull request #4173 from kalistratovag:mjpeg_encoder_coverity_warnings
2015-07-08 09:19:01 +00:00
Alexander Alekhin
40fcc9d149
Merge pull request #4159 from alalek:vector_processing
2015-07-06 13:22:57 +00:00
Vadim Pisarevsky
8bede85f60
Merge pull request #4172 from alalek:ocl_minmaxloc_unaligned
2015-07-06 12:57:01 +00:00
Alexander Alekhin
c0d61964d6
ocl: fix unaligned memory access
...
http://code.opencv.org/issues/4462
2015-07-06 13:58:17 +03:00
kalistratovag
e2fe0ca835
Removing deadcode blocks, redudant variable & initializing all vars in constructor
...
Adding &31 to bit shift in order to silince coverity BAD_SHIFT defect
add default_stripes_count const
2015-07-06 12:36:21 +03:00
Jie Yang
2ba0d31785
Fix SVM::trainAuto (Bug #4464 )
...
Fix SVM::trainAuto (Bug #4464 )
2015-07-06 01:20:26 +09:30
