platform/upstream/opencv.git
9 years agoadded extra BUFFERSIZE doc and getter
StevenPuttemans [Fri, 14 Nov 2014 13:09:43 +0000 (14:09 +0100)]
added extra BUFFERSIZE doc and getter

9 years agoMerge pull request #3421 from SpecLad:ncv-algorithm
Vadim Pisarevsky [Thu, 13 Nov 2014 15:40:29 +0000 (15:40 +0000)]
Merge pull request #3421 from SpecLad:ncv-algorithm

9 years agoNCV.cu: include <algorithm>
Roman Donchenko [Thu, 13 Nov 2014 13:16:26 +0000 (16:16 +0300)]
NCV.cu: include <algorithm>

It's needed for std::max.

9 years agoMerge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params
Vadim Pisarevsky [Thu, 13 Nov 2014 07:27:33 +0000 (07:27 +0000)]
Merge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params

9 years agoMerge pull request #3414 from SpecLad:vg-stereogc
Vadim Pisarevsky [Thu, 13 Nov 2014 07:20:30 +0000 (07:20 +0000)]
Merge pull request #3414 from SpecLad:vg-stereogc

9 years agoMerge pull request #3418 from tstellarAMD:2.4-hog-crash-fix
Alexander Alekhin [Thu, 13 Nov 2014 01:49:06 +0000 (01:49 +0000)]
Merge pull request #3418 from tstellarAMD:2.4-hog-crash-fix

9 years agoMerge pull request #3417 from ilya-lavrenov:dox_warn
Maksim Shabunin [Wed, 12 Nov 2014 17:48:43 +0000 (17:48 +0000)]
Merge pull request #3417 from ilya-lavrenov:dox_warn

9 years agoattemp to fix dox warning
Ilya Lavrenov [Wed, 12 Nov 2014 16:18:45 +0000 (19:18 +0300)]
attemp to fix dox warning

9 years agoocl: Fix crash during destruction of gauss_w_lut object in hog.cpp
Tom Stellard [Mon, 10 Nov 2014 15:10:42 +0000 (10:10 -0500)]
ocl: Fix crash during destruction of gauss_w_lut object in hog.cpp

gauss_w_lut is a statically defined variable of type oclMat.  The oclMat
destructor calls openCLFree() which via getInitializationMutex() accesses
the __module variable which has been statically defined in cl_context.cpp

Since the destruction order of statically defined variables in different
compilation units is undefined, it is possible that __module will
be destructed before gauss_w_lut, which would result in a segfault when
getInitializationMutex() is called while destructing gauss_w_lut.

In order to avoid this issue, we need to make gauss_w_lut a private
member of the HOGDescriptors class so we know it will be destroyed
before __module.

9 years agoFix uninitialized memory reads and memory leaks in StereoGC
Roman Donchenko [Wed, 12 Nov 2014 14:00:08 +0000 (17:00 +0300)]
Fix uninitialized memory reads and memory leaks in StereoGC

9 years agoadding extra buffer parameter
StevenPuttemans [Wed, 12 Nov 2014 09:48:24 +0000 (10:48 +0100)]
adding extra buffer parameter

9 years agoMerge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds
Vadim Pisarevsky [Tue, 11 Nov 2014 13:27:41 +0000 (13:27 +0000)]
Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds

9 years agoSuppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp
Roman Donchenko [Fri, 7 Nov 2014 10:35:20 +0000 (13:35 +0300)]
Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp

This is actually the same warning that the suppression at the bottom
suppresses, but that one doesn't suppress it when using a native compiler
(go figure).

I remove the forced inclusion of precompiled headers into all sources,
since otherwise this workaround doesn't work - the header with the warning
is included before I can use a pragma.

9 years agoMerge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
Vadim Pisarevsky [Mon, 10 Nov 2014 08:27:41 +0000 (08:27 +0000)]
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface

9 years agoMerge pull request #3305 from tSed:opencv-2.4.x/opencv.pc-generation-refactoring
Vadim Pisarevsky [Thu, 6 Nov 2014 08:41:07 +0000 (08:41 +0000)]
Merge pull request #3305 from tSed:opencv-2.4.x/opencv.pc-generation-refactoring

