StevenPuttemans [Wed, 24 Sep 2014 07:33:22 +0000 (09:33 +0200)]
fixing some wrong CPP prefixes - still old interface
Vadim Pisarevsky [Tue, 23 Sep 2014 07:19:38 +0000 (07:19 +0000)]
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
Vadim Pisarevsky [Tue, 23 Sep 2014 07:18:00 +0000 (07:18 +0000)]
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
StevenPuttemans [Mon, 22 Sep 2014 20:12:27 +0000 (22:12 +0200)]
Fixing errors
Vadim Pisarevsky [Mon, 22 Sep 2014 15:31:09 +0000 (15:31 +0000)]
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
Vadim Pisarevsky [Mon, 22 Sep 2014 15:29:32 +0000 (15:29 +0000)]
Merge pull request #3243 from a-wi:MSMF_linking_error
StevenPuttemans [Thu, 4 Sep 2014 14:17:51 +0000 (16:17 +0200)]
fix blobdetector
Artur Wieczorek [Sun, 21 Sep 2014 16:48:54 +0000 (18:48 +0200)]
CMake configuration for MSMF capture
Artur Wieczorek [Fri, 19 Sep 2014 20:46:09 +0000 (22:46 +0200)]
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
Tom Stellard [Tue, 4 Mar 2014 20:48:07 +0000 (12:48 -0800)]
ocl: Don't use 'inline' attribute on functions
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
Vadim Pisarevsky [Fri, 19 Sep 2014 17:36:13 +0000 (17:36 +0000)]
Merge pull request #3240 from a-wi:MSMF_compilation_errors
Vadim Pisarevsky [Fri, 19 Sep 2014 17:35:07 +0000 (17:35 +0000)]
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
Artur Wieczorek [Fri, 19 Sep 2014 12:49:40 +0000 (14:49 +0200)]
Fixed compilation errors under VS 2010 and Win 7
WilhelmHannemann [Fri, 19 Sep 2014 14:42:59 +0000 (16:42 +0200)]
Merge branch 'bugfix_brute_force_match_cl' of https://github.com/WilhelmHannemann/opencv into bugfix_brute_force_match_cl
WilhelmHannemann [Fri, 19 Sep 2014 14:31:11 +0000 (16:31 +0200)]
Bugfix brute_force_match.cl (see code.opencv.org/issues/2837): wrong results for non-float descriptors in OpenCL BruteForceMatcher
WilhelmHannemann [Fri, 19 Sep 2014 14:31:11 +0000 (16:31 +0200)]
Bugfix brute_force_match.cl (Bug #2837): wrong results for non-float descriptors in OpenCL BruteForceMatcher
Vadim Pisarevsky [Fri, 19 Sep 2014 13:21:05 +0000 (13:21 +0000)]
Merge pull request #3238 from vpisarev:bfmatcher_fix
Vadim Pisarevsky [Fri, 19 Sep 2014 11:31:21 +0000 (15:31 +0400)]
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
use different fix for the problem, embedded right into the BFMatcher.
E Braun [Tue, 2 Sep 2014 16:05:23 +0000 (18:05 +0200)]
fix for bug 3172
E Braun [Tue, 2 Sep 2014 11:56:13 +0000 (13:56 +0200)]
Revert "fix for bug 3172"
This reverts commit
ed2cdb71e5821db85b57cf60d88689c2bf32aeeb.
E Braun [Thu, 31 Jul 2014 22:17:56 +0000 (00:17 +0200)]
fix for bug 3172
E Braun [Thu, 31 Jul 2014 22:16:58 +0000 (00:16 +0200)]
regression test for bug 3172
Vadim Pisarevsky [Fri, 19 Sep 2014 09:42:00 +0000 (09:42 +0000)]
Merge pull request #3235 from Atanahel:gbt_bugfix
Vadim Pisarevsky [Thu, 18 Sep 2014 17:45:28 +0000 (17:45 +0000)]
Merge pull request #3236 from vpisarev:fix_traincascade
Stephen Mell [Thu, 26 Jun 2014 18:28:47 +0000 (10:28 -0800)]
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
Benoit Seguin [Thu, 18 Sep 2014 12:03:13 +0000 (14:03 +0200)]
Fixing a line where integer data was treated as floating point data.
Vadim Pisarevsky [Thu, 18 Sep 2014 11:28:58 +0000 (11:28 +0000)]
Merge pull request #2711 from GregoryMorse:patch-5
Vadim Pisarevsky [Thu, 18 Sep 2014 08:57:32 +0000 (08:57 +0000)]
Merge pull request #3212 from mshabunin:python_cross_build_2.4
Vadim Pisarevsky [Wed, 17 Sep 2014 12:48:44 +0000 (12:48 +0000)]
Merge pull request #2047 from GregoryMorse:patch-4
Vadim Pisarevsky [Wed, 17 Sep 2014 10:54:02 +0000 (10:54 +0000)]
Merge pull request #3222 from dmitrygribanov:dg/2.4-stitching-wave-correction-bugfix
Vadim Pisarevsky [Wed, 17 Sep 2014 10:40:42 +0000 (10:40 +0000)]
Merge pull request #3225 from jormansa:bug_#3631
Vadim Pisarevsky [Wed, 17 Sep 2014 09:50:08 +0000 (09:50 +0000)]
Merge pull request #3228 from PhilLab:patch-4
Philipp Hasper [Wed, 17 Sep 2014 07:30:19 +0000 (09:30 +0200)]
Doc: Fixing indentation
jormansa [Mon, 15 Sep 2014 16:09:44 +0000 (18:09 +0200)]
bug fixed
Andrey Pavlenko [Mon, 15 Sep 2014 13:54:19 +0000 (13:54 +0000)]
Merge pull request #3219 from mshabunin:png_iccp_strip_24
Dmitry Gribanov [Mon, 15 Sep 2014 13:04:08 +0000 (17:04 +0400)]
Feature based stitching's wave correction bugfix.
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
Alexander Alekhin [Mon, 15 Sep 2014 11:12:02 +0000 (11:12 +0000)]
Merge pull request #3221 from asmorkalov:ocv_2.4.10_version_inc
Alexander Smorkalov [Mon, 15 Sep 2014 10:55:25 +0000 (14:55 +0400)]
OpenCV version++.
Maksim Shabunin [Mon, 15 Sep 2014 08:48:28 +0000 (12:48 +0400)]
Stripped iCCP chunk from png files
Vadim Pisarevsky [Sun, 14 Sep 2014 18:44:23 +0000 (18:44 +0000)]
Merge pull request #3204 from parafin:ximea_unix-2.4
Vadim Pisarevsky [Sun, 14 Sep 2014 18:43:48 +0000 (18:43 +0000)]
Merge pull request #3202 from parafin:bug_3858-2.4
Maksim Shabunin [Thu, 4 Sep 2014 12:28:11 +0000 (16:28 +0400)]
Changed cmake python library search startegy for crosscompiling
GregoryMorse [Sat, 14 Dec 2013 08:53:30 +0000 (16:53 +0800)]
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
GregoryMorse [Thu, 8 May 2014 10:06:06 +0000 (18:06 +0800)]
Add VS2013 support
Fix indentation in output that made it look like changes were dependent on WinRT when they are independent libraries.
Defaults needed flipping otherwise undesired behavior. Change is tested with combinations.
Fixed and tested
Windows Phone v8.0/v8.1 SDK for Universal Windows Apps (Windows Phone v8.1 Silverlight App support not included) and fix initial cache causing problem
Igor Kuzmin [Tue, 9 Sep 2014 15:17:13 +0000 (19:17 +0400)]
XIMEA cam support: allow on OS X too
Igor Kuzmin [Tue, 9 Sep 2014 15:15:03 +0000 (19:15 +0400)]
XIMEA cam support: use correct library for 64 bit Linux
Igor Kuzmin [Tue, 9 Sep 2014 15:10:05 +0000 (19:10 +0400)]
fix for issue 3858 (remove unneeded #include's)
also use correct include path on Linux
Vadim Pisarevsky [Tue, 9 Sep 2014 06:33:15 +0000 (06:33 +0000)]
Merge pull request #3194 from stonier:2.4
Vadim Pisarevsky [Tue, 9 Sep 2014 06:31:17 +0000 (06:31 +0000)]
Merge pull request #3197 from asmorkalov:python_tests_package
Alexander Smorkalov [Mon, 8 Sep 2014 14:11:12 +0000 (18:11 +0400)]
Python tests added to -tests deb package.
Daniel Stonier [Sun, 7 Sep 2014 19:31:37 +0000 (04:31 +0900)]
make sure children are included in the moveToThread
Daniel Stonier [Sun, 7 Sep 2014 18:19:56 +0000 (03:19 +0900)]
support invokation of cv windows from parallel threads to an external qt application.
Roman Donchenko [Fri, 5 Sep 2014 09:49:54 +0000 (09:49 +0000)]
Merge pull request #3156 from sergregory:CreateSamplesMod
Grigory Serebryakov [Fri, 5 Sep 2014 07:27:43 +0000 (11:27 +0400)]
Warning on converting int to bool fixed
Grigory Serebryakov [Fri, 5 Sep 2014 06:45:54 +0000 (10:45 +0400)]
Include for cvSameImage corrected
E Braun [Tue, 2 Sep 2014 16:05:23 +0000 (18:05 +0200)]
fix for bug 3172
E Braun [Tue, 2 Sep 2014 11:56:13 +0000 (13:56 +0200)]
Revert "fix for bug 3172"
This reverts commit
ed2cdb71e5821db85b57cf60d88689c2bf32aeeb.
Grigory Serebryakov [Tue, 2 Sep 2014 06:55:45 +0000 (10:55 +0400)]
Documentation update: createsamples usage
Grigory Serebryakov [Mon, 1 Sep 2014 09:02:27 +0000 (13:02 +0400)]
No output image resize in case of PNG dataset
Vadim Pisarevsky [Mon, 1 Sep 2014 06:15:36 +0000 (06:15 +0000)]
Merge pull request #3178 from jimcamel:freak_sse_bugfix
Adrian Clark [Sun, 31 Aug 2014 21:37:33 +0000 (09:37 +1200)]
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
Vadim Pisarevsky [Fri, 29 Aug 2014 08:11:28 +0000 (08:11 +0000)]
Merge pull request #3164 from jet47:fix-cuda-lut
Vladislav Vinogradov [Thu, 28 Aug 2014 10:47:26 +0000 (14:47 +0400)]
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.
Grigory Serebryakov [Wed, 27 Aug 2014 08:41:18 +0000 (12:41 +0400)]
Naming fixes and code beautification
Grigory Serebryakov [Tue, 26 Aug 2014 04:55:59 +0000 (08:55 +0400)]
Class naming update
Documentation improvement
Bug in output format for JPG set fixed
Grigory Serebryakov [Mon, 25 Aug 2014 14:46:23 +0000 (18:46 +0400)]
Typo in string fixed
Grigory Serebryakov [Tue, 29 Jul 2014 10:12:17 +0000 (14:12 +0400)]
Can create training set in PNG format
The format of the training set can be changed with the `-pngoutput` key.
Output image will be resized to a 640x480 size if greater.
Vadim Pisarevsky [Fri, 22 Aug 2014 11:49:52 +0000 (11:49 +0000)]
Merge pull request #3147 from asmorkalov:ocv_deb_lintian_fixes
Vadim Pisarevsky [Fri, 22 Aug 2014 07:22:23 +0000 (07:22 +0000)]
Merge pull request #3109 from jet47:gpu-test-fixes
Vadim Pisarevsky [Fri, 22 Aug 2014 07:21:46 +0000 (07:21 +0000)]
Merge pull request #3143 from jet47:cuda-cvt-color-fix
Alexander Smorkalov [Fri, 22 Aug 2014 06:51:52 +0000 (10:51 +0400)]
Several fixes for lintian varnings
Vladislav Vinogradov [Thu, 21 Aug 2014 10:14:06 +0000 (14:14 +0400)]
fix CUDA cvtColor after corresponding change in CPU version
see https://github.com/Itseez/opencv/pull/3137
Vadim Pisarevsky [Thu, 21 Aug 2014 05:39:18 +0000 (05:39 +0000)]
Merge pull request #3137 from akarsakov:fix_cvtcolor_luv_rgb
Alexander Karsakov [Wed, 20 Aug 2014 07:09:21 +0000 (11:09 +0400)]
Fixed range for 'v' channel for 8U images.
Vadim Pisarevsky [Mon, 18 Aug 2014 15:39:30 +0000 (15:39 +0000)]
Merge pull request #3120 from StevenPuttemans:fix_bug3863
Vadim Pisarevsky [Mon, 18 Aug 2014 12:45:35 +0000 (12:45 +0000)]
Merge pull request #3118 from akarsakov:fix_cvtcolor_perf
StevenPuttemans [Mon, 18 Aug 2014 11:33:40 +0000 (13:33 +0200)]
fixing GT and GE comparison symbol
Alexander Karsakov [Mon, 18 Aug 2014 09:01:19 +0000 (13:01 +0400)]
Fixed getConversionInfo() for YUV2RGBA_* conversions
Vadim Pisarevsky [Sat, 16 Aug 2014 06:03:28 +0000 (06:03 +0000)]
Merge pull request #3108 from LeszekSwirski:fix-gemm-buf-allocate-2.4
Vladislav Vinogradov [Fri, 15 Aug 2014 10:10:15 +0000 (14:10 +0400)]
fix BGR->BGR5x5 color convertion
Vladislav Vinogradov [Fri, 15 Aug 2014 09:42:25 +0000 (13:42 +0400)]
use downscaled frames in FGDStatModel test
Vladislav Vinogradov [Fri, 15 Aug 2014 09:42:06 +0000 (13:42 +0400)]
increase epsilon for ResizeSameAsHost test
Vladislav Vinogradov [Fri, 15 Aug 2014 09:41:47 +0000 (13:41 +0400)]
increase epsilon for TVL1 sanity test
Leszek Swirski [Thu, 14 Aug 2014 14:05:30 +0000 (15:05 +0100)]
Fix reallocation of D buffer in gemm
Conflicts:
modules/core/src/matmul.cpp
Vadim Pisarevsky [Wed, 13 Aug 2014 14:08:50 +0000 (14:08 +0000)]
Merge pull request #3093 from asmorkalov:ocv_array_bound_fix
Alexander Smorkalov [Wed, 13 Aug 2014 09:46:43 +0000 (13:46 +0400)]
GCC 4.8 warning array subscript is above array bounds fixed.
Vadim Pisarevsky [Wed, 13 Aug 2014 13:04:02 +0000 (13:04 +0000)]
Merge pull request #2827 from Alexander-Petrikov-ELVEES-NEOTEK:neon-stereobm
Vadim Pisarevsky [Mon, 11 Aug 2014 16:10:15 +0000 (16:10 +0000)]
Merge pull request #3076 from vpisarev:fix_small_filters
Aleksandr Petrikov [Wed, 18 Jun 2014 13:48:10 +0000 (17:48 +0400)]
fix bug 3733 for imgproc/filter.cpp
Vadim Pisarevsky [Mon, 11 Aug 2014 11:10:17 +0000 (11:10 +0000)]
Merge pull request #3058 from PhilLab:patch-2
PhilLab [Fri, 8 Aug 2014 15:39:12 +0000 (17:39 +0200)]
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
Vadim Pisarevsky [Thu, 7 Aug 2014 06:40:37 +0000 (06:40 +0000)]
Merge pull request #3046 from StevenPuttemans:fix_Qt_locale
StevenPuttemans [Tue, 5 Aug 2014 14:05:10 +0000 (16:05 +0200)]
fixing setting the locale back to what should be expected
fix should be applyed for every window interface and generation
Vadim Pisarevsky [Sat, 2 Aug 2014 21:52:51 +0000 (21:52 +0000)]
Merge pull request #3026 from jet47:fix-gpu-resize-linear
Vladislav Vinogradov [Fri, 1 Aug 2014 07:33:29 +0000 (11:33 +0400)]
fix cv::gpu::resize for INTER_LINEAR, now it produces the same result as CPU version
E Braun [Thu, 31 Jul 2014 22:17:56 +0000 (00:17 +0200)]
fix for bug 3172
E Braun [Thu, 31 Jul 2014 22:16:58 +0000 (00:16 +0200)]
regression test for bug 3172
Alexander Alekhin [Wed, 30 Jul 2014 13:02:44 +0000 (13:02 +0000)]
Merge pull request #3019 from alalek:ocl_fix_pyrUp_test
Alexander Smorkalov [Wed, 30 Jul 2014 10:52:01 +0000 (14:52 +0400)]
Android native camera rebuilt after sources update.
Alexander Smorkalov [Wed, 30 Jul 2014 10:35:00 +0000 (14:35 +0400)]
Merge branch 'fix_androidcamera_preview_usage_bits' into 2.4