Maksim Shabunin
626ccfe410
Merge pull request #5525 from Milania1:doc_normTypes
2015-11-22 18:05:46 +00:00
Maksim Shabunin
ddf293a081
Merge pull request #5649 from hoangviet1985:solve_pow(x,3)=0_opencv300
2015-11-22 18:02:40 +00:00
hoangviet1985
3e96b724c2
squash
2015-11-20 15:03:32 -05:00
Maksim Shabunin
f019de6900
Merge pull request #5666 from mshabunin:vs-run-py
2015-11-20 15:53:48 +00:00
Maksim Shabunin
51797d133a
Merge pull request #5653 from jia-kai:fix-jpeg-exif
2015-11-20 15:37:50 +00:00
Maksim Shabunin
3cb76d5c66
Merge pull request #5663 from bertmsk:patch-1
2015-11-20 15:28:26 +00:00
Maksim Shabunin
047bda32d8
Merge pull request #5665 from paroj:matx_norm
2015-11-20 15:26:39 +00:00
Maksim Shabunin
3cfd7fcbbf
Merge pull request #5681 from sturkmen72:patch-3
2015-11-20 15:18:25 +00:00
Alexander Alekhin
559e1f76f9
Merge pull request #5685 from lupustr3:pvlasov/ipp9_fixes
2015-11-20 12:11:09 +00:00
Pavel Vlasov
9acf93b7c6
IPP Sobel getBufferSize wrong func fix;
2015-11-19 18:38:47 +03:00
Maksim Shabunin
c3cf1be344
fixup! run.py: issues with forced configuration fixed
2015-11-19 15:32:42 +03:00
Alexander Alekhin
e35959fad2
Merge pull request #5671 from PhilLab:patch-7
2015-11-19 10:10:13 +00:00
Suleyman TURKMEN
99a286ef24
Update imgcodecs.hpp
2015-11-19 00:25:36 +02: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
Maksim Shabunin
7df392bfd8
run.py: issues with forced configuration fixed
2015-11-16 14:02:26 +03:00
Philipp Hasper
4d3915f69a
Fixed mjpeg frame size attribution
2015-11-16 08:40:09 +01:00
Maksim Shabunin
97878645bc
Fix run.py test detection issues for debug VS configurations
2015-11-13 18:55:19 +03:00
Pavel Rojtberg
c209f795b5
support for NORM_L2SQR in norm(Matx<..>)
2015-11-13 14:29:56 +01:00
Bert
d3b0bda011
Update system.cpp
...
FreeBSD compilation fix
2015-11-13 11:03:34 +03:00
jiakai
933dfed4b8
check offset in ExifReader::getString
2015-11-11 20:17:24 +08: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