bbff288447
fix build with python3 only
2015-08-26 13:08:06 +03:00
b33853c5be
Merge pull request #4199 from AVshokurov:master
2015-08-25 18:09:50 +00:00
587b0cc7b4
Merge pull request #4200 from Astero92:#3800
2015-08-25 18:08:54 +00:00
96fa0ef752
Merge pull request #5115 from ManuelFreudenreich:hog_variable
2015-08-25 14:45:53 +00:00
ef1d4eba84
Merge pull request #5241 from alalek:fix_sample_opencl
2015-08-25 07:51:33 +00:00
edcd2c0408
Merge pull request #4176 from alalek:issue_4461
2015-08-25 07:46:28 +00:00
e2b677ddcf
Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps
2015-08-25 07:44:29 +00:00
b6869df556
Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module)
2015-08-25 07:42:41 +00:00
622301c78a
Merge pull request #5142 from StevenPuttemans:fix_4230
2015-08-25 07:39:02 +00:00
784f77a4a5
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
2015-08-24 16:00:56 +00:00
bd8bac27d5
Merge pull request #4212 from ludv1x:master
2015-08-24 14:20:54 +00:00
1b1246cbae
samples: fix OpenCL detection / build warning
2015-08-24 15:52:14 +03:00
ff8aa6662e
Merge pull request #5201 from alalek:move_semantics
2015-08-24 11:05:43 +00:00
c385ac575d
Merge pull request #5238 from LorenaGdL:master
2015-08-24 00:47:01 +00:00
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'
2015-08-23 19:09:15 +02:00
6c42112555
Merge pull request #5235 from philippefoubert:issue_5234
2015-08-23 06:42:52 +00:00
b668d3f693
Modification of the related tests in core/tests/ocl
2015-08-22 13:39:34 +02:00
0629add3f7
Fix issue #5234 (UMat::convertTo when noScale)
2015-08-22 13:16:59 +02:00
85cc11e3b2
Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes
2015-08-21 19:26:29 +03:00
680efe1a97
Merge pull request #5231 from alalek:fix_tls
2015-08-21 15:09:50 +00:00
b8956d0111
tls: fix access to array (out of bounds)
2015-08-21 16:43:15 +03:00
44f8670719
Merge pull request #5171 from avershov:opencl-vaapi-interop
2015-08-21 12:47:14 +00:00
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
1f7fc6875f
Merge pull request #5222 from apavlenko:android_ocl_tutorial
2015-08-20 13:14:50 +00:00
c1778f1199
Merge pull request #5161 from alalek:fix_string
2015-08-20 12:49:54 +00:00
3afe8832c5
Merge pull request #5195 from mshabunin:warn-missing-contrib
2015-08-20 12:36:00 +00:00
58e5aca631
Android camera + OpenCL tutorial (for existing code at samples/android/tutorial-4-opencl)
2015-08-20 15:13:34 +03:00
973abf0d62
cmake: Added missing extra modules warning
2015-08-19 18:33:59 +03:00
4a067dca58
Merge pull request #5154 from brunomorishita:patch-1
2015-08-19 15:22:35 +00:00
887d8d091b
Merge pull request #5177 from lupustr3:pvlasov/tls_fixes
2015-08-19 14:18:19 +00:00
76da19d543
Merge pull request #5148 from StevenPuttemans:fix_4237
2015-08-19 13:28:48 +00:00
be89b0505a
Fix
2015-08-19 13:46:17 +02:00
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
ca5e07d342
Merge pull request #5199 from TheodoreT:tickmeter_update
2015-08-17 17:18:31 +00:00
365603e1c2
Merge pull request #5212 from thebucc:master
2015-08-17 16:37:27 +00:00
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
9449af8ada
1e-3 -> 1e3
2015-08-17 15:52:16 +02:00
5ee00ec5c6
Merge pull request #5176 from vladimir-dudnik:master
2015-08-17 12:22:15 +00:00
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
8e5ce69ee8
Merge pull request #5208 from ilya-lavrenov:cmd
2015-08-17 10:19:53 +00:00
9b0f5e61d1
Merge pull request #5185 from mshabunin:fix-rgbe-header-parse
2015-08-17 10:19:15 +00:00
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
7da16d6f47
used proper method
2015-08-17 01:44:50 +03:00
0e4bd80b80
Merge pull request #5194 from mshabunin:add-contrib-tutorials-root
2015-08-16 15:08:40 +00:00
e65de8d1da
fixes for MSVS compiler optimizer
2015-08-16 02:03:04 +03:00
ac37b77452
c++ move semantics for cv::UMat
2015-08-16 02:02:26 +03:00
306aa0e699
c++ move semantics for cv::Mat_
2015-08-16 02:02:25 +03:00
1afc9eb730
c++ move semantics for cv::Mat
2015-08-16 02:02:24 +03:00
5a0af53683
c++ move semantics for cv::Ptr<>
2015-08-15 16:45:19 +03:00
6d68f72473
bug fix fro the TickMeter class
2015-08-15 14:12:40 +02:00
Alexander Alekhin
Vadim Pisarevsky
Lorena García
Philippe FOUBERT
Vitaliy Lyudvichenko
Maksim Shabunin
Alexey Ershov
Andrey Pavlenko
Steven Puttemans
Pavel Vlasov
thebucc
theodore
Vladimir Dudnik
Ashley Stacey
Ilya Lavrenov