Alexander Alekhin
7a4b2e18a7
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation
2015-10-06 10:01:39 +00:00
michaelveth
a3fda24597
Update OpenCVFindMatlab.cmake
...
Added fix to OpenCVFindMatlab.cmake to properly locate modern versions of unix- MATLAB. Tested with MATLAB R2015a and Ubuntu 14.04.
2015-10-06 04:17:40 -05:00
Dan Moodie
f332f98757
Removed last trailing whitespace. Can't believe I missed it.
2015-10-05 20:21:46 -04:00
Alexander Alekhin
4760d32937
ffmpeg: fix invalid NULL pointer access
...
Catched on Ubuntu 12.04 with FFMPEG:
codec: YES (ver 53.35.0)
format: YES (ver 53.21.1)
util: YES (ver 51.22.3)
swscale: YES (ver 2.1.0)
resample: NO
gentoo-style: YES
2015-10-05 19:28:35 +03:00
Alexander Alekhin
33f5ac5c15
Merge pull request #5429 from PhilLab:patch-6
2015-10-05 12:50:17 +00:00
Alexander Alekhin
59a41c1c51
Merge pull request #5453 from paroj:capgstleak
2015-10-05 12:47:11 +00:00
Pavel Rojtberg
345cd1242f
do not leak GstMapInfo
...
it is new'ed but never deleted. However it does not need to be global or
heap allocated in the first place.
2015-10-05 12:28:47 +02:00
Jan S. (Milania1)
3d2a24f61d
Added example to the documentation for the normalize() method
2015-10-04 20:23:45 +02:00
Alexander Alekhin
50a0a167f0
fix ffmpeg frame creation ( fix #5439 )
2015-10-02 18:27:18 +03:00
Alexander Alekhin
e2e25e9af3
Merge pull request #5399 from alalek:fix_5264
2015-10-02 12:51:09 +00:00
Alexander Alekhin
76afd9a1b5
Merge pull request #5436 from jet47:fix-cuda-normalize
2015-10-02 12:50:38 +00:00
Alexander Alekhin
b37387ef90
Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes
2015-10-02 12:49:37 +00:00
Suleyman TURKMEN
21c0acff24
Update imgcodecs.hpp
2015-10-02 14:00:24 +03:00
Vladislav Vinogradov
1bf811c3f1
fix cuda::normalize (dtype < 0) case
2015-10-02 11:41:01 +03:00
StevenPuttemans
587dca9b1c
adding markers to OpenCV
2015-10-02 08:48:15 +02:00
Pavel Vlasov
6a0d3b06f2
IPPInitSingelton initialization guards;
2015-10-01 17:48:49 +03:00
Miguel Algaba
b71a27b96c
Assert fix: allow one cluster as valid parameter
2015-10-01 16:45:59 +02:00
Vadim Pisarevsky
d69b7c332a
Merge pull request #5385 from alalek:fix_android_camera_datarace
2015-10-01 13:58:01 +00:00
Philipp Hasper
05846438e3
Typo in CameraBridgeViewBase.java
...
Corrected typo and unused imports
2015-10-01 15:09:14 +02:00
Vadim Pisarevsky
af5e631a7a
Merge pull request #5402 from sturkmen72:patch-10
2015-10-01 13:01:26 +00:00
Vadim Pisarevsky
c29b09d093
Merge pull request #5408 from alalek:move_ippicv_binaries
2015-10-01 12:54:11 +00:00
Vadim Pisarevsky
c2caea4818
Merge pull request #5409 from kauevestena:patch-1
2015-10-01 12:52:28 +00:00
Pavel Vlasov
e837d69f8f
IPPInitSingelton was added to contain IPP related global variables;
...
OPENCV_IPP env var now allows to select IPP architecture level for IPP9+;
IPP initialization logic was unified across modules;
2015-10-01 09:58:48 +03:00
Alexander Alekhin
34e4e66bf1
Merge pull request #5419 from lupustr3:pvlasov/ipp9_integration
2015-09-30 17:36:43 +00:00
Alexander Alekhin
9b6424e0c6
Merge pull request #5415 from lupustr3:pvlasov/ipp_version_change
2015-09-29 17:11:30 +00:00
Pavel Vlasov
62854dcc0d
Enables support of IPP 9.0.0;
...
HAVE_IPP_ICV_ONLY will be undefined if OpenCV was linked against ICV packet from IPP9 or greater. ICV9+ packets will be aligned with IPP in OpenCV APIs
This will ease code management between IPP and ICV
2015-09-29 17:27:13 +03:00
Pavel Vlasov
75c7917643
IPP_VERSION_X100 was changed to:
...
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.
IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
2015-09-29 17:24:18 +03:00
Alexander Alekhin
ddf82d0b15
Merge pull request #5405 from lupustr3:pvlasov/ipp_functions_refactoring
2015-09-28 17:20:41 +00:00
Dan
e4184195a2
Looks like something automatically added tabs back in after I already fixed the white space. :/
2015-09-28 09:37:10 -04:00
Alexander Alekhin
f4c9bc8bc4
Merge pull request #5406 from cbalint13:master
2015-09-28 12:13:54 +00:00
Suleyman TURKMEN
7c226ed7a2
adding new flags to imread to load image reduced
2015-09-28 02:00:02 +03:00
Kauê de Moraes Vestena
1bd18836d7
little fixes and correction of a conceptual error
...
Previously, there's no way to the user see the found corners, i've changed that.
In a cout, are write that: "average reprojection err = "
But it isn't a "reprojection error" at all, it is a mean of each EPIPOLAR error, wich occur when the product x' * F * x is not equal to zero.
(x and x' are the same points in the right and left scene)
(the RMS that explain the average absolute reprojection error is given by the return of the stereoCalibrate() function)
At least, i think it's interesting to initialize the camera matrices before.
Thank you all for this amazing code. Apologize my weak english.
2015-09-27 15:53:30 -03:00
Alexander Alekhin
dd9da53860
disable String(int) ctor
...
MSVC and GCC compilers interprets cv::String a(0) as a valid
statement with conversion of "int" argument to "const char*".
This patch forbids this expected behaviour.
2015-09-27 14:54:11 +03:00
Balint Cristian
fdbed4a473
Speedup AGAST nonmax-suppression.
2015-09-26 04:43:07 +03:00
Pavel Vlasov
14b006e808
IPP_VERSION_X100 was changed to:
...
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.
IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
2015-09-25 17:50:15 +03:00
Pavel Vlasov
2177c7c5a8
Some IPP functions were encapsulated;
...
Minor changes to IPP implementations;
2015-09-25 17:30:26 +03:00
Alexander Alekhin
750162acb3
move IPPICV binaries to GitHub opencv_3rdparty repository
2015-09-25 16:50:50 +03:00
Dan
3efe131480
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
...
Conflicts:
samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp
2015-09-25 08:58:53 -04:00
Dan
ab84de967e
More whitespace fixes.
2015-09-25 08:56:37 -04:00
Alexander Alekhin
3a3f4038bf
Merge pull request #5391 from paroj:parser_nonempty
2015-09-25 11:01:09 +00:00
Maksim Shabunin
09ba5a28d0
Merge pull request #5393 from enesates:patch-1
2015-09-25 07:35:47 +00:00
Dan Moodie
7376c5311b
Fixed tabs in whitespace.
2015-09-24 14:29:17 -04:00
Pavel Rojtberg
46ada3886f
fix wrong parsing of values containing '='
...
fixes #5074
2015-09-24 17:27:07 +02:00
Alexander Alekhin
7d7f5c196d
Merge pull request #5295 from LorenaGdL:ml-svm_tutorials
2015-09-24 14:13:07 +00:00
Dan
12dcb1555e
Missed one conversion of CV_TYPE to cv::DataType
2015-09-24 10:01:26 -04:00
Dan
00c2930709
improved comments.
2015-09-24 09:32:46 -04:00
Dan
23fc5930b7
Improved thrust interop tutorial.
2015-09-24 09:32:38 -04:00
Dan
09d392f09d
Added thrust tutorial.
2015-09-24 09:32:27 -04:00
Dan
a80e0cf8bd
Added tutorials for using thrust.
2015-09-24 09:32:18 -04:00
Alexander Alekhin
f52cac9d47
fix #5264
2015-09-24 15:56:47 +03:00