Vadim Pisarevsky
313dc32606
Merge pull request #5644 from hoangviet1985:splitError
2015-11-23 13:43:38 +00:00
Vadim Pisarevsky
42001234ab
Merge pull request #5390 from StevenPuttemans:add_markers_2.4
2015-11-23 13:40:00 +00:00
Vadim Pisarevsky
d4d1d03455
Merge pull request #5635 from mzajko:xi_update
2015-11-23 13:34:23 +00:00
Pavel Vlasov
7375383d26
Canny IPP Sobel getBufferSize wrong func fix;
2015-11-23 14:31:22 +03:00
Maksim Shabunin
9a66191ea8
Merge pull request #5571 from jas0n1ee:master
2015-11-23 09:52:41 +00:00
Maksim Shabunin
bd53a30e76
Merge pull request #5658 from berak:akaze_fix
2015-11-23 09:51:23 +00:00
hoangviet1985
e679d97100
remove redundant code
2015-11-22 14:32:18 -05:00
Maksim Shabunin
04f70c92a8
Merge pull request #5449 from rokm:stereo-fixes
2015-11-22 18:30:16 +00:00
Maksim Shabunin
3ae21095df
Merge pull request #5448 from Milania1:doc_normalize
2015-11-22 18:07:13 +00:00
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
Pavel Rojtberg
cefa1dc5cb
switch mask type from vector<int> to vector<uchar>
2015-11-21 00:45:45 +01:00
hoangviet1985
3e96b724c2
squash
2015-11-20 15:03:32 -05:00
hoangviet1985
b96def885f
squash
2015-11-20 14:48:29 -05:00
Maksim Shabunin
5c0cdd4d2d
Merge pull request #5650 from hoangviet1985:fix_bug_5623
2015-11-20 16:15:47 +00: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
Rok Mandeljc
7452f9a56e
cudastereo: document lack of fractional bits in 16-bit signed format for StereoBeliefPropagation
2015-11-19 11:05:13 +01:00
Rok Mandeljc
1c804124d1
cudastereo: updated documentation for reprojectImage3D and drawColorDisp
...
Updated the list of supported input formats, added note about 16-bit
signed format (no fractional bits).
2015-11-19 11:05:13 +01:00
Rok Mandeljc
980d84e4a2
calib3d: improve documentation of reprojectImageTo3D
...
Make a note about 16-bit signed format - the function assumes that
values have no fractional bits (so 16-bit disparity from StereoBM
and StereoSGBM cannot be directly used!)
2015-11-19 11:05:13 +01:00
Rok Mandeljc
bf5e930468
cudastereo: drawColorDisp: enabled CV_32S and CV_32F disparity formats
2015-11-19 11:05:13 +01:00
Rok Mandeljc
9f82ac18d4
cudastereo: reprojectImageTo3D: enabled CV_32S and CV_32F disparity formats
...
This is to achieve parity with the CPU equivalent.
2015-11-19 11:05:13 +01:00
Maksim Shabunin
739d7caa32
Merge pull request #5659 from jet47:cuda-wrap-stream-2.4
2015-11-19 09:25:36 +00:00
Maksim Shabunin
6148c3525e
Merge pull request #5672 from ilya-lavrenov:npp-graphcut
2015-11-19 09:18:23 +00: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
Suleyman TURKMEN
99a286ef24
Update imgcodecs.hpp
2015-11-19 00:25:36 +02:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03: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
Pavel Rojtberg
81e814d9ed
clean up fisheye calibration code
...
improves performance by factor 1.2 to 2.0
2015-11-16 02:24:53 +01:00
Ilya Lavrenov
0050df8750
GraphCut deprecated in 7.5 and removed in 8.0
2015-11-15 00:56:56 +03:00
Maksim Shabunin
97878645bc
Fix run.py test detection issues for debug VS configurations
2015-11-13 18:55:19 +03:00
Maksim Shabunin
01b5971c94
Merge pull request #5640 from mshabunin:restore-ts-gpu
2015-11-13 15:47:17 +00: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
mbarann
b48b2d43b0
MSMF expects a bottom-up video frame, so the buffer pointer must point to the end of the data and the stride needs to be negative
2015-11-12 13:13:45 +01:00
berak
0baf0bdc24
AKAZE: check channels instead of type in detectAndCompute
...
add same CV_32F and CV_16U support for KAZE
2015-11-12 12:48:03 +01:00
Vladislav Vinogradov
39854ceda4
cuda::StreamAccessor::wrapStream and cuda::EventAccessor::wrapEvent
...
to import existed CUDA stream or CUDA event to OpenCV
2015-11-12 13:38:29 +03:00
Vladislav Vinogradov
8d3850ac02
add cv::gpu::StreamAccessor::wrapStream method
...
it allows to import existed CUDA stream to OpenCV
2015-11-12 13:07:30 +03:00
Alexander Alekhin
1862d1995f
Merge pull request #5652 from jet47:core-test-math-warning-fix
2015-11-12 03:10:46 +00:00
Pavel Rojtberg
9233472bdd
use cpp functions in CvLevMarq::step for better readability
2015-11-12 00:20:13 +01:00
Tian Zhi
f0434d60b0
fixed the type inconsistent with document.
...
Document say probs will have CV_64F type. But in effect, it has CV_32F type.
http://docs.opencv.org/3.0.0/d1/dfb/classcv_1_1ml_1_1EM.html#a2ea7da92a75bc7a7d665c241f547b9b9
2015-11-12 02:54:18 +08:00
Jan Starzynski
2799829bc9
fix potential buffer overflow as in 3.0
2015-11-11 16:19:20 +01:00
jiakai
933dfed4b8
check offset in ExifReader::getString
2015-11-11 20:17:24 +08:00
Vladislav Vinogradov
d5e6503fe5
fix signed/unsigned comparison warning in core/test/test_math.cpp
2015-11-11 11:53:39 +03:00
hoangviet1985
6441620f45
The right signs give the right results
2015-11-10 16:18:07 -05: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
Marian Zajko
1eb9ef6bbf
Fixed downsampling parameter enumerator backward compatibility.
2015-11-10 17:18:10 +01:00
Vadim Pisarevsky
18f4e55692
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function
2015-11-10 16:14:43 +00:00
Vadim Pisarevsky
0f288d1082
Merge pull request #5605 from hoangviet1985:fix_bug_5599
2015-11-10 16:13:26 +00:00
Vadim Pisarevsky
82c1c68560
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4
2015-11-10 16:03:48 +00:00
Vadim Pisarevsky
780b713016
Merge pull request #5638 from hoangviet1985:fix_bug_5623
2015-11-10 16:01:48 +00:00
Marian Zajko
286055b0d8
Removed trailing whitespace.
2015-11-10 12:25:57 +01:00
Marian Zajko
2cebe5a3b0
Fixed parameter enumrators list order to retain binary compatibility.
2015-11-10 12:07:19 +01:00
Marian Zajko
2998248dd3
Removed whitespaces reported by buildbot.
2015-11-09 13:30:08 +01:00
Marian Zajko
352b121202
Fixed whitespace issue
...
Removed tabulators from enumerators and ximea adapter source as reported
by precommit docs test.
2015-11-09 12:07:53 +01:00
Pavel Rojtberg
742fb559f7
use cpp functions in cvCalibrateCamera2 to make it more readable
2015-11-08 19:25:38 +01:00
Pavel Rojtberg
955f489621
make CV_CAP_PROP_FORMAT consider the current channel count
2015-11-08 17:01:03 +01:00
Pavel Rojtberg
05f52b697f
replace uyvy_to_rgb24 by tested and conformant cvtColor
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
ad68b79630
replace yuv420p_to_rgb24 by tested and conformant cvtColor
...
Conversion was not ITU 601 conformant. Also add YVU420 format to allowed
zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
8527d895bb
replace rgb24_to_rgb24 by tested cvtColor
...
internally using ipp this conversion is now roughly 2x faster.
also add RGB/ BGR formats to allowed zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
f50817120e
v4l: remove needless CvCaptureCAM_V4L_CPP wrapper
...
possible source of memory leaks and unneeded complexity
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
93d6e800b6
v4l: Fixed memory leaks and inconsistent status return values
...
by updating to c++ coding conventions
- const correctness
- use bool as return value
- use explicit initialization instead of CLEAR macro/ memset
- use cv namespace
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
a581ddd896
remove support of Video4Linux1 API
...
the last kernel that allowed compiling this code was 2.6.37 which was
released almost 5 Years ago. So probably it does not get much testing
any more. Furthermore even back then one was better off using the V4L2
API.
The only change touching currently used code is the removal of the
global V4L2_SUPPORT variable.
2015-11-08 17:01:02 +01:00
berak
28974e7290
remove usage of obsolete _dataAsRows flag
2015-11-06 19:59:25 +03:00
Maksim Shabunin
ffb9e877e9
Restore ts/gpu_perf.hpp, trying to compile with VS 2015
2015-11-06 13:26:58 +03:00
Viet Dinh
57829d81ea
mac compile error
2015-11-05 23:31:30 -05:00
Viet Dinh
a20a273982
Merge remote-tracking branch 'Itseez/2.4' into fix_bug_5599
2015-11-05 23:20:04 -05:00
Viet Dinh
a1532582a6
optimize code
2015-11-05 19:38:24 -05:00
Viet Dinh
68bcff26fb
fix solveCubic
...
The original solution did not handle correctly when delta = 0,
resulting as nan errors. I also wrote a test case to test solving
equation x^3 = 0 after fixing.
2015-11-05 19:19:56 -05:00
Marian Zajko
691fb1ffae
XIMEA adapter update
...
- replaced m3api/m3apiX64 binaries with latest xiapi32/xiapi64 to
support latest camera models
- added new parameter definitions to videoio_c.h and
SetProperty/GetProperty calls
- added acquisition resetting for specific parmateters in SetProperty
call
- added new error return value evaluators
2015-11-05 15:56:47 +01:00
Maksim Shabunin
7392ce0a81
Added some documentation for MSER
2015-11-05 17:17:18 +03: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
Viet Dinh
433bc81b30
std::cbrt could not be found
2015-11-03 21:40:52 -05:00
Viet Dinh
c8bf176558
casting warning
2015-11-03 21:10:38 -05:00
Viet Dinh
cfd5caf29d
deal with type casting issues
2015-11-03 16:19:41 -05:00
Viet Dinh
f461d0cb7a
fix compile errors
...
some functions were not found in namespace std
2015-11-03 15:37:25 -05:00
Viet Dinh
09b0193186
even more correct
...
calculates cube root of complex number to give more correct results.
2015-11-03 15:17:49 -05:00
Lorena García
252feb4774
Hit and Miss morphological op
2015-11-03 19:42:22 +01:00
Viet Dinh
537a978dcf
update test_math.cpp
2015-11-03 12:52:49 -05:00
Vadim Pisarevsky
de49ed3c15
Merge pull request #5388 from alalek:disable_invalid_string_usage
2015-11-03 10:58:57 +00:00
Vadim Pisarevsky
33dc41056f
Merge pull request #5392 from elenash:fisheye_fix
2015-11-03 10:57:36 +00:00
Alexander Alekhin
4514158e43
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
2015-11-03 10:18:44 +00:00
Abe Friesen
9c6ff4d955
- LogisticRegressionImpl::predict() was changed to return the predicted value and to only write to the OutputArray results if specified (no longer segfaults).
...
- Refactored batch and mini_batch training to use a common gradient computation function (removed duplicate code).
- Altered the cost computation so that NAN is not computed unnecessarily.
- Greatly simplified (and sped up) the code that appends a column of 1s to the data.
- Minor code cleanup.
Removed unused variables.
Added cast to float to remove warning
2015-11-02 17:49:06 -08: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
Viet Dinh
b6e8a47fca
fix whitespace errors
2015-11-02 09:28:37 -05:00
Viet Dinh
ed0065266e
update fixing bug #5599
2015-11-02 08:38:05 -05:00
Vadim Pisarevsky
b5fd7868a8
Merge pull request #5487 from Wangyida:python
2015-11-02 12:26:53 +00:00
Vadim Pisarevsky
c21ed69731
Merge pull request #5586 from mshabunin:run-py-changes-2.4
2015-11-02 12:05:00 +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
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
Viet Dinh
03e7b71707
fix whitespace errors
2015-11-02 00:50:05 -05:00
Viet Dinh
e06c696b3c
fix whitespace errors
2015-11-02 00:20:13 -05:00
Viet Dinh
40ce9f97d6
fix whitespace errors
2015-11-02 00:04:51 -05:00
Viet Dinh
0bc44376a5
fix bug #5599
...
solves equations more correctly, eliminates “nan” error.
2015-11-01 23:30:28 -05:00
Viet Dinh
fdf549b921
fix bug #5599
2015-11-01 11:08:01 -05: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
berak
1048b235bf
add Rect2d to python bindings
2015-10-30 10:02:33 +01:00
Pavel Vlasov
5ae3693567
Condition update for 8u IPP in GaussianBlur. Bug was fixed in 9.0.1;
2015-10-29 13:21:13 +03:00
Maksim Shabunin
1e869c5e49
ts: refactor run.py script
...
Conflicts:
modules/ts/misc/run.py
2015-10-29 13:04:05 +03:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
Maksim Shabunin
90c74e3be0
ts: refactor run.py script
2015-10-29 11:28:12 +03:00
Wangyida
ca599eee40
python modification for Point3D
2015-10-29 10:24:49 +08:00
Ilya Lavrenov
9e2395e7e0
return false in grabFrame failed in open method
2015-10-27 16:56:31 +03:00
Ilya Lavrenov
05945bf00e
fixed case when grabbing failed
2015-10-27 16:26:24 +03:00
Ilya Lavrenov
9d78a1ea9f
allow to retrieve videocapture properties before first frame reading
2015-10-26 14:37:38 +03:00
Alexander Alekhin
dfec99691b
Merge pull request #5370 from berak:fix_svm_autoTrain
2015-10-26 10:47:29 +00:00
Alexander Alekhin
8c2d712fb0
Merge pull request #5538 from micalan:JpegExif
2015-10-25 15:18:08 +00:00
Alexander Alekhin
c3eb1254cf
Merge pull request #5570 from paroj:qsliderfix
2015-10-24 14:38:38 +00:00
Pierre Letessier
e6615c5825
Changed CV_FFMPEG_CAP_PROP_SAR_* values
2015-10-24 11:22:18 +02:00
Lorena García
7cff60f4f6
Changed src matrix complement computation
2015-10-24 00:33:36 +02:00
jisli
251610f6a1
fix header problem(can't find cstdint) on OSX platform
2015-10-23 15:25:26 -07:00
Lorena García
fb03330ea3
Fixed CV_Assert
2015-10-24 00:22:50 +02:00
Pavel Rojtberg
cfd498a8eb
fix compilation with qt
...
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Pierre Letessier
baa21484a1
Added CV_CAP_PROP_SAR properties to videoio module
2015-10-23 21:14:22 +02:00
micalan
0a306f8804
Camera orientation handling is added for jpeg files
2015-10-23 21:19:35 +03:00
Alexander Alekhin
9a0beda037
Merge pull request #5489 from paroj:v4l2noconvert
2015-10-23 16:35:36 +00:00
Alexander Alekhin
09e6c82190
Merge pull request #5474 from paroj:v4l2ctrls
2015-10-23 16:28:26 +00:00
Rodrigo Benenson
0ef7387298
mush -> must
...
fixed typo
2015-10-22 23:27:55 +02:00
Alexander Alekhin
debe99f1a4
Merge pull request #5531 from mshabunin:fix-vs2015
2015-10-22 16:28:42 +00:00
Alexander Alekhin
031568831c
Merge pull request #5513 from jet47:ctest-extended-support
2015-10-22 12:37:40 +00:00
Maksim Shabunin
497d92e7d1
Merge pull request #5533 from sturkmen72:patch-12
2015-10-22 12:30:38 +00:00
Maksim Shabunin
1cb0dfa669
Merge pull request #5500 from StevenPuttemans:fix_mask_notice_copyTo_2.4
2015-10-22 12:28:54 +00:00
