platform/upstream/opencv.git
9 years agominor fix for StereoCSBP data cost compute kernel and test
Vladislav Vinogradov [Thu, 23 Oct 2014 15:33:19 +0000 (19:33 +0400)]
minor fix for StereoCSBP data cost compute kernel and test

9 years agoincrease epsilons for some tests, which functions use floating point arithm
Vladislav Vinogradov [Thu, 23 Oct 2014 14:39:36 +0000 (18:39 +0400)]
increase epsilons for some tests, which functions use floating point arithm

9 years agoavoid pointer arithmetic on register memory in color conversion
Vladislav Vinogradov [Thu, 23 Oct 2014 14:09:49 +0000 (18:09 +0400)]
avoid pointer arithmetic on register memory in color conversion

9 years agoMerge pull request #3350 from Trundle:fix_some_tiff_crashes
Vadim Pisarevsky [Mon, 20 Oct 2014 06:44:10 +0000 (06:44 +0000)]
Merge pull request #3350 from Trundle:fix_some_tiff_crashes

9 years agoTIFF loader: Pass buffer size to read functions.
Andreas Stührk [Sat, 18 Oct 2014 23:22:18 +0000 (01:22 +0200)]
TIFF loader: Pass buffer size to read functions.

9 years agoTIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
Andreas Stührk [Sat, 18 Oct 2014 23:22:04 +0000 (01:22 +0200)]
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.

9 years agoFix test name.
Andreas Stührk [Sat, 18 Oct 2014 23:13:35 +0000 (01:13 +0200)]
Fix test name.

9 years agoMerge pull request #3341 from jet47:deb-package-lib-symlinks
Vadim Pisarevsky [Sat, 18 Oct 2014 17:00:52 +0000 (17:00 +0000)]
Merge pull request #3341 from jet47:deb-package-lib-symlinks

9 years agoMerge pull request #3346 from Nerei:fixed_memory_leak_in_viz
Vadim Pisarevsky [Sat, 18 Oct 2014 16:57:55 +0000 (16:57 +0000)]
Merge pull request #3346 from Nerei:fixed_memory_leak_in_viz

9 years agoviz: fixed memory leak, issue 3961
Anatoly Baksheev [Sat, 18 Oct 2014 14:12:36 +0000 (18:12 +0400)]
viz: fixed memory leak, issue 3961

9 years agoMerge pull request #3340 from AdLantis:2.4
Vadim Pisarevsky [Fri, 17 Oct 2014 11:36:24 +0000 (11:36 +0000)]
Merge pull request #3340 from AdLantis:2.4

9 years agofix installation layout for debian packages:
Vladislav Vinogradov [Fri, 17 Oct 2014 09:23:23 +0000 (13:23 +0400)]
fix installation layout for debian packages:

Install symlinks to shared libraries as a part of development package,
not runtime package.

It is default behavior for debian packages.

9 years agoiOS: fix crash from overrelease in UIImageToMat
Thomas Weisbach [Fri, 17 Oct 2014 08:49:14 +0000 (17:49 +0900)]
iOS: fix crash from overrelease in UIImageToMat

9 years agoMerge pull request #3337 from tstellarAMD:2.4-ocl-context-cleanup-fix
Vadim Pisarevsky [Thu, 16 Oct 2014 10:07:13 +0000 (10:07 +0000)]
Merge pull request #3337 from tstellarAMD:2.4-ocl-context-cleanup-fix

9 years agoocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
Tom Stellard [Wed, 15 Oct 2014 00:41:23 +0000 (20:41 -0400)]
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction

ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:

static std::vector<DeviceInfoImpl> global_devices;

ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.

This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.

Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.

9 years agoMerge pull request #3331 from tSed:opencv-2.4.x/fix-x86-PIC-compilation
Vadim Pisarevsky [Sun, 12 Oct 2014 13:42:38 +0000 (13:42 +0000)]
Merge pull request #3331 from tSed:opencv-2.4.x/fix-x86-PIC-compilation

9 years agocore: fix x86 PIC code compilation
Samuel Martin [Sun, 12 Oct 2014 08:17:23 +0000 (10:17 +0200)]
core: fix x86 PIC code compilation

