Renato Florentino Garcia [Thu, 17 Sep 2015 00:16:23 +0000 (21:16 -0300)]
Correct a typo.
Vadim Pisarevsky [Mon, 14 Sep 2015 11:54:20 +0000 (11:54 +0000)]
Merge pull request #5272 from avershov:opencl-vaapi-fallback
Vadim Pisarevsky [Mon, 14 Sep 2015 11:49:14 +0000 (11:49 +0000)]
Merge pull request #5333 from UnaNancyOwen:fix3_LineAA
Vadim Pisarevsky [Mon, 14 Sep 2015 11:47:04 +0000 (11:47 +0000)]
Merge pull request #5337 from Dikay900:tbb_cmake_visibility
Vadim Pisarevsky [Mon, 14 Sep 2015 11:46:35 +0000 (11:46 +0000)]
Merge pull request #5339 from blebo:patch-1
Adam [Sun, 13 Sep 2015 16:12:06 +0000 (00:12 +0800)]
Correction of minor typo.
Dikay900 [Sat, 12 Sep 2015 10:19:44 +0000 (12:19 +0200)]
proposed change by psyill
Tsukasa Sugiura [Fri, 11 Sep 2015 16:42:25 +0000 (01:42 +0900)]
Fix LineAA in case of 4 channel
Fix bug when enter 4 channel image to LineAA function.
Alexander Alekhin [Fri, 11 Sep 2015 11:42:33 +0000 (11:42 +0000)]
Merge pull request #5317 from alalek:workaround
Maksim Shabunin [Fri, 11 Sep 2015 11:09:15 +0000 (11:09 +0000)]
Merge pull request #5255 from berak:java_videowriter
Vadim Pisarevsky [Fri, 11 Sep 2015 10:19:46 +0000 (10:19 +0000)]
Merge pull request #5327 from mshabunin:mingw-fix
Alexey Ershov [Thu, 10 Sep 2015 16:30:19 +0000 (19:30 +0300)]
implemented sample build in fallback mode without interop
Maksim Shabunin [Thu, 10 Sep 2015 14:12:22 +0000 (17:12 +0300)]
Enabled pthreads backend for mingw
Alexey Ershov [Thu, 10 Sep 2015 12:41:04 +0000 (15:41 +0300)]
sample changed to execute only one mode (interop on/off) per run
Alexey Ershov [Thu, 10 Sep 2015 11:36:40 +0000 (14:36 +0300)]
changed call to getDefault: false to true in fallback initialization
Maksim Shabunin [Thu, 10 Sep 2015 09:41:49 +0000 (09:41 +0000)]
Merge pull request #5321 from alalek:copy_if_different
Maksim Shabunin [Thu, 10 Sep 2015 09:22:07 +0000 (09:22 +0000)]
Merge pull request #5258 from sturkmen72:patch-6
Alexander Alekhin [Tue, 8 Sep 2015 01:06:04 +0000 (04:06 +0300)]
ocl: workaround for getUMat()
Andrey Pavlenko [Thu, 3 Sep 2015 14:18:59 +0000 (17:18 +0300)]
man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in `UMat::getMat()`
Alexander Alekhin [Wed, 9 Sep 2015 14:59:17 +0000 (14:59 +0000)]
Merge pull request #5293 from alalek:tapi_custom_ptr_perf
Alexander Alekhin [Wed, 9 Sep 2015 14:58:28 +0000 (14:58 +0000)]
Merge pull request #5292 from alalek:tapi_custom_ptr
Vadim Pisarevsky [Wed, 9 Sep 2015 13:41:39 +0000 (13:41 +0000)]
Merge pull request #5294 from LorenaGdL:master
Vadim Pisarevsky [Wed, 9 Sep 2015 11:00:40 +0000 (11:00 +0000)]
Merge pull request #5304 from paroj:calib_feye
Vadim Pisarevsky [Wed, 9 Sep 2015 10:39:52 +0000 (10:39 +0000)]
Merge pull request #5301 from vtsatskin:patch-1
Vadim Pisarevsky [Wed, 9 Sep 2015 10:34:29 +0000 (10:34 +0000)]
Merge pull request #5302 from berak:patch-2
Vadim Pisarevsky [Wed, 9 Sep 2015 10:30:22 +0000 (10:30 +0000)]
Merge pull request #5312 from sturkmen72:patch-2
Alexander Alekhin [Tue, 8 Sep 2015 19:42:05 +0000 (22:42 +0300)]
cmake: use copy_if_different
Alexey Ershov [Tue, 8 Sep 2015 18:01:57 +0000 (21:01 +0300)]
added run iteration without timing to complete internal initializations
Alexander Alekhin [Tue, 8 Sep 2015 16:52:43 +0000 (16:52 +0000)]
Merge pull request #5316 from mshabunin:fix-contrib-tests
Alexey Ershov [Tue, 8 Sep 2015 16:29:19 +0000 (19:29 +0300)]
fixed argument in call to {Input|Output}Array.getMat()
Alexey Ershov [Mon, 7 Sep 2015 18:11:05 +0000 (21:11 +0300)]
separated UMat & Mat usage in interop/copy paths
Maksim Shabunin [Mon, 7 Sep 2015 15:59:07 +0000 (18:59 +0300)]
Fixed: Concurrency static scheduler release failed
Suleyman TURKMEN [Mon, 7 Sep 2015 08:30:14 +0000 (11:30 +0300)]
Update drawing.cpp
https://github.com/Itseez/opencv/issues/4791
Suleyman TURKMEN [Thu, 27 Aug 2015 09:17:23 +0000 (12:17 +0300)]
documentation patch
Alexander Alekhin [Fri, 4 Sep 2015 16:49:41 +0000 (16:49 +0000)]
Merge pull request #5303 from berak:patch-3
berak [Fri, 4 Sep 2015 09:14:17 +0000 (11:14 +0200)]
Update cloning_gui.cpp
Pavel Rojtberg [Mon, 30 Mar 2015 14:53:10 +0000 (16:53 +0200)]
add support for fisheye camera model
berak [Fri, 4 Sep 2015 08:57:33 +0000 (10:57 +0200)]
Update PnPProblem.cpp
Alexey Ershov [Sun, 30 Aug 2015 23:33:15 +0000 (02:33 +0300)]
fallback path & sample timing implemented
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
Valentin Tsatskin [Thu, 3 Sep 2015 19:45:36 +0000 (15:45 -0400)]
Fix variable names in python color spaces tutorial
Alexander Alekhin [Wed, 2 Sep 2015 17:20:07 +0000 (20:20 +0300)]
UMat: add perf test for custom ptr
Alexander Alekhin [Wed, 2 Sep 2015 16:25:09 +0000 (19:25 +0300)]
update custom_ptr test
Lorena García [Thu, 3 Sep 2015 03:52:04 +0000 (05:52 +0200)]
TrainData doc update
Update docs according to PR #5127
Alexander Alekhin [Wed, 2 Sep 2015 13:19:52 +0000 (13:19 +0000)]
Merge pull request #5282 from mshabunin:mingw-51
Maksim Shabunin [Tue, 1 Sep 2015 10:49:23 +0000 (13:49 +0300)]
fixup! Some changes to support mingw-w64
Maksim Shabunin [Tue, 1 Sep 2015 09:14:40 +0000 (12:14 +0300)]
fixup! Some changes to support mingw-w64
Maksim Shabunin [Mon, 31 Aug 2015 21:59:08 +0000 (00:59 +0300)]
Some changes to support mingw-w64
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253)
Vadim Pisarevsky [Mon, 31 Aug 2015 11:09:40 +0000 (11:09 +0000)]
Merge pull request #5261 from apavlenko:android_ocl_sample_improvements
Vadim Pisarevsky [Mon, 31 Aug 2015 11:09:09 +0000 (11:09 +0000)]
Merge pull request #5269 from eladj:patch-1
Elad Joseph [Sun, 30 Aug 2015 09:42:30 +0000 (12:42 +0300)]
Update documentation in calib3d.hpp
Fixed small mistake in documentation.
The prism coefficients in y'' equation were mistakenly written as s1,s2 instead of s3,s4
Vadim Pisarevsky [Thu, 27 Aug 2015 14:31:35 +0000 (14:31 +0000)]
Merge pull request #5098 from powderluv:master
Vadim Pisarevsky [Thu, 27 Aug 2015 14:29:52 +0000 (14:29 +0000)]
Merge pull request #5242 from apavlenko:fix_releasing_temp_umat
Andrey Pavlenko [Thu, 27 Aug 2015 11:04:08 +0000 (14:04 +0300)]
giving a chance for OpenCL 1.1 devices
Andrey Pavlenko [Thu, 27 Aug 2015 11:03:08 +0000 (14:03 +0300)]
unused imports clean-up
Andrey Pavlenko [Thu, 27 Aug 2015 10:28:09 +0000 (13:28 +0300)]
adding `NO_PROCESSING` (i.e. just preview) mode
Andrey Pavlenko [Thu, 27 Aug 2015 10:23:39 +0000 (13:23 +0300)]
fixing start faulure on some devices; syncronization improvements
Alexander Alekhin [Thu, 27 Aug 2015 11:02:03 +0000 (11:02 +0000)]
Merge pull request #5260 from vipul-sharma20:vipul-sharma20-docs
Vipul Sharma [Thu, 27 Aug 2015 10:07:04 +0000 (15:37 +0530)]
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
Vadim Pisarevsky [Thu, 27 Aug 2015 07:07:53 +0000 (07:07 +0000)]
Merge pull request #5232 from sturkmen72:patch-6
berak [Wed, 26 Aug 2015 13:19:26 +0000 (15:19 +0200)]
enable VideoWriter class for java
fixing fourcc
Alexander Alekhin [Wed, 26 Aug 2015 15:14:14 +0000 (15:14 +0000)]
Merge pull request #5246 from mshabunin:ccache-fix
Maksim Shabunin [Wed, 26 Aug 2015 14:49:34 +0000 (14:49 +0000)]
Merge pull request #5249 from alalek:build_with_python3_only
Suleyman TURKMEN [Mon, 3 Aug 2015 15:57:33 +0000 (18:57 +0300)]
documentation patch
Andrey Pavlenko [Wed, 26 Aug 2015 11:15:18 +0000 (14:15 +0300)]
removing a garbage comment
Andrey Pavlenko [Wed, 26 Aug 2015 10:38:26 +0000 (13:38 +0300)]
making the test deepper
Alexander Alekhin [Wed, 26 Aug 2015 10:07:37 +0000 (13:07 +0300)]
fix build with python3 only
Anush Elangovan [Thu, 30 Jul 2015 17:28:06 +0000 (10:28 -0700)]
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.
Vadim Pisarevsky [Tue, 25 Aug 2015 18:09:50 +0000 (18:09 +0000)]
Merge pull request #4199 from AVshokurov:master
Vadim Pisarevsky [Tue, 25 Aug 2015 18:08:54 +0000 (18:08 +0000)]
Merge pull request #4200 from Astero92:#3800
Maksim Shabunin [Tue, 25 Aug 2015 15:24:07 +0000 (18:24 +0300)]
Fixed ccache detection condition
Vadim Pisarevsky [Tue, 25 Aug 2015 14:45:53 +0000 (14:45 +0000)]
Merge pull request #5115 from ManuelFreudenreich:hog_variable
Andrey Pavlenko [Tue, 25 Aug 2015 14:25:03 +0000 (17:25 +0300)]
fixing 'map_unmap_counting'
Maksim Shabunin [Tue, 28 Jul 2015 15:32:41 +0000 (18:32 +0300)]
Disabling precompiled headers when ccache is detected
Vadim Pisarevsky [Tue, 25 Aug 2015 07:51:32 +0000 (07:51 +0000)]
Merge pull request #5241 from alalek:fix_sample_opencl
Vadim Pisarevsky [Tue, 25 Aug 2015 07:46:28 +0000 (07:46 +0000)]
Merge pull request #4176 from alalek:issue_4461
Vadim Pisarevsky [Tue, 25 Aug 2015 07:44:29 +0000 (07:44 +0000)]
Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps
Vadim Pisarevsky [Tue, 25 Aug 2015 07:42:41 +0000 (07:42 +0000)]
Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module)
Vadim Pisarevsky [Tue, 25 Aug 2015 07:39:02 +0000 (07:39 +0000)]
Merge pull request #5142 from StevenPuttemans:fix_4230
Andrey Pavlenko [Mon, 24 Aug 2015 16:21:37 +0000 (19:21 +0300)]
Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit
5ee00ec5c6b21debd461808f584accbe7c42c869)
Alexander Alekhin [Mon, 24 Aug 2015 16:00:56 +0000 (16:00 +0000)]
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
Vadim Pisarevsky [Mon, 24 Aug 2015 14:20:54 +0000 (14:20 +0000)]
Merge pull request #4212 from ludv1x:master
Alexander Alekhin [Mon, 24 Aug 2015 10:40:10 +0000 (13:40 +0300)]
samples: fix OpenCL detection / build warning
Vadim Pisarevsky [Mon, 24 Aug 2015 11:05:43 +0000 (11:05 +0000)]
Merge pull request #5201 from alalek:move_semantics
Alexander Alekhin [Mon, 24 Aug 2015 00:47:00 +0000 (00:47 +0000)]
Merge pull request #5238 from LorenaGdL:master
Lorena García [Sun, 23 Aug 2015 17:09:15 +0000 (19:09 +0200)]
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'
Alexander Alekhin [Sun, 23 Aug 2015 06:42:52 +0000 (06:42 +0000)]
Merge pull request #5235 from philippefoubert:issue_5234
Philippe FOUBERT [Sat, 22 Aug 2015 11:39:34 +0000 (13:39 +0200)]
Modification of the related tests in core/tests/ocl
Philippe FOUBERT [Sat, 22 Aug 2015 11:16:59 +0000 (13:16 +0200)]
Fix issue #5234 (UMat::convertTo when noScale)
Vitaliy Lyudvichenko [Fri, 21 Aug 2015 16:26:29 +0000 (19:26 +0300)]
Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes
Maksim Shabunin [Fri, 21 Aug 2015 15:09:50 +0000 (15:09 +0000)]
Merge pull request #5231 from alalek:fix_tls
Alexander Alekhin [Fri, 21 Aug 2015 13:43:15 +0000 (16:43 +0300)]
tls: fix access to array (out of bounds)
Alexander Alekhin [Fri, 21 Aug 2015 12:47:14 +0000 (12:47 +0000)]
Merge pull request #5171 from avershov:opencl-vaapi-interop
Alexey Ershov [Wed, 12 Aug 2015 08:59:05 +0000 (11:59 +0300)]
implemented core support & sample
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
Alexander Alekhin [Thu, 20 Aug 2015 13:14:49 +0000 (13:14 +0000)]
Merge pull request #5222 from apavlenko:android_ocl_tutorial
Alexander Alekhin [Thu, 20 Aug 2015 12:49:54 +0000 (12:49 +0000)]
Merge pull request #5161 from alalek:fix_string
Alexander Alekhin [Thu, 20 Aug 2015 12:36:00 +0000 (12:36 +0000)]
Merge pull request #5195 from mshabunin:warn-missing-contrib
Andrey Pavlenko [Thu, 20 Aug 2015 12:12:27 +0000 (15:12 +0300)]
Android camera + OpenCL tutorial (for existing code at samples/android/tutorial-4-opencl)
Maksim Shabunin [Fri, 14 Aug 2015 15:08:25 +0000 (18:08 +0300)]
cmake: Added missing extra modules warning
Maksim Shabunin [Wed, 19 Aug 2015 15:22:35 +0000 (15:22 +0000)]
Merge pull request #5154 from brunomorishita:patch-1
Alexander Alekhin [Wed, 19 Aug 2015 14:18:19 +0000 (14:18 +0000)]
Merge pull request #5177 from lupustr3:pvlasov/tls_fixes
projects / platform / upstream / opencv.git / log