9 years agoMerge pull request #3294 from mshabunin:fix-ios-warnings-24
Vadim Pisarevsky [Wed, 5 Nov 2014 11:35:19 +0000 (11:35 +0000)]
Merge pull request #3294 from mshabunin:fix-ios-warnings-24

9 years agoMerge pull request #3376 from vriera:2.4
Vadim Pisarevsky [Wed, 5 Nov 2014 11:13:03 +0000 (11:13 +0000)]
Merge pull request #3376 from vriera:2.4

9 years agocmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation
Samuel Martin [Thu, 2 Oct 2014 22:32:40 +0000 (00:32 +0200)]
cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation

Using absolute path to locate the components in the "Libs:" field of the
*.pc can badly break cross-compilation, especially when building
statically linked objects.

Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths
when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment
variables are set [1]. This feature is very helpful and common in
cross-compilation framework like Buildroot [2,3].

When there are absolute paths in the *.pc files, pkg-config won't be
able to do the path substitions for these paths when the afromentioned
environment variables are set.
In such case, since the prefix is the target one, not the sysroot one,
these libraries' abolute paths will point to:
- in the best case: a non-existing file (i.e. these files do not exists
  on the host system;
- at worst: the host system's libraries. This will make the linking
  failed because these host system's libraries will most likely not be
  build for the target architecture [4].

So, this patch replace the components' absolute paths by the form:
  -L<libdir> -l<libname>

This way, the linker will be able to resolve each dependency path,
whatever the kind of objects/build (shared object or static build) it
is dealing with.

Note that for static link, the library order does matter [5]. The order
of the opencv components has been carefully chosen to comply with this
requirement.

Fixes #3931

[1] http://linux.die.net/man/1/pkg-config
[2] http://buildroot.org/
[3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in
[4] http://autobuild.buildroot.net/results/e8a/e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log
[5] http://stackoverflow.com/questions/45135/linker-order-gcc

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Note: this patch properly applies on top of the master branch, though it
      has been written on top of the 2.4 branch.

9 years agoMerge pull request #3382 from StevenPuttemans:fix_3982
Vadim Pisarevsky [Fri, 31 Oct 2014 11:18:23 +0000 (11:18 +0000)]
Merge pull request #3382 from StevenPuttemans:fix_3982

9 years agoMerge pull request #3364 from mshabunin:doxygen-docs-24
Vadim Pisarevsky [Thu, 30 Oct 2014 10:42:24 +0000 (10:42 +0000)]
Merge pull request #3364 from mshabunin:doxygen-docs-24

9 years agofixing SVM negative value rounding
StevenPuttemans [Wed, 29 Oct 2014 12:50:20 +0000 (13:50 +0100)]
fixing SVM negative value rounding

9 years agofixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
StevenPuttemans [Thu, 9 Oct 2014 09:30:42 +0000 (11:30 +0200)]
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
series are supported. Testing this with both cams for Windows and Linux
exhaustively.

Optimizing memory footprint by removing unused calls.

Adapted with the input of Shai

Added small example that illustrates how it should work.

9 years agosuperres: Fix \ 1\ 1return value VideoFrameSource_GPU
Vicente Olivert Riera [Mon, 27 Oct 2014 13:39:35 +0000 (13:39 +0000)]
superres: Fix \ 1\ 1return value VideoFrameSource_GPU

superres module fails to compile with the following error messages:

[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....

This is caused because the return value of the \ 1createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.

9 years agoiOS framework build script changes from master branch
Maksim Shabunin [Tue, 21 Oct 2014 11:41:02 +0000 (15:41 +0400)]
iOS framework build script changes from master branch

9 years agoFixed iOS framework compilation warnings
Maksim Shabunin [Mon, 20 Oct 2014 12:06:32 +0000 (16:06 +0400)]
Fixed iOS framework compilation warnings

9 years agoiOS framework build script changes
Maksim Shabunin [Mon, 20 Oct 2014 08:59:17 +0000 (12:59 +0400)]
iOS framework build script changes

- buildbot process support (break build in case of errors)
- disabled some warnings in cmake script

9 years agoMerge pull request #3336 from BKNio:putText_develop2
Maksim Shabunin [Mon, 27 Oct 2014 11:56:25 +0000 (11:56 +0000)]
Merge pull request #3336 from BKNio:putText_develop2

9 years agofixed issue with malformed UTF-8 string;
Dinar Ahmatnurov [Tue, 14 Oct 2014 13:11:18 +0000 (17:11 +0400)]
fixed issue with malformed UTF-8 string;

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.

iOS: fix crash from overrelease in UIImageToMat

viz: fixed memory leak, issue 3961

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.

Fix test name.

TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.

TIFF loader: Pass buffer size to read functions.

replace not ascii and not cyrillic symbols with '?';

add test for putText;

fix warning;

minor fixes;

9 years agoMerge pull request #3362 from mshabunin:fix-drawing-24
Vadim Pisarevsky [Sun, 26 Oct 2014 17:44:07 +0000 (17:44 +0000)]
Merge pull request #3362 from mshabunin:fix-drawing-24

9 years agoMerge pull request #3363 from asmorkalov:qnx_support
Vadim Pisarevsky [Sun, 26 Oct 2014 17:42:24 +0000 (17:42 +0000)]
Merge pull request #3363 from asmorkalov:qnx_support

9 years agoMerge pull request #3366 from jet47:fix-gpu-cuda-7.0
Vadim Pisarevsky [Sun, 26 Oct 2014 17:41:14 +0000 (17:41 +0000)]
Merge pull request #3366 from jet47:fix-gpu-cuda-7.0

9 years agoMerge pull request #3356 from jet47:ctest-support
Vadim Pisarevsky [Sun, 26 Oct 2014 17:40:35 +0000 (17:40 +0000)]
Merge pull request #3356 from jet47:ctest-support

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 agoBasic doxygen documentation support
Maksim Shabunin [Thu, 9 Oct 2014 10:04:00 +0000 (14:04 +0400)]
Basic doxygen documentation support

- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings

Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp

9 years agoFixes for QNX 6.6 Neitrino support.
Alexander Smorkalov [Thu, 23 Oct 2014 09:01:42 +0000 (13:01 +0400)]
Fixes for QNX 6.6 Neitrino support.

9 years agoFixed highgui drawing test
Maksim Shabunin [Thu, 23 Oct 2014 09:28:33 +0000 (13:28 +0400)]
Fixed highgui drawing test

- changed image comparison technique
- removed old assert statements

9 years agodetermine test category (Public vs Extra) based on module location
Vladislav Vinogradov [Tue, 21 Oct 2014 14:51:02 +0000 (18:51 +0400)]
determine test category (Public vs Extra) based on module location

9 years agoadd CTest targets for sanity tests
Vladislav Vinogradov [Tue, 21 Oct 2014 14:50:38 +0000 (18:50 +0400)]
add CTest targets for sanity tests

9 years agodisable CTest target for opencv_test_viz:
Vladislav Vinogradov [Tue, 21 Oct 2014 14:49:53 +0000 (18:49 +0400)]
disable CTest target for opencv_test_viz:

opencv_test_viz creates windows and waits until user close them,
it is not appropriate for automatic testing

9 years agorewrite add_test command for accuracy tests:
Vladislav Vinogradov [Tue, 21 Oct 2014 14:48:46 +0000 (18:48 +0400)]
rewrite add_test command for accuracy tests:

* use new syntax introduced in CMake 2.8.0
* set OPENCV_TEST_DATA_PATH enviroment property

9 years agoturn on testing support in root binary directory
Vladislav Vinogradov [Tue, 21 Oct 2014 14:45:47 +0000 (18:45 +0400)]
turn on testing support in root binary directory

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.

9 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.

9 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).

9 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.

9 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

9 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)

9 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

9 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

9 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

9 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

9 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

9 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.

9 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

9 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

9 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

9 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.

9 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

9 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.

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

9 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.

9 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.

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

9 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.

9 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.

9 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

9 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.