Vadim Pisarevsky
faa6684373
Merge pull request #5098 from powderluv:master
2015-08-27 14:31:35 +00:00
Vadim Pisarevsky
a78da45fec
Merge pull request #5242 from apavlenko:fix_releasing_temp_umat
2015-08-27 14:29:52 +00:00
Alexander Alekhin
4b0f3bf188
Merge pull request #5260 from vipul-sharma20:vipul-sharma20-docs
2015-08-27 11:02:03 +00:00
Vipul Sharma
072b1469e7
fixed the URL under Additional Resources
...
The URL http://www.nptel.iitm.ac.in/courses/106108057/26 under Additional Resource section gives a 404. I've added the updated one i.e. http://www.nptel.ac.in/courses/106108057/26
2015-08-27 15:37:04 +05:30
Vadim Pisarevsky
bd43c62a75
Merge pull request #5232 from sturkmen72:patch-6
2015-08-27 07:07:53 +00:00
Alexander Alekhin
af9c558764
Merge pull request #5246 from mshabunin:ccache-fix
2015-08-26 15:14:14 +00:00
Maksim Shabunin
0be2d4188e
Merge pull request #5249 from alalek:build_with_python3_only
2015-08-26 14:49:34 +00:00
Suleyman TURKMEN
f660461bb3
documentation patch
2015-08-26 17:40:38 +03:00
Andrey Pavlenko
b78eb49178
removing a garbage comment
2015-08-26 14:15:18 +03:00
Andrey Pavlenko
4aefb9f2fc
making the test deepper
2015-08-26 13:38:26 +03:00
Alexander Alekhin
bbff288447
fix build with python3 only
2015-08-26 13:08:06 +03:00
Anush Elangovan
7bb3feff45
Add Android ARMEABI_V7A_HARD for Hardfp support
...
Add Android HardFP support. Expose the "armeabi-v7a-hard with NEON"
ANDROID_ABI.
TEST= Add -DANDROID_NATIVE_API_LEVEL=21
-DANDROID_ABI="armeabi-v7a-hard with NEON"
to compile with hardfp. Checked the output of make verbose to
confirm -lm_hard is being linked. There are known test
failures but that can be fixed once this is in.
2015-08-25 15:57:55 -07:00
Vadim Pisarevsky
b33853c5be
Merge pull request #4199 from AVshokurov:master
2015-08-25 18:09:50 +00:00
Vadim Pisarevsky
587b0cc7b4
Merge pull request #4200 from Astero92:#3800
2015-08-25 18:08:54 +00:00
Maksim Shabunin
69db797ebb
Fixed ccache detection condition
2015-08-25 18:24:07 +03:00
Vadim Pisarevsky
96fa0ef752
Merge pull request #5115 from ManuelFreudenreich:hog_variable
2015-08-25 14:45:53 +00:00
Andrey Pavlenko
3656a1aa66
fixing 'map_unmap_counting'
2015-08-25 17:25:03 +03:00
Maksim Shabunin
84ecf4b1dd
Disabling precompiled headers when ccache is detected
2015-08-25 16:53:32 +03:00
Vadim Pisarevsky
ef1d4eba84
Merge pull request #5241 from alalek:fix_sample_opencl
2015-08-25 07:51:33 +00:00
Vadim Pisarevsky
edcd2c0408
Merge pull request #4176 from alalek:issue_4461
2015-08-25 07:46:28 +00:00
Vadim Pisarevsky
e2b677ddcf
Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps
2015-08-25 07:44:29 +00:00
Vadim Pisarevsky
b6869df556
Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module)
2015-08-25 07:42:41 +00:00
Vadim Pisarevsky
622301c78a
Merge pull request #5142 from StevenPuttemans:fix_4230
2015-08-25 07:39:02 +00:00
Andrey Pavlenko
f6b758699b
Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6)
2015-08-24 19:22:22 +03:00
Alexander Alekhin
784f77a4a5
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
2015-08-24 16:00:56 +00:00
Vadim Pisarevsky
bd8bac27d5
Merge pull request #4212 from ludv1x:master
2015-08-24 14:20:54 +00:00
Alexander Alekhin
1b1246cbae
samples: fix OpenCL detection / build warning
2015-08-24 15:52:14 +03:00
Vadim Pisarevsky
ff8aa6662e
Merge pull request #5201 from alalek:move_semantics
2015-08-24 11:05:43 +00:00
Alexander Alekhin
c385ac575d
Merge pull request #5238 from LorenaGdL:master
2015-08-24 00:47:01 +00:00
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'
2015-08-23 19:09:15 +02:00
Alexander Alekhin
6c42112555
Merge pull request #5235 from philippefoubert:issue_5234
2015-08-23 06:42:52 +00:00
Philippe FOUBERT
b668d3f693
Modification of the related tests in core/tests/ocl
2015-08-22 13:39:34 +02:00
Philippe FOUBERT
0629add3f7
Fix issue #5234 (UMat::convertTo when noScale)
2015-08-22 13:16:59 +02:00
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
