Vadim Pisarevsky
4dda2002f6
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
2014-09-19 17:35:07 +00:00
Artur Wieczorek
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
WilhelmHannemann
150487feda
Bugfix brute_force_match.cl (see http://code.opencv.org/issues/2837 ): wrong results for non-float descriptors in OpenCL BruteForceMatcher
2014-09-19 16:41:54 +02:00
Vadim Pisarevsky
3516e14e05
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
...
use different fix for the problem, embedded right into the BFMatcher.
2014-09-19 15:31:21 +04:00
E Braun
d82b918a7b
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
f60726b090
Revert "fix for bug 3172"
...
This reverts commit ed2cdb71e5
.
2014-09-19 14:47:43 +04:00
E Braun
1675b23a64
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
aa9da6e433
regression test for bug 3172
2014-09-19 14:47:43 +04:00
Benoit Seguin
084835ec30
Fixing a line where integer data was treated as floating point data.
2014-09-18 14:03:13 +02:00
Vadim Pisarevsky
ccaedaedc8
Merge pull request #2047 from GregoryMorse:patch-4
2014-09-17 12:48:45 +00:00
Vadim Pisarevsky
c5de129c36
Merge pull request #3222 from dmitrygribanov:dg/2.4-stitching-wave-correction-bugfix
2014-09-17 10:54:02 +00:00
Vadim Pisarevsky
533dd85299
Merge pull request #3225 from jormansa:bug_#3631
2014-09-17 10:40:42 +00:00
Philipp Hasper
bac492fff6
Doc: Fixing indentation
2014-09-17 09:30:19 +02:00
jormansa
1d2d579bd6
bug fixed
2014-09-15 18:09:44 +02:00
Andrey Pavlenko
80687c8a56
Merge pull request #3219 from mshabunin:png_iccp_strip_24
2014-09-15 13:54:19 +00:00
Dmitry Gribanov
8a1d3929cc
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-15 17:04:08 +04:00
Alexander Smorkalov
343f4b3026
OpenCV version++.
2014-09-15 14:55:25 +04:00
Maksim Shabunin
882426a9b2
Stripped iCCP chunk from png files
2014-09-15 12:48:28 +04:00
Vadim Pisarevsky
cf15b9e8ad
Merge pull request #3204 from parafin:ximea_unix-2.4
2014-09-14 18:44:23 +00:00
GregoryMorse
b9d5f3f6e9
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
...
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Successful test - samples are grabbed
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
VS 2013 support and cleanup consistency plus C++/CX new object fixed
VS 2013 Update 2 library bug fix integrated
Various minor cleanup
Create agile_wrl.h
a-wi's changes integrated
Update cap_msmf.hpp
Update cap_msmf.cpp
Regression test fixes and simplifications
2014-09-10 17:21:38 +08:00
Igor Kuzmin
0421da78b3
XIMEA cam support: allow on OS X too
2014-09-09 19:17:13 +04:00
Igor Kuzmin
b027a84fa1
XIMEA cam support: use correct library for 64 bit Linux
2014-09-09 19:15:03 +04:00
Igor Kuzmin
fbbf4e380f
fix for issue 3858 (remove unneeded #include's)
...
also use correct include path on Linux
2014-09-09 19:10:05 +04:00
Vadim Pisarevsky
faed8f43d6
Merge pull request #3194 from stonier:2.4
2014-09-09 06:33:15 +00:00
Alexander Smorkalov
35768ed638
Python tests added to -tests deb package.
2014-09-08 18:11:12 +04:00
Daniel Stonier
161f50962d
make sure children are included in the moveToThread
2014-09-08 04:31:37 +09:00
Daniel Stonier
e638b9e805
support invokation of cv windows from parallel threads to an external qt application.
2014-09-08 03:19:56 +09:00
E Braun
bdb82d181f
fix for bug 3172
2014-09-02 18:05:23 +02:00
E Braun
89833853fa
Revert "fix for bug 3172"
...
This reverts commit ed2cdb71e5
.
2014-09-02 13:56:13 +02:00
Adrian Clark
fcc481e751
Fixed crash in SSE implementation of FREAK descriptor when number of pairs is set to something other than 512.
...
See http://code.opencv.org/issues/3889 for more details
2014-09-01 09:37:33 +12:00
Vladislav Vinogradov
eaaa2d27d5
fix CUDA LUT implementation
...
In CUDA 6.0 there was a bug in NPP LUT implementation (invalid results when
src == 255). In CUDA 6.5 the bug was fixed.
Replaced NPP LUT call with own implementation (ported from master branch)
to be independant from CUDA Toolkit version.
2014-08-28 14:47:26 +04:00
Vadim Pisarevsky
6eb26c1519
Merge pull request #3109 from jet47:gpu-test-fixes
2014-08-22 07:22:23 +00:00
Vladislav Vinogradov
ebe36d6e7c
fix CUDA cvtColor after corresponding change in CPU version
...
see https://github.com/Itseez/opencv/pull/3137
2014-08-21 14:14:06 +04:00
Vadim Pisarevsky
d68e62c968
Merge pull request #3137 from akarsakov:fix_cvtcolor_luv_rgb
2014-08-21 05:39:18 +00:00
Alexander Karsakov
b027eac173
Fixed range for 'v' channel for 8U images.
2014-08-20 11:09:21 +04:00
Vadim Pisarevsky
2ed24876af
Merge pull request #3120 from StevenPuttemans:fix_bug3863
2014-08-18 15:39:30 +00:00
Vadim Pisarevsky
b08a6ccd9d
Merge pull request #3118 from akarsakov:fix_cvtcolor_perf
2014-08-18 12:45:35 +00:00
StevenPuttemans
d558260a8e
fixing GT and GE comparison symbol
2014-08-18 13:33:40 +02:00
Alexander Karsakov
023a42ba55
Fixed getConversionInfo() for YUV2RGBA_* conversions
2014-08-18 13:01:19 +04:00
Vladislav Vinogradov
62f27b28ed
fix BGR->BGR5x5 color convertion
2014-08-15 14:10:15 +04:00
Vladislav Vinogradov
599f5ef51b
use downscaled frames in FGDStatModel test
2014-08-15 13:42:25 +04:00
Vladislav Vinogradov
86e12b6074
increase epsilon for ResizeSameAsHost test
2014-08-15 13:42:06 +04:00
Vladislav Vinogradov
5dff283b39
increase epsilon for TVL1 sanity test
2014-08-15 13:41:47 +04:00
Leszek Swirski
341c3d5933
Fix reallocation of D buffer in gemm
...
Conflicts:
modules/core/src/matmul.cpp
2014-08-15 09:57:46 +01:00
Vadim Pisarevsky
988555a5d9
Merge pull request #3093 from asmorkalov:ocv_array_bound_fix
2014-08-13 14:08:51 +00:00
Alexander Smorkalov
e11333dd83
GCC 4.8 warning array subscript is above array bounds fixed.
2014-08-13 17:12:08 +04:00
Vadim Pisarevsky
af2434c547
Merge pull request #2827 from Alexander-Petrikov-ELVEES-NEOTEK:neon-stereobm
2014-08-13 13:04:02 +00:00
Aleksandr Petrikov
0a531815c5
fix bug 3733 for imgproc/filter.cpp
2014-08-11 16:00:21 +04:00
PhilLab
efc1c39315
Fixed self-assignment in cv::Ptr::operator =
...
A self-assignment leads to a call of release() with refcount being 2. In the release() method, refcount is decremented and then successfully checked for being 1. As a consequence, the underlying data is released. To prevent this, we test for a self-assignment
2014-08-08 17:39:12 +02:00
StevenPuttemans
34103ef1cb
fixing setting the locale back to what should be expected
...
fix should be applyed for every window interface and generation
2014-08-05 16:20:08 +02:00
Vladislav Vinogradov
da9be8231f
fix cv::gpu::resize for INTER_LINEAR, now it produces the same result as CPU version
2014-08-01 11:33:29 +04:00
E Braun
ed2cdb71e5
fix for bug 3172
2014-08-01 07:47:59 +02:00
E Braun
bbe48eaac6
regression test for bug 3172
2014-08-01 00:17:17 +02:00
Alexander Alekhin
bab826a381
Merge pull request #3019 from alalek:ocl_fix_pyrUp_test
2014-07-30 13:02:45 +00:00
Alexander Smorkalov
d8187f7518
Merge branch 'fix_androidcamera_preview_usage_bits' into 2.4
2014-07-30 14:35:00 +04:00
Alexander Alekhin
9e83463128
ocl: fix pyrUp perf test
2014-07-30 13:27:36 +04:00
Vadim Pisarevsky
e98c9a7ce3
Merge pull request #2968 from LeonidBeynenson:bugfix_crash_gpu_feature_matcher_in_stitcher
2014-07-29 13:48:19 +00:00
Vadim Pisarevsky
042892f0d7
hopefully fixed Python tests
2014-07-29 12:27:31 +04:00
Vadim Pisarevsky
7cefaa49dd
Merge pull request #2816 from ehren:avcapturesession_leak
2014-07-25 13:18:06 +00:00
Vadim Pisarevsky
fc41e8850b
Merge pull request #2836 from s98felix:2.4
2014-07-25 12:59:41 +00:00
Martijn Liem
9c285da329
Bugfix for bug #3767
...
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
2014-07-23 12:33:51 +02:00
Vadim Pisarevsky
d7bbafd683
Merge pull request #2948 from PhilLab:patch-1
2014-07-18 10:10:44 +00:00
Vadim Pisarevsky
e90c233551
Merge pull request #2984 from cambyse:2.4
2014-07-18 10:05:22 +00:00
Vadim Pisarevsky
06897dbdb5
Merge pull request #2980 from akarsakov:revert_dft_dst_fix
2014-07-18 09:57:51 +00:00
Vadim Pisarevsky
39020fc9cf
Merge pull request #2898 from PhilLab:2.4
2014-07-18 09:26:50 +00:00
PhilLab
d5489f3a68
Clarified DescriptorExtractor::compute
2014-07-18 10:57:54 +02:00
Camille
5a5a487612
bug fix 3381
2014-07-18 00:06:31 +02:00
Camille
46775ad186
bug fix 3381
2014-07-17 22:57:31 +02:00
Alexander Karsakov
901d9b70b0
Revert changes by PR#2930 since it breaks logic of inverse mode.
2014-07-17 15:11:06 +04:00
Vadim Pisarevsky
0b4e043442
Merge pull request #2970 from PhilLab:patch-3
2014-07-16 19:26:46 +00:00
unknown
d0c3c4c373
Function for drawing arrows
2014-07-15 14:12:16 +02:00
LeonidBeynenson
8578f9c565
Added a TODO comment about changes which should be done in GpuMatcher::match
2014-07-15 13:27:59 +04:00
Vadim Pisarevsky
c9c09262f7
Merge pull request #2966 from PhilLab:patch-2
2014-07-15 08:10:33 +00:00
Vadim Pisarevsky
faac7f18c7
Merge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result
2014-07-15 08:10:04 +00:00
Vadim Pisarevsky
8d58b238ca
Merge pull request #2780 from hbadino:Feature_3692_2.4
2014-07-14 19:00:52 +00:00
Vadim Pisarevsky
b111fb94b7
Merge pull request #2957 from cambyse:2.4
2014-07-14 18:42:49 +00:00
Vadim Pisarevsky
544dd8b130
Merge pull request #2971 from ruslo:docfix
2014-07-14 18:40:39 +00:00
Roman Donchenko
d31a0eab9e
Merge pull request #2815 from Aletheios:Bugfix#3705
2014-07-14 12:19:31 +00:00
Alexander Smorkalov
60a5ada454
Build fixes for CUDA 6.5
2014-07-14 14:26:50 +04:00
Ruslan Baratov
b030d7e6a1
Doc: fix definition of macro CV_MAKETYPE
...
At least this is how it's defined in core/types_c.h
2014-07-12 19:35:22 +04:00
Roman Donchenko
d262b04d99
Merge pull request #2903 from mmaraya:2.4
2014-07-11 14:15:59 +00:00
Leonid Beynenson
cce2d9927e
Fixed bug which caused crash of GPU version of feature matcher in stitcher
...
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
2014-07-11 16:37:30 +04:00
Leonid Beynenson
79878a57a9
Fixed bug in cv::detail::waveCorrect
...
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
2014-07-11 15:47:41 +04:00
PhilLab
13a0c14e6c
Added publication reference
2014-07-11 09:22:55 +02:00
Richard Yoo
c38023f4e7
Modifications to support dynamic vector dispatch.
2014-07-09 16:55:39 -07:00
Camille
cbb5fc0acc
bug fix 3696
2014-07-09 22:35:56 +02:00
Ilya Lavrenov
ecec53f509
fixed docs
2014-07-09 17:48:28 +04:00
unknown
52c05e75cc
Fixed C++11 compatibility warning
2014-07-09 14:19:15 +02:00
berak
7b160fa3cb
added missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756 )
2014-07-08 18:04:56 +02:00
Roman Donchenko
71d3654832
Merge pull request #2558 from asmorkalov:ocv_matop_init_fix
2014-07-08 12:14:55 +00:00
PhilLab
2c29ee9e00
Added cast and removed formatting error
2014-07-08 13:24:35 +02:00
PhilLab
aafda43df1
Double precision for solvePnPRansac()
...
solvePnPRansac() and pnpTask() now accept object or image points with double precision.
2014-07-08 11:52:42 +02:00
Vadim Pisarevsky
39127d942e
Merge pull request #2908 from mmaraya:bug_3737
2014-07-07 13:29:38 +00:00
Vadim Pisarevsky
b068e63618
Merge pull request #2930 from akarsakov:dft_dst_size_fix
2014-07-07 11:21:12 +00:00
Alexander Karsakov
4b8fb6c246
Fixed dst size
2014-07-03 15:17:51 +04:00
Vadim Pisarevsky
133d861d65
Merge pull request #2915 from SpecLad:core-useless-casts
2014-07-02 14:25:52 +00:00
Vadim Pisarevsky
8539d424b2
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
2014-07-02 14:24:09 +00:00
Alexander Alekhin
dcf96b2da7
Merge pull request #2922 from ilya-lavrenov:mac_fix
2014-07-02 12:18:11 +00:00
Alexander Alekhin
b1ac35e14a
ocl: fix mac and superres test
2014-07-02 11:54:20 +04:00
Ilya Lavrenov
43e4946cca
fix for fisheye
2014-07-02 11:53:53 +04:00
Vadim Pisarevsky
1b18ebf28a
Merge pull request #2905 from Jazmann:2.4
2014-07-01 18:41:15 +00:00
Vadim Pisarevsky
f6cf68094f
Merge pull request #2917 from mmaraya:bug_3872
2014-07-01 16:40:08 +00:00
Ilya Lavrenov
070be56e14
fixed warnings
2014-07-01 14:32:16 +04:00
Mike Maraya
95550c2582
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782
2014-06-30 22:17:52 -04:00
Roman Donchenko
ebb0255e19
Remove a couple of useless casts in core headers
...
This helps users who compile their code with -Wuseless-cast.
2014-06-30 16:12:04 +04:00
Alexander Alekhin
5c8cd76893
fix bug with invalid signature size (should not be less than signatureLength())
2014-06-30 16:03:20 +04:00
Alexander Alekhin
3a8af7d691
fix python tests
2014-06-30 16:03:07 +04:00
Mike Maraya
7936faf9a3
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737 )
2014-06-27 08:34:40 -04:00
Mike Maraya
5c85f816c9
Revert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737 )"
...
This reverts commit 56683e6d11
.
2014-06-27 08:20:22 -04:00
Mike Maraya
56683e6d11
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737 )
2014-06-27 08:02:01 -04:00
Mike Maraya
fbac578c79
Fixes resizeWindow() on OS X (Bug #3200 )
2014-06-27 23:26:09 -04:00
unknown
ade46bd428
Fixed typos in comments
2014-06-26 16:29:45 +02:00
Roman Donchenko
1138fbb940
Merge pull request #2766 from akarsakov:pyr_border_constant
2014-06-26 17:28:44 +04:00
Roman Donchenko
436342d5f4
Merge pull request #2880 from GravityJack:SparseMatIterator-build-fix
2014-06-25 16:32:18 +04:00
Roman Donchenko
b21b8ff9d7
Merge pull request #2891 from nisargthakkar:dims_zero_on_release
2014-06-25 16:27:33 +04:00
Jasper
f45da9866a
Fix for VTK6.2 issue.
2014-06-24 11:52:56 +01:00
Nisarg Thakkar
98421e5970
Fix for Bug#3757: All dimension values are 0 after release is called
2014-06-23 20:15:23 +05:30
Ilya Krylov
84bb77e914
Fixed android and windows x64 build issues
2014-06-23 17:06:40 +04:00
Alexander Petrikov
6882970248
Add CV_Assert (ndisp % 8 == 0) to NEON version
2014-06-23 11:08:51 +04:00
Marc Rollins
05e0b3b7e6
Fixing build error when using post-increment operator.
2014-06-19 14:14:10 -07:00
Roman Donchenko
6a94862fef
Merge pull request #2870 from 23pointsNorth:patch-5
2014-06-19 16:52:00 +04:00
Roman Donchenko
cb69a5c29a
Merge pull request #2868 from neo008:2.4
2014-06-19 16:51:37 +04:00
Andrey Pavlenko
75742fcd01
Merge pull request #2843 from berak:f_export_bow_24
2014-06-19 09:08:32 +00:00
Alexander Alekhin
c99ce0f427
Merge pull request #2846 from alalek:2.4_fix_python_warnings
2014-06-18 13:19:11 +00:00
Daniel Angelov
660d7cd3ae
Updated findHomography docs branch 2.4
...
Updated the documents to give warning to the users of `findHomography` that the function may return an empty matrix in some cases.
The user must take care of checking that.
2014-06-16 13:05:17 +01:00
Neo Alienson
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
Vadim Pisarevsky
2b2ce3f6e9
Merge pull request #2726 from Ilya-Krylov:2.4
2014-06-12 21:37:47 +04:00
Vadim Pisarevsky
3391caf434
Merge pull request #2779 from pemmanuelviel:kmeansppSquareDist
2014-06-12 21:35:28 +04:00
berak
3500c940d4
add Bag of Words to python wrapper
2014-06-11 11:50:22 +02:00
Alexander Alekhin
4d0848b3e8
fix -Wmaybe-uninitialized warning (initialize pointers to NULL)
2014-06-10 18:12:38 +04:00
Roman Donchenko
1f4ddbe5b6
Merge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info
2014-06-10 12:24:56 +04:00
Andrey Pavlenko
02b32d86d3
moving FaceRecognizer2 from public header to .cpp
2014-06-09 13:26:45 +04:00
berak
fc610979bb
export BOW to script wrappers
2014-06-07 16:34:53 +02:00
Richard Yoo
11a09ef5cc
Changes to support Intel AVX/AVX2 in cvResize().
2014-06-06 15:39:09 -07:00
atinfinity
f08d88fa78
fixed calculation method of "cv::TickMeter"
2014-06-07 07:29:22 +09:00
Konstantin Matskevich
59c8edfd98
facerec2
2014-06-06 15:57:11 +04:00
Aleksandr Petrikov
1a1cd9b4e9
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
2014-06-04 12:06:33 +04:00
Ehren Metcalfe
cd3aa0184a
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389 )
2014-05-31 19:41:16 -04:00
aletheios
1020a93fa3
Bugfix #3705 : params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
2014-05-31 18:44:32 +02:00
Roman Donchenko
9a5e9d3442
Merge pull request #2771 from SpecLad:pvs-checks-opencv
2014-05-29 14:50:42 +04:00
Alexander Alekhin
0ea572d772
Merge pull request #2796 from berak:b_3674_24
2014-05-28 13:28:30 +04:00
berak
2bacd8b702
2 fixed unassigned reshapes in em ( #3674 )
2014-05-28 10:37:16 +02:00
Alexander Alekhin
e6f6905868
run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag
2014-05-26 14:32:52 +04:00
Alexander Alekhin
766600529b
run.py: added --android_env parameter
2014-05-26 13:27:31 +04:00
Roman Donchenko
09f9b35bc6
Merge pull request #2742 from StevenPuttemans:feature_3176
2014-05-22 18:03:56 +04:00
StevenPuttemans
fea4396023
Added more info on the data input variable of kmeans
2014-05-22 12:56:44 +02:00
Pierre-Emmanuel Viel
ec99f96c62
Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance)
2014-05-21 13:16:12 +02:00
Pierre-Emmanuel Viel
2f8b5731da
Fix local variable shadowing
2014-05-21 12:27:38 +02:00
Konstantin Matskevich
8d4a76925c
fixed binary compatibility
2014-05-21 09:25:15 +04:00
Pierre-Emmanuel Viel
00367cfb00
Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
2014-05-21 01:31:52 +02:00