Commit Graph

16858 Commits

Author SHA1 Message Date
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
Maksim Shabunin
cb324b4ec3 Merge pull request #5168 from alalek:fix_5067 2015-08-12 13:11:57 +00:00
Maksim Shabunin
2255472e31 Fixed whitespace issue 2015-08-12 14:57:49 +03:00
Maksim Shabunin
ef16650f5c Android SDK build Initial 2015-08-12 11:31:35 +03:00
ManuelFreudenreich
89889ae8ea changed hog to work with variable parameters and changed the hog sample to test it with more options
added comments and tests
2015-08-12 09:16:20 +02:00
Alexander Alekhin
c119e04947 fix opengl sample build on Linux (#5067) 2015-08-11 22:49:19 +03:00
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).
2015-08-11 20:39:24 +03:00
Vladimir Dudnik
6bb8afde96 fixed typo in OpenCLAllocator.upload method (wrong step used) 2015-08-11 16:01:05 +03:00
Vladimir Dudnik
131d7c394e enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect) 2015-08-11 14:19:14 +03:00
Vladimir Dudnik
ef0d1c1c3f fixed download/upload for non contiguous umat 2015-08-11 01:33:46 +03:00
Alexander Alekhin
cda9ed449f fix some functions for valid processing of empty string content (cstr_==0, len_==0) 2015-08-10 18:08:58 +03:00
Alexander Alekhin
09b9b0fb9e Merge pull request #5135 from alalek:issue_4468 2015-08-10 14:46:31 +00:00
Alexander Alekhin
3316e58314 more test loops (and disable tests - tests pass but require a lot of time) 2015-08-10 14:44:28 +03:00
Alexander Alekhin
aed9f5d5e8 Merge pull request #5132 from hewj03:master 2015-08-09 11:27:43 +00:00
Bruno Goncalves
894c2468df fix build error when both OpenNI and OpenNI2 are supported (issue 4918) 2015-08-09 00:48:49 -03:00
Alexander Alekhin
9b2a7fe723 Merge pull request #5125 from StevenPuttemans:fix_annotation_tool 2015-08-08 16:52:25 +00:00
Alexander Alekhin
11b3529b39 Merge pull request #5146 from avershov:fix-issue-5122 2015-08-07 10:55:08 +00:00
Alexander Alekhin
53effc529b Merge pull request #5149 from Nerei:minor_comment_fix 2015-08-07 10:13:56 +00:00
Anatoly Baksheev
0dab097a26 minor comment fix 2015-08-07 12:55:10 +03:00
StevenPuttemans
b09f591dda fix py_matcher tutorial 2015-08-07 09:36:49 +02:00
Alexey Ershov
c7f420ba75 applied changes proposed in 5122 2015-08-06 20:55:41 +03:00
StevenPuttemans
dd8589c352 change as suggested by original programmer and user of ecc software 2015-08-06 14:59:15 +02:00
Philipp Hasper
29db3c2f17 Update README.md 2015-08-06 14:00:24 +02:00
Alexander Alekhin
8293ed7f9b add tests from issue 4468 (#5062) 2015-08-06 13:50:13 +03:00
StevenPuttemans
d0344cd308 add checks for valid input data given to parameters
make the software system dependent
add LICENSE on top
2015-08-06 10:24:33 +02:00
Wenju He
67ca143a0b fix adaptiveThreshold mean 2015-08-06 10:23:31 +08:00