Vitaliy Lyudvichenko
85cc11e3b2
Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes
2015-08-21 19:26:29 +03:00
Maksim Shabunin
680efe1a97
Merge pull request #5231 from alalek:fix_tls
2015-08-21 15:09:50 +00:00
Alexander Alekhin
b8956d0111
tls: fix access to array (out of bounds)
2015-08-21 16:43:15 +03:00
Alexander Alekhin
44f8670719
Merge pull request #5171 from avershov:opencl-vaapi-interop
2015-08-21 12:47:14 +00:00
Alexey Ershov
a8656ea20f
implemented core support & sample
...
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
2015-08-21 02:44:03 +03:00
Alexander Alekhin
1f7fc6875f
Merge pull request #5222 from apavlenko:android_ocl_tutorial
2015-08-20 13:14:50 +00:00
Alexander Alekhin
c1778f1199
Merge pull request #5161 from alalek:fix_string
2015-08-20 12:49:54 +00:00
Alexander Alekhin
3afe8832c5
Merge pull request #5195 from mshabunin:warn-missing-contrib
2015-08-20 12:36:00 +00:00
Andrey Pavlenko
58e5aca631
Android camera + OpenCL tutorial (for existing code at samples/android/tutorial-4-opencl)
2015-08-20 15:13:34 +03:00
Maksim Shabunin
973abf0d62
cmake: Added missing extra modules warning
2015-08-19 18:33:59 +03:00
Maksim Shabunin
4a067dca58
Merge pull request #5154 from brunomorishita:patch-1
2015-08-19 15:22:35 +00:00
Alexander Alekhin
887d8d091b
Merge pull request #5177 from lupustr3:pvlasov/tls_fixes
2015-08-19 14:18:19 +00:00
Alexander Alekhin
76da19d543
Merge pull request #5148 from StevenPuttemans:fix_4237
2015-08-19 13:28:48 +00:00
Steven Puttemans
be89b0505a
Fix
2015-08-19 13:46:17 +02:00
Pavel Vlasov
a33d98c13a
TLS memory leaks were fixed;
...
TLS was redesigned in more straightforward way;
OPENCV_ABI_COMPATIBILITY define was added;
2015-08-19 13:31:44 +03:00
Alexander Alekhin
ca5e07d342
Merge pull request #5199 from TheodoreT:tickmeter_update
2015-08-17 17:18:31 +00:00
Alexander Alekhin
365603e1c2
Merge pull request #5212 from thebucc:master
2015-08-17 16:37:27 +00:00
thebucc
421e1b237c
Fix for bug #5007 : moved definition of Size_MatDepth_t and Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer to where they are needed and live in a different namespace (possibly the reason why the fix works).
2015-08-17 16:09:00 +01:00
theodore
9449af8ada
1e-3 -> 1e3
2015-08-17 15:52:16 +02:00
Alexander Alekhin
5ee00ec5c6
Merge pull request #5176 from vladimir-dudnik:master
2015-08-17 12:22:15 +00:00
Vladimir Dudnik
58934f1e16
add condition to skip unmapping for internally allocated host memory. this should fix map_unmap_counting UMat test.
2015-08-17 14:36:34 +03:00
Alexander Alekhin
8e5ce69ee8
Merge pull request #5208 from ilya-lavrenov:cmd
2015-08-17 10:19:53 +00:00
Alexander Alekhin
9b0f5e61d1
Merge pull request #5185 from mshabunin:fix-rgbe-header-parse
2015-08-17 10:19:15 +00:00
Ashley Stacey
d8d78b4a98
Fix pdb file generation on Windows for CMake versions after 3.1.0.
...
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
2015-08-17 10:28:22 +10:00
Ilya Lavrenov
7da16d6f47
used proper method
2015-08-17 01:44:50 +03:00
Alexander Alekhin
0e4bd80b80
Merge pull request #5194 from mshabunin:add-contrib-tutorials-root
2015-08-16 15:08:40 +00:00
Alexander Alekhin
e65de8d1da
fixes for MSVS compiler optimizer
2015-08-16 02:03:04 +03:00
Alexander Alekhin
ac37b77452
c++ move semantics for cv::UMat
2015-08-16 02:02:26 +03:00
Alexander Alekhin
306aa0e699
c++ move semantics for cv::Mat_
2015-08-16 02:02:25 +03:00
Alexander Alekhin
1afc9eb730
c++ move semantics for cv::Mat
2015-08-16 02:02:24 +03:00
Alexander Alekhin
5a0af53683
c++ move semantics for cv::Ptr<>
2015-08-15 16:45:19 +03:00
theodore
6d68f72473
bug fix fro the TickMeter class
2015-08-15 14:12:40 +02:00
Alexander Alekhin
56cdd6f14f
Merge pull request #5116 from lenlen:viz_improvement
2015-08-15 08:28:22 +00:00
Antonella Cascitelli
079ceea616
Added new functionalities to viz module
...
- load OBJ file
- set offscreen rendering
- set roll angle of the camera
- get Mat screenshot of the current scene
- remove all lights from the scene
- add a custom light in the scene
- modify the size of the WImage3D widget
- added ambient property for the widget
Changed Vec3d in cv::viz::Color
Renamed method getMatScreenshotin getScreenshot
Modified showWidget
Fixed on viz::Color and reverted fix on vtkProp3D
Removed cameraRoll method
Merged load mesh method (for ply and obj file)
Fixed doc
Fixed cv::viz::WImage3D::setSize for vtk5.8
Fixed enum for cv::viz::Mesh::load
2015-08-15 01:03:59 +02:00
Maksim Shabunin
612822367d
Added auto-generated root page for all contrib tutorials
2015-08-14 18:11:27 +03:00
Alexander Alekhin
e866680d96
Merge pull request #5156 from brunomorishita:fix_build
2015-08-14 13:56:45 +00:00
Alexander Alekhin
30e6725006
Merge pull request #5192 from D-Alex:master
2015-08-14 13:55:28 +00:00
Alexander Duda
fbcf5f0918
cvCreateCameraCapture: fix using preffered interface
...
The provided interface id must be removed from the index. Otherwise, the
underlying implementations are using a wrong camera id.
Example:
VideoCapture(800) fails because PvAPI tries to open a camera
on position 800
2015-08-14 13:40:24 +02:00
Bruno Goncalves
cf4025c224
fix documentation code formulas
2015-08-13 23:13:47 -03:00
Alexander Alekhin
68f8d1cef0
Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue
2015-08-13 14:59:07 +00:00
Maksim Shabunin
9e4c62967b
Fixed RGBE images header parsing ( fixes #4885 )
2015-08-13 17:24:54 +03:00
Alexander Alekhin
53a92983a4
Merge pull request #5167 from ruslo:suppress.vs.error
2015-08-13 12:21:37 +00:00
Alexander Alekhin
9e065bc802
Merge pull request #5179 from alalek:update_android_samples
2015-08-13 12:02:30 +00:00
Alexander Alekhin
03bab0fc0d
tutorial-4-opencl: enable build with OpenCV
2015-08-13 13:32:23 +03:00
Alexander Alekhin
11a829f9de
Merge pull request #5180 from boatx:bugfix/proper-conversion-of-numpy-array-to-mat
2015-08-13 10:03:43 +00:00
Alexander Alekhin
6483919b17
Merge pull request #5170 from mshabunin:add-android-pack
2015-08-13 09:19:09 +00:00
boatx
d674965bf9
Fixing typo in variable name.
2015-08-12 20:50:05 +00:00
Maksim Shabunin
e0b327aafe
Merge pull request #5140 from PhilLab:patch-3
2015-08-12 15:50:03 +00:00
Alexander Alekhin
e1ad86c1fa
android samples: update way to attach native part of OpenCV
...
OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir)
Can be passed via ndk-build parameter or environment variable.
2015-08-12 18:37:29 +03:00
Alexander Alekhin
d789c810bf
Merge pull request #4239 from apavlenko:android_ocl_sample2
2015-08-12 14:00:36 +00:00
