askourik
b3e8c65e5e
removed code duplication for non-intel platforms
2015-11-23 22:41:35 +03:00
askourik
4cf7ddfd87
Added new function definition in AGAST module header for tree-optimized version
2015-11-23 22:11:01 +03:00
askourik
a6bbe06379
Merge branch 'opencv_agast_tree' of https://github.com/askourik/opencv into opencv_agast_tree
2015-11-19 07:41:55 +03:00
askourik
cc5a1d612e
added comments and test perl examples for agast tree version
2015-11-19 07:39:57 +03:00
askourik
ae66ce9d22
Add treelookups for nonintel
2015-11-19 07:06:20 +03:00
Vadim Pisarevsky
8b554d3c2d
Merge pull request #5654 from mshabunin:ios-framework
2015-11-17 17:55:23 +00:00
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Vadim Pisarevsky
b4112a5878
Merge pull request #5480 from dtmoodie:vecgpumat
2015-11-10 17:02:21 +00:00
Vadim Pisarevsky
3942b1f362
Merge pull request #5340 from alalek:ocl_off
2015-11-10 16:53:36 +00:00
Vadim Pisarevsky
38909d7959
Merge pull request #5597 from andy-held:cmakecudacross
2015-11-10 16:15:26 +00:00
Vadim Pisarevsky
18f4e55692
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function
2015-11-10 16:14:43 +00:00
Vadim Pisarevsky
9ab59fb22e
Merge pull request #5645 from jia-kai:master
2015-11-10 15:56:23 +00:00
Vadim Pisarevsky
7b022371ea
Merge pull request #5646 from brossetti:patch-1
2015-11-10 15:56:05 +00:00
brossetti
4194b7effe
fixed bug on left mouse button click
...
Adding None as outImage in pos3 of cv2.drawKeypoints. Fixes bug that throws 'TypeError: Required argument 'outImage' (pos 3) not found' on left mouse button click
2015-11-09 04:37:59 -05:00
jiakai
80df9ddedb
check for exifSize
2015-11-05 18:32:51 +08:00
jiakai
1260060d7d
check boundary in ExifReader
2015-11-05 17:58:35 +08:00
Andreas Franek
01c5a0ed12
Simplifies cross compilation with CUDA for ARM boards. CUDA arch is set for all ARM targets, --unresolved-symbols=ignore-in-shared-libs is set when cross-compiling for ARM and FindCUDA.cmake was adjusted to find shared library stubs within the CUDA toolkit.
2015-11-03 12:30:34 +01:00
Vadim Pisarevsky
b3ac274617
Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix
2015-11-03 10:59:45 +00:00
Vadim Pisarevsky
de49ed3c15
Merge pull request #5388 from alalek:disable_invalid_string_usage
2015-11-03 10:58:57 +00:00
Alexander Alekhin
4514158e43
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
2015-11-03 10:18:44 +00:00
Vadim Pisarevsky
979f88f6db
Merge pull request #5518 from Bovaz:master
2015-11-02 15:58:58 +00:00
Vadim Pisarevsky
8512ca7490
Merge pull request #5484 from PolarNick239:master
2015-11-02 15:45:59 +00:00
Vadim Pisarevsky
67ef84d883
Merge pull request #5386 from StevenPuttemans:add_markers
2015-11-02 15:45:38 +00:00
Pavel Vlasov
4d7f9e06e8
Fix for copy with mask 32s and 8u;
2015-11-02 18:00:22 +03:00
Vadim Pisarevsky
b5fd7868a8
Merge pull request #5487 from Wangyida:python
2015-11-02 12:26:53 +00:00
Vadim Pisarevsky
7ca9e49749
Merge pull request #5607 from n3011:patch-1
2015-11-02 11:55:12 +00:00
Vadim Pisarevsky
a69fd6029a
Merge pull request #5512 from edgarriba:gdal_lan
2015-11-02 11:53:08 +00:00
Vadim Pisarevsky
3c31d6add3
Merge pull request #5515 from LorenaGdL:hitAndMiss
2015-11-02 11:49:37 +00:00
Vadim Pisarevsky
7323823b38
Merge pull request #5582 from sizeofvoid:master
2015-11-02 11:39:43 +00:00
Vadim Pisarevsky
b2f6aedec9
Merge pull request #5587 from lupustr3:pvlasov/ipp_cond_update
2015-11-02 11:38:02 +00:00
Vadim Pisarevsky
46dd502f4a
Merge pull request #5602 from ChrisKitching:clearerMatErrors
2015-11-02 11:37:34 +00:00
Vadim Pisarevsky
39346f3204
Merge pull request #5592 from berak:python_rect2d
2015-11-02 11:36:03 +00:00
Vadim Pisarevsky
32b44173e7
Merge pull request #5595 from mshabunin:fix-bitonal-tif
2015-11-02 11:32:17 +00:00
Vadim Pisarevsky
00f222a9b4
Merge pull request #5598 from ajbernal:ocl_bilateral_bugfix
2015-11-02 11:22:25 +00:00
Vadim Pisarevsky
920427af5e
Merge pull request #5600 from grundman:patch-3
2015-11-02 11:15:08 +00:00
Vadim Pisarevsky
d55e44f0b7
Merge pull request #5608 from n3011:patch-2
2015-11-02 11:14:39 +00:00
Vadim Pisarevsky
92298c88bd
Merge pull request #5609 from n3011:patch-3
2015-11-02 11:14:24 +00:00
Vadim Pisarevsky
c963757b43
Merge pull request #5610 from n3011:patch-4
2015-11-02 11:13:49 +00:00
Ishant Mrinal Haloi
47b2511f07
Update driver_api_stereo_multi.cpp
2015-11-02 15:08:27 +08:00
Ishant Mrinal Haloi
52b4fe63c1
Update cascadeclassifier_nvidia_api.cpp
2015-11-02 15:07:45 +08:00
Ishant Mrinal Haloi
46be45b4f7
Update driver_api_multi.cpp
2015-11-02 15:06:38 +08:00
Ishant Mrinal Haloi
64eb69cb15
Update multi.cpp
2015-11-02 15:05:45 +08:00
edgarriba
f50858dd24
set GA_ReadOnly flag again since test error
2015-11-01 12:07:05 +01:00
Chris Kitching
0f8a266787
Make Mat assertion failures more helpful
...
Instead of chaining a bunch of sanity checks together with "&&", let's just have several asserts. That way, when an assert fails, you don't get a monsterous "<huge evil expression>
failed" error, but only the bit you care about, making your life rather a lot easier.
2015-11-01 01:02:15 +00:00
edgarriba
a242556b1d
Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
...
Conflicts:
modules/imgcodecs/include/opencv2/imgcodecs.hpp
2015-10-31 20:18:41 +01:00
edgarriba
decdae515b
set GA_Update flag in order remove ERROR 8: band 1: Attempt to write to read only dataset inGDALRasterBand::Fill()
2015-10-31 20:11:05 +01:00
edgarriba
9ff14bc411
add support for float32 and float 64
2015-10-31 20:00:39 +01:00
grundman
f609ddba05
Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
...
Current implementation returns NaN for some configs of FFMPEG, call default get_fps() instead (as also used by PROP_POS_MSEC)
2015-10-30 17:48:04 -07:00
Ariel Bernal
cc903d0605
Fix for #5590 . OpenCL BilateralFilter implementation failes to
...
build for some OCL drivers.
Some OCL vendors treat implicit scalar-vector conversions for
operators as errors when type conversion is required.
2015-10-30 09:39:11 -07:00
Hajo Nils Krabbenhöft
a8e550f5bf
Fixed crash when reading b/w tif images ( fixes #5579 )
2015-10-30 17:41:52 +03:00
