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
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
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
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
9 years ago
Bruno Goncalves
cf4025c224
fix documentation code formulas
9 years ago
Alexander Alekhin
68f8d1cef0
Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue
9 years ago
Maksim Shabunin
9e4c62967b
Fixed RGBE images header parsing ( fixes #4885 )
9 years ago
Alexander Alekhin
53a92983a4
Merge pull request #5167 from ruslo:suppress.vs.error
9 years ago
Alexander Alekhin
9e065bc802
Merge pull request #5179 from alalek:update_android_samples
9 years ago
Alexander Alekhin
03bab0fc0d
tutorial-4-opencl: enable build with OpenCV
9 years ago
Alexander Alekhin
11a829f9de
Merge pull request #5180 from boatx:bugfix/proper-conversion-of-numpy-array-to-mat
9 years ago
Alexander Alekhin
6483919b17
Merge pull request #5170 from mshabunin:add-android-pack
9 years ago
boatx
d674965bf9
Fixing typo in variable name.
9 years ago
Maksim Shabunin
e0b327aafe
Merge pull request #5140 from PhilLab:patch-3
9 years ago
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.
9 years ago
Alexander Alekhin
d789c810bf
Merge pull request #4239 from apavlenko:android_ocl_sample2
9 years ago
Maksim Shabunin
cb324b4ec3
Merge pull request #5168 from alalek:fix_5067
9 years ago
Maksim Shabunin
2255472e31
Fixed whitespace issue
9 years ago
Maksim Shabunin
ef16650f5c
Android SDK build Initial
9 years ago
Alexander Alekhin
c119e04947
fix opengl sample build on Linux ( #5067 )
9 years ago
Ruslan Baratov
e8a1bc2bd9
Suppress error message of execute_process
...
Command 'execute_process' from OpenCVFindMatlab module can omit error message
to the standard output. This can break build of the OpenCV package in
ExternalProject_Add (Windows/Visual Studio).
9 years ago
Vladimir Dudnik
6bb8afde96
fixed typo in OpenCLAllocator.upload method (wrong step used)
9 years ago
Vladimir Dudnik
131d7c394e
enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect)
9 years ago
Vladimir Dudnik
ef0d1c1c3f
fixed download/upload for non contiguous umat
9 years ago
Alexander Alekhin
09b9b0fb9e
Merge pull request #5135 from alalek:issue_4468
9 years ago
Alexander Alekhin
3316e58314
more test loops (and disable tests - tests pass but require a lot of time)
9 years ago
Alexander Alekhin
aed9f5d5e8
Merge pull request #5132 from hewj03:master
9 years ago
Bruno Goncalves
894c2468df
fix build error when both OpenNI and OpenNI2 are supported (issue 4918)
9 years ago
Alexander Alekhin
9b2a7fe723
Merge pull request #5125 from StevenPuttemans:fix_annotation_tool
9 years ago
Alexander Alekhin
11b3529b39
Merge pull request #5146 from avershov:fix-issue-5122
9 years ago
Alexander Alekhin
53effc529b
Merge pull request #5149 from Nerei:minor_comment_fix
9 years ago
Anatoly Baksheev
0dab097a26
minor comment fix
9 years ago