This bug was triggered by Buildroot autobuilders [1,2], causing this
kind of failures [3,4]:

  [ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
  make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1

[1] http://buildroot.org/
[2] http://autobuild.buildroot.org/
[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
9 years agoMerge pull request #3265 from BKNio:putText_develop
Vadim Pisarevsky [Sat, 11 Oct 2014 18:06:25 +0000 (18:06 +0000)]
Merge pull request #3265 from BKNio:putText_develop

9 years agoMerge pull request #3329 from taka-no-me:patch-1
Vadim Pisarevsky [Sat, 11 Oct 2014 17:41:23 +0000 (17:41 +0000)]
Merge pull request #3329 from taka-no-me:patch-1

9 years agoMerge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator
Vadim Pisarevsky [Sat, 11 Oct 2014 17:35:50 +0000 (17:35 +0000)]
Merge pull request #3300 from rohitrawat:bug_3787_docs_NAryMatIterator

9 years agoMerge pull request #3327 from JonasVautherin:patch_cmake_android_r10
Vadim Pisarevsky [Sat, 11 Oct 2014 17:26:19 +0000 (17:26 +0000)]
Merge pull request #3327 from JonasVautherin:patch_cmake_android_r10

9 years agosilence cmake 3.0+ warnings on LOCATION attribute
Andrey Kamaev [Sat, 11 Oct 2014 16:35:48 +0000 (20:35 +0400)]
silence cmake 3.0+ warnings on LOCATION attribute

9 years agoPatch for NDK r10
Jonas Vautherin [Fri, 10 Oct 2014 13:07:11 +0000 (15:07 +0200)]
Patch for NDK r10

9 years agofix issue with font;
Dinar Ahmatnurov [Fri, 10 Oct 2014 13:11:20 +0000 (17:11 +0400)]
fix issue with font;

9 years agoMerge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
Vadim Pisarevsky [Fri, 10 Oct 2014 11:02:50 +0000 (11:02 +0000)]
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp

9 years agoTCP instead of UDP
Ilya Lavrenov [Mon, 6 Oct 2014 07:56:30 +0000 (07:56 +0000)]
TCP instead of UDP

9 years agoMerge pull request #3298 from a-wi:DShow_capture
Vadim Pisarevsky [Thu, 9 Oct 2014 15:00:25 +0000 (15:00 +0000)]
Merge pull request #3298 from a-wi:DShow_capture

9 years agoMerge pull request #3309 from nisargthakkar:Thickness1NoLineCV_AA
Vadim Pisarevsky [Thu, 9 Oct 2014 14:42:44 +0000 (14:42 +0000)]
Merge pull request #3309 from nisargthakkar:Thickness1NoLineCV_AA

9 years agoMerge pull request #3311 from BarneyBear:2.4-drawMatches-flag-fix
Vadim Pisarevsky [Thu, 9 Oct 2014 14:20:23 +0000 (14:20 +0000)]
Merge pull request #3311 from BarneyBear:2.4-drawMatches-flag-fix

9 years agoMerge pull request #3316 from nisargthakkar:Bug3887
Vadim Pisarevsky [Thu, 9 Oct 2014 14:19:12 +0000 (14:19 +0000)]
Merge pull request #3316 from nisargthakkar:Bug3887

9 years agoMerge pull request #3319 from Trundle:tiff_infinite_rowsperstrip
Vadim Pisarevsky [Thu, 9 Oct 2014 14:15:02 +0000 (14:15 +0000)]
Merge pull request #3319 from Trundle:tiff_infinite_rowsperstrip

9 years agoDon't allocate lots of memory when reading TIFFs with infinite rows per strip.
Andreas Stührk [Wed, 8 Oct 2014 21:31:30 +0000 (23:31 +0200)]
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.

Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".

9 years agoMade some changes specefict to 4 channel images. Fixed step value for tptr
Nisarg Thakkar [Tue, 7 Oct 2014 11:06:22 +0000 (16:36 +0530)]
Made some changes specefict to 4 channel images. Fixed step value for tptr

9 years agoFixed doc for Bug #3887
Nisarg Thakkar [Wed, 8 Oct 2014 10:32:03 +0000 (16:02 +0530)]
Fixed doc for Bug #3887

Fixed doc for Bug #3887

9 years agoFixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of...
Niklas Frisk [Tue, 7 Oct 2014 07:40:56 +0000 (09:40 +0200)]
Fixes  #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.

10 years agoFixing bug in NAryMatIterator documentation(Bug #3787).
Rohit Rawat [Thu, 2 Oct 2014 23:48:31 +0000 (18:48 -0500)]
Fixing bug in NAryMatIterator documentation(Bug #3787).

Fixed the non-working code example for NAryMatIterator.
The documentation of NAryMatIterator in file:
modules/core/include/opencv2/core/core.hpp has a working example which
was used for these edits.

10 years agoFixed getting CV_CAP_PROP_FOURCC property value
Artur Wieczorek [Thu, 2 Oct 2014 15:51:10 +0000 (17:51 +0200)]
Fixed getting CV_CAP_PROP_FOURCC property value

Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).

10 years agoFixed media type GUID for I420 format in DShow capture.
Artur Wieczorek [Thu, 2 Oct 2014 09:51:56 +0000 (11:51 +0200)]
Fixed media type GUID for I420 format in DShow capture.

FOURCC code bytes should be placed in the reverse order.

10 years agoMerge pull request #3297 from asmorkalov:ocv_docs_fix
Maksim Shabunin [Thu, 2 Oct 2014 10:56:08 +0000 (10:56 +0000)]
Merge pull request #3297 from asmorkalov:ocv_docs_fix

10 years agoFixed selecting media type in DShow video capture.
Artur Wieczorek [Thu, 2 Oct 2014 09:48:47 +0000 (11:48 +0200)]
Fixed selecting media type in DShow video capture.

Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx)

10 years agodoc/check_docs2.py warnings fixes
Alexander Smorkalov [Thu, 2 Oct 2014 09:40:30 +0000 (13:40 +0400)]
doc/check_docs2.py warnings fixes

10 years agoMerge pull request #3288 from StevenPuttemans:fix_ts_dependencies
Andrey Pavlenko [Wed, 1 Oct 2014 07:33:36 +0000 (07:33 +0000)]
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies

10 years agoMerge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
Andrey Pavlenko [Wed, 1 Oct 2014 07:26:25 +0000 (07:26 +0000)]
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency

10 years agoMerge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
Andrey Pavlenko [Wed, 1 Oct 2014 07:26:04 +0000 (07:26 +0000)]
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra

10 years agoMerge pull request #3291 from asmorkalov:android_superres_video_check
Andrey Pavlenko [Wed, 1 Oct 2014 07:25:15 +0000 (07:25 +0000)]
Merge pull request #3291 from asmorkalov:android_superres_video_check

10 years agoTurn off superres accuracy tests if video i/o is not supported.
Alexander Smorkalov [Wed, 1 Oct 2014 05:13:35 +0000 (09:13 +0400)]
Turn off superres accuracy tests if video i/o is not supported.

10 years agoMerge pull request #3275 from asmorkalov:ocv_gstreamer_backport
Roman Donchenko [Tue, 30 Sep 2014 15:55:26 +0000 (15:55 +0000)]
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport

10 years agoMerge pull request #3285 from asmorkalov:android_servive_big.little_fix
Roman Donchenko [Tue, 30 Sep 2014 15:19:07 +0000 (15:19 +0000)]
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix

10 years agoMerge pull request #3287 from asmorkalov:android_manager_version_inc5
Roman Donchenko [Tue, 30 Sep 2014 14:44:35 +0000 (14:44 +0000)]
Merge pull request #3287 from asmorkalov:android_manager_version_inc5

10 years agoOpenCV Manager hardware detector workaround for not detected ARM SoC support.
Alexander Smorkalov [Mon, 16 Jun 2014 04:39:03 +0000 (08:39 +0400)]
OpenCV Manager hardware detector workaround for not detected ARM SoC support.

10 years agoMerge pull request #3282 from asmorkalov:android_exclude_ocl
Maksim Shabunin [Tue, 30 Sep 2014 10:53:16 +0000 (10:53 +0000)]
Merge pull request #3282 from asmorkalov:android_exclude_ocl

10 years agoTest fisheye.rectify disabled for Tegra.
Alexander Smorkalov [Tue, 30 Sep 2014 10:34:00 +0000 (14:34 +0400)]
Test fisheye.rectify disabled for Tegra.

10 years agofixing dependencies
StevenPuttemans [Tue, 30 Sep 2014 09:53:46 +0000 (11:53 +0200)]
fixing dependencies

10 years agoHighgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
Alexander Smorkalov [Tue, 30 Sep 2014 09:35:19 +0000 (13:35 +0400)]
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.

10 years agoGStreamer 1.0 backport from master branch.
Alexander Smorkalov [Tue, 23 Sep 2014 15:02:37 +0000 (19:02 +0400)]
GStreamer 1.0 backport from master branch.

10 years agoOpenCV Manager version++.
Alexander Smorkalov [Tue, 30 Sep 2014 08:05:46 +0000 (12:05 +0400)]
OpenCV Manager version++.

10 years agoRemove ATL dependency from MSMF capture code
Artur Wieczorek [Tue, 23 Sep 2014 17:31:55 +0000 (19:31 +0200)]
Remove ATL dependency from MSMF capture code

Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.

10 years agoExclude OpenCL tests from default test list for Android as they are experimental.
Alexander Smorkalov [Mon, 29 Sep 2014 16:42:24 +0000 (20:42 +0400)]
Exclude OpenCL tests from default test list for Android as they are experimental.

10 years agoMerge pull request #3263 from asmorkalov:python_tests_package_lintian
Roman Donchenko [Mon, 29 Sep 2014 14:53:02 +0000 (14:53 +0000)]
Merge pull request #3263 from asmorkalov:python_tests_package_lintian

10 years agoAdded implicit dependency from python and python-py to debian packages.
Alexander Smorkalov [Wed, 24 Sep 2014 10:23:52 +0000 (14:23 +0400)]
Added implicit dependency from python and python-py to debian packages.

10 years agoMerge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
Maksim Shabunin [Mon, 29 Sep 2014 12:07:22 +0000 (12:07 +0000)]
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4

10 years agoMerge pull request #3266 from mshabunin:arm_warning
Vadim Pisarevsky [Sat, 27 Sep 2014 13:06:44 +0000 (13:06 +0000)]
Merge pull request #3266 from mshabunin:arm_warning

10 years agoMerge pull request #3260 from a-wi:MSMF_file_error
Vadim Pisarevsky [Sat, 27 Sep 2014 13:06:18 +0000 (13:06 +0000)]
Merge pull request #3260 from a-wi:MSMF_file_error

10 years agoset ffmpeg mutex to NULL on destruction.
Manfred Georg [Fri, 26 Sep 2014 16:44:25 +0000 (09:44 -0700)]
set ffmpeg mutex to NULL on destruction.

The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423

Cherry picked from head (file has moved but issue is the same).
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp

10 years agofixing issue with "ёЁ";
Dinar Ahmatnurov [Fri, 26 Sep 2014 07:32:14 +0000 (11:32 +0400)]
fixing issue with "ёЁ";

10 years agoFixed warning during cross compile for ARM
Maksim Shabunin [Wed, 24 Sep 2014 13:53:23 +0000 (17:53 +0400)]
Fixed warning during cross compile for ARM

10 years agoadded Cyrillic;
Dinar Ahmatnurov [Wed, 24 Sep 2014 10:27:08 +0000 (14:27 +0400)]
added Cyrillic;

added Cyrillic;

replace binary format with hex;

move duplicated code to inline function;

10 years agoMerge pull request #3261 from a-wi:CMake_FFMPEG_config
Vadim Pisarevsky [Wed, 24 Sep 2014 17:03:08 +0000 (17:03 +0000)]
Merge pull request #3261 from a-wi:CMake_FFMPEG_config

10 years agoMerge pull request #3262 from StevenPuttemans:fix_window_param
Vadim Pisarevsky [Wed, 24 Sep 2014 12:22:20 +0000 (12:22 +0000)]
Merge pull request #3262 from StevenPuttemans:fix_window_param

10 years agofixing some wrong CPP prefixes - still old interface
StevenPuttemans [Wed, 24 Sep 2014 07:33:22 +0000 (09:33 +0200)]
fixing some wrong CPP prefixes - still old interface

10 years agoUse FFMPEG capture only if HAVE_FFMPEG flag is defined.
Artur Wieczorek [Tue, 23 Sep 2014 21:48:37 +0000 (23:48 +0200)]
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.

10 years agoFixed CMake issue with FFMPEG highgui configuration
Artur Wieczorek [Tue, 23 Sep 2014 20:06:12 +0000 (22:06 +0200)]
Fixed CMake issue with FFMPEG highgui configuration

Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.

10 years agoFixed MSMF file capture error while opening the file containing unsupported video...
Artur Wieczorek [Sat, 26 Apr 2014 08:12:37 +0000 (10:12 +0200)]
Fixed MSMF file capture error while opening the file containing unsupported video stream format

10 years agoMerge pull request #3255 from bhack:fix_cuda_macosx
Vadim Pisarevsky [Tue, 23 Sep 2014 15:40:22 +0000 (15:40 +0000)]
Merge pull request #3255 from bhack:fix_cuda_macosx

10 years agoFix for bug #3469 CV_XADD failing in clang+nvcc combination
bhack [Tue, 23 Sep 2014 10:39:16 +0000 (12:39 +0200)]
Fix for bug #3469 CV_XADD failing in clang+nvcc combination

Taken from 3f0765523113ae7fc1b300f27dd78c642bb2b6c7

10 years agoMerge pull request #3251 from a-wi:MSMF_camera_errors
Vadim Pisarevsky [Tue, 23 Sep 2014 08:42:57 +0000 (08:42 +0000)]
Merge pull request #3251 from a-wi:MSMF_camera_errors

10 years agoMerge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
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

10 years agoMerge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
Vadim Pisarevsky [Tue, 23 Sep 2014 07:18:00 +0000 (07:18 +0000)]
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector

10 years agoFixing errors
StevenPuttemans [Mon, 22 Sep 2014 20:12:27 +0000 (22:12 +0200)]
Fixing errors

10 years agoFixed assertion warning in MSMF frame grabber
Artur Wieczorek [Mon, 22 Sep 2014 17:38:04 +0000 (19:38 +0200)]
Fixed assertion warning in MSMF frame grabber

10 years agoFixed MSMF video capture initialization
Artur Wieczorek [Mon, 22 Sep 2014 17:35:36 +0000 (19:35 +0200)]
Fixed MSMF video capture initialization

10 years agoMerge pull request #3247 from a-wi:CMake_MSMF_configuration
Vadim Pisarevsky [Mon, 22 Sep 2014 15:31:09 +0000 (15:31 +0000)]
Merge pull request #3247 from a-wi:CMake_MSMF_configuration

10 years agoMerge pull request #3243 from a-wi:MSMF_linking_error
Vadim Pisarevsky [Mon, 22 Sep 2014 15:29:32 +0000 (15:29 +0000)]
Merge pull request #3243 from a-wi:MSMF_linking_error

10 years agofix blobdetector
StevenPuttemans [Thu, 4 Sep 2014 14:17:51 +0000 (16:17 +0200)]
fix blobdetector

10 years agoCMake configuration for MSMF capture
Artur Wieczorek [Sun, 21 Sep 2014 16:48:54 +0000 (18:48 +0200)]
CMake configuration for MSMF capture

10 years agoFix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is...
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.

10 years agoocl: Don't use 'inline' attribute on functions
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

10 years agoMerge pull request #3240 from a-wi:MSMF_compilation_errors
Vadim Pisarevsky [Fri, 19 Sep 2014 17:36:13 +0000 (17:36 +0000)]
Merge pull request #3240 from a-wi:MSMF_compilation_errors

10 years agoMerge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
Vadim Pisarevsky [Fri, 19 Sep 2014 17:35:07 +0000 (17:35 +0000)]
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl

10 years agoFixed compilation errors under VS 2010 and Win 7
Artur Wieczorek [Fri, 19 Sep 2014 12:49:40 +0000 (14:49 +0200)]
Fixed compilation errors under VS 2010 and Win 7

10 years agoMerge branch 'bugfix_brute_force_match_cl' of https://github.com/WilhelmHannemann...
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

10 years agoBugfix brute_force_match.cl (see http://code.opencv.org/issues/2837): wrong results...
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

10 years agoBugfix brute_force_match.cl (Bug #2837): wrong results for non-float descriptors...
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

10 years agoMerge pull request #3238 from vpisarev:bfmatcher_fix
Vadim Pisarevsky [Fri, 19 Sep 2014 13:21:05 +0000 (13:21 +0000)]
Merge pull request #3238 from vpisarev:bfmatcher_fix

10 years agoMerge branch 'bug_3172' of https://github.com/elmarb/opencv into 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.

10 years agofix for bug 3172
E Braun [Tue, 2 Sep 2014 16:05:23 +0000 (18:05 +0200)]
fix for bug 3172

10 years agoRevert "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.

10 years agofix for bug 3172
E Braun [Thu, 31 Jul 2014 22:17:56 +0000 (00:17 +0200)]
fix for bug 3172

10 years agoregression test for bug 3172
E Braun [Thu, 31 Jul 2014 22:16:58 +0000 (00:16 +0200)]
regression test for bug 3172

10 years agoMerge pull request #3235 from Atanahel:gbt_bugfix
Vadim Pisarevsky [Fri, 19 Sep 2014 09:42:00 +0000 (09:42 +0000)]
Merge pull request #3235 from Atanahel:gbt_bugfix