Vadim Pisarevsky
e2b677ddcf
Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps
9 years ago
Vadim Pisarevsky
b6869df556
Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module)
9 years ago
Vadim Pisarevsky
622301c78a
Merge pull request #5142 from StevenPuttemans:fix_4230
9 years ago
Andrey Pavlenko
f6b758699b
Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6
)
9 years ago
Alexander Alekhin
784f77a4a5
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
9 years ago
Vadim Pisarevsky
bd8bac27d5
Merge pull request #4212 from ludv1x:master
9 years ago
Alexander Alekhin
1b1246cbae
samples: fix OpenCL detection / build warning
9 years ago
Vadim Pisarevsky
ff8aa6662e
Merge pull request #5201 from alalek:move_semantics
9 years ago
Alexander Alekhin
c385ac575d
Merge pull request #5238 from LorenaGdL:master
9 years ago
Lorena García
9d01818e8a
Small update of Colormap documentation
...
Small change in documentation: http://docs.opencv.org/master/d3/d50/group__imgproc__colormap.html#gga9a805d8262bcbe273f16be9ea2055a65a5d4a709cda1130bfa3cc4b4c5ae8f82a&gsc.tab=0
In the enum images, the "parula" colormap has wrongly assigned subtitle 'hot'
9 years ago
Alexander Alekhin
6c42112555
Merge pull request #5235 from philippefoubert:issue_5234
9 years ago
Philippe FOUBERT
b668d3f693
Modification of the related tests in core/tests/ocl
9 years ago
Philippe FOUBERT
0629add3f7
Fix issue #5234 (UMat::convertTo when noScale)
9 years ago
Vitaliy Lyudvichenko
85cc11e3b2
Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes
9 years ago
Maksim Shabunin
680efe1a97
Merge pull request #5231 from alalek:fix_tls
9 years ago
Alexander Alekhin
b8956d0111
tls: fix access to array (out of bounds)
9 years ago
Alexander Alekhin
44f8670719
Merge pull request #5171 from avershov:opencl-vaapi-interop
9 years ago
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
9 years ago
Alexander Alekhin
1f7fc6875f
Merge pull request #5222 from apavlenko:android_ocl_tutorial
9 years ago
Alexander Alekhin
c1778f1199
Merge pull request #5161 from alalek:fix_string
9 years ago
Alexander Alekhin
3afe8832c5
Merge pull request #5195 from mshabunin:warn-missing-contrib
9 years ago
Andrey Pavlenko
58e5aca631
Android camera + OpenCL tutorial (for existing code at samples/android/tutorial-4-opencl)
9 years ago
Maksim Shabunin
973abf0d62
cmake: Added missing extra modules warning
9 years ago
Maksim Shabunin
4a067dca58
Merge pull request #5154 from brunomorishita:patch-1
9 years ago
Alexander Alekhin
887d8d091b
Merge pull request #5177 from lupustr3:pvlasov/tls_fixes
9 years ago
Alexander Alekhin
76da19d543
Merge pull request #5148 from StevenPuttemans:fix_4237
9 years ago
Steven Puttemans
be89b0505a
Fix
9 years ago
Pavel Vlasov
a33d98c13a
TLS memory leaks were fixed;
...
TLS was redesigned in more straightforward way;
OPENCV_ABI_COMPATIBILITY define was added;
9 years ago
Alexander Alekhin
ca5e07d342
Merge pull request #5199 from TheodoreT:tickmeter_update
9 years ago
Alexander Alekhin
365603e1c2
Merge pull request #5212 from thebucc:master
9 years ago
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).
9 years ago
theodore
9449af8ada
1e-3 -> 1e3
9 years ago
Alexander Alekhin
5ee00ec5c6
Merge pull request #5176 from vladimir-dudnik:master
9 years ago
Vladimir Dudnik
58934f1e16
add condition to skip unmapping for internally allocated host memory. this should fix map_unmap_counting UMat test.
9 years ago
Alexander Alekhin
8e5ce69ee8
Merge pull request #5208 from ilya-lavrenov:cmd
9 years ago
Alexander Alekhin
9b0f5e61d1
Merge pull request #5185 from mshabunin:fix-rgbe-header-parse
9 years ago
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.
9 years ago
Ilya Lavrenov
7da16d6f47
used proper method
9 years ago
Alexander Alekhin
0e4bd80b80
Merge pull request #5194 from mshabunin:add-contrib-tutorials-root
9 years ago
Alexander Alekhin
e65de8d1da
fixes for MSVS compiler optimizer
9 years ago
Alexander Alekhin
ac37b77452
c++ move semantics for cv::UMat
9 years ago
Alexander Alekhin
306aa0e699
c++ move semantics for cv::Mat_
9 years ago
Alexander Alekhin
1afc9eb730
c++ move semantics for cv::Mat
9 years ago
Alexander Alekhin
5a0af53683
c++ move semantics for cv::Ptr<>
9 years ago
theodore
6d68f72473
bug fix fro the TickMeter class
9 years ago
Alexander Alekhin
56cdd6f14f
Merge pull request #5116 from lenlen:viz_improvement
9 years ago
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
9 years ago
Maksim Shabunin
612822367d
Added auto-generated root page for all contrib tutorials
9 years ago
Alexander Alekhin
e866680d96
Merge pull request #5156 from brunomorishita:fix_build
9 years ago
Alexander Alekhin
30e6725006
Merge pull request #5192 from D-Alex:master
9 years ago