Ben Hagen [Fri, 23 Jan 2015 11:59:09 +0000 (12:59 +0100)]
Do not blacklist GStreamer on Apple
Vadim Pisarevsky [Wed, 21 Jan 2015 10:40:19 +0000 (10:40 +0000)]
Merge pull request #3631 from StevenPuttemans:fix_samples
Vadim Pisarevsky [Tue, 20 Jan 2015 15:25:50 +0000 (15:25 +0000)]
Merge pull request #3468 from StevenPuttemans:fix_models
StevenPuttemans [Tue, 20 Jan 2015 14:41:39 +0000 (15:41 +0100)]
remove an unused #endif
Vadim Pisarevsky [Tue, 20 Jan 2015 12:36:38 +0000 (12:36 +0000)]
Merge pull request #3613 from asmorkalov:aarch64_tiff
Vadim Pisarevsky [Tue, 20 Jan 2015 12:34:49 +0000 (12:34 +0000)]
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4
Vadim Pisarevsky [Mon, 19 Jan 2015 12:33:58 +0000 (12:33 +0000)]
Merge pull request #3621 from asmorkalov:ts_master_comapat_header
Vadim Pisarevsky [Mon, 19 Jan 2015 10:51:12 +0000 (10:51 +0000)]
Merge pull request #3623 from Trundle:fix_android_link
Vadim Pisarevsky [Mon, 19 Jan 2015 10:50:14 +0000 (10:50 +0000)]
Merge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2
Andreas Stührk [Sun, 18 Jan 2015 23:01:12 +0000 (00:01 +0100)]
Update link to information about Android platform.
The current link does no longer seem to work.
Alexander Smorkalov [Sun, 18 Jan 2015 18:27:47 +0000 (21:27 +0300)]
Added OpenCV 3.0 compat header for TS module.
Vadim Pisarevsky [Sun, 18 Jan 2015 18:22:27 +0000 (18:22 +0000)]
Merge pull request #3620 from asmorkalov:native_samples_install
Alexander Smorkalov [Sun, 18 Jan 2015 17:33:05 +0000 (20:33 +0300)]
Prevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.
Craig Reynolds [Fri, 16 Jan 2015 22:57:11 +0000 (14:57 -0800)]
In cvAddText, construct QString from "text" using fromUtf8.
Alexander Smorkalov [Fri, 16 Jan 2015 22:25:58 +0000 (01:25 +0300)]
TIFF support hack for aarch64 reverted.
Vadim Pisarevsky [Fri, 16 Jan 2015 10:23:32 +0000 (10:23 +0000)]
Merge pull request #3604 from asmorkalov:ocv_samples_package
Vladislav Vinogradov [Fri, 16 Jan 2015 07:59:52 +0000 (10:59 +0300)]
fix ocv_add_module CMake macro:
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
Alexander Smorkalov [Thu, 15 Jan 2015 12:36:45 +0000 (15:36 +0300)]
Fixed -samples debian package dependencies.
Alexander Smorkalov [Thu, 15 Jan 2015 11:48:24 +0000 (14:48 +0300)]
Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.
Alexander Smorkalov [Tue, 13 Jan 2015 11:39:56 +0000 (14:39 +0300)]
GPU samples with NVIDIA specific API excluded from build if CUDA disabled.
Alexander Smorkalov [Tue, 13 Jan 2015 10:22:41 +0000 (13:22 +0300)]
Build fixes for GPU samples.
Vadim Pisarevsky [Tue, 13 Jan 2015 11:25:32 +0000 (11:25 +0000)]
Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
Alexander Smorkalov [Tue, 13 Jan 2015 10:00:06 +0000 (13:00 +0300)]
driver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do
Alexander Smorkalov [Mon, 5 Jan 2015 10:48:54 +0000 (13:48 +0300)]
parallel_do replaced with parallel_for_ in driver_gpu_multi sample.
Vadim Pisarevsky [Mon, 12 Jan 2015 11:29:21 +0000 (11:29 +0000)]
Merge pull request #3578 from asmorkalov:ocv_avx
Alexander Smorkalov [Tue, 30 Dec 2014 13:45:46 +0000 (16:45 +0300)]
OpenGL interop sample reworked not ot use cvconfig.h
Alexander Smorkalov [Tue, 30 Dec 2014 17:11:42 +0000 (20:11 +0300)]
More accurate AVX and AVX2 control.
- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.
Vadim Pisarevsky [Wed, 31 Dec 2014 09:17:25 +0000 (09:17 +0000)]
Merge pull request #3565 from mshabunin:ml-leak-24
Alexander Smorkalov [Tue, 30 Dec 2014 13:22:56 +0000 (16:22 +0300)]
parallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h
Alexander Smorkalov [Tue, 30 Dec 2014 12:52:23 +0000 (15:52 +0300)]
Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.
Maksim Shabunin [Tue, 30 Dec 2014 12:20:24 +0000 (15:20 +0300)]
Fixed memory leak in ML module
"int * CvMLData::sample_idx" was not freed
Vadim Pisarevsky [Tue, 30 Dec 2014 11:06:00 +0000 (11:06 +0000)]
Merge pull request #3562 from asmorkalov:ocv_aarch64
Alexander Smorkalov [Sun, 28 Dec 2014 09:44:24 +0000 (12:44 +0300)]
More accurate fix for libtiff and aarch64.
Alexander Smorkalov [Fri, 26 Dec 2014 10:08:44 +0000 (13:08 +0300)]
Full AARCH64 support with NEON and new CUDA toolkit.
Alexander Smorkalov [Fri, 26 Dec 2014 09:13:42 +0000 (12:13 +0300)]
TBB updated to 4.3u2. Fix for aarch64 support.
Alexander Smorkalov [Fri, 19 Dec 2014 16:05:53 +0000 (19:05 +0300)]
Fix of HaarCascade GPU test for aarch64.
Vadim Pisarevsky [Fri, 26 Dec 2014 14:34:13 +0000 (14:34 +0000)]
Merge pull request #3534 from taka-no-me:build_fixes
Vadim Pisarevsky [Fri, 26 Dec 2014 12:11:42 +0000 (12:11 +0000)]
Merge pull request #3543 from MatMoore:2.4
Vadim Pisarevsky [Fri, 26 Dec 2014 12:08:54 +0000 (12:08 +0000)]
Merge pull request #3545 from jet47:gpu-match-template-tests
Vladislav Vinogradov [Thu, 25 Dec 2014 14:43:13 +0000 (17:43 +0300)]
fix tests for gpu::matchTemplate:
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
Andrey Kamaev [Tue, 23 Dec 2014 08:08:07 +0000 (11:08 +0300)]
Fix Android build with the most resent android.toolchain.cmake
Andrey Kamaev [Sun, 21 Dec 2014 14:59:50 +0000 (17:59 +0300)]
Assorted fixes:
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
Roman Donchenko [Wed, 24 Dec 2014 09:01:40 +0000 (09:01 +0000)]
Merge pull request #3506 from doltac:typofix
Roman Donchenko [Wed, 24 Dec 2014 08:59:53 +0000 (08:59 +0000)]
Merge pull request #3497 from SpecLad:fs-open-fail-leak
Mat Moore [Tue, 23 Dec 2014 19:15:38 +0000 (19:15 +0000)]
Minor grammar improvements to documentation
Roman Donchenko [Mon, 22 Dec 2014 15:54:39 +0000 (18:54 +0300)]
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
... before any exceptions occur.
Vadim Pisarevsky [Mon, 22 Dec 2014 10:55:23 +0000 (10:55 +0000)]
Merge pull request #3471 from HelenWong:FixBug3714
Vadim Pisarevsky [Mon, 22 Dec 2014 10:54:57 +0000 (10:54 +0000)]
Merge pull request #3484 from euphrat:gmg_update_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:41:20 +0000 (10:41 +0000)]
Merge pull request #3511 from mattip:2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:38:55 +0000 (10:38 +0000)]
Merge pull request #3514 from mshabunin:compat-24
Vadim Pisarevsky [Mon, 22 Dec 2014 10:28:33 +0000 (10:28 +0000)]
Merge pull request #3500 from StevenPuttemans:fix_2432_2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:27:01 +0000 (10:27 +0000)]
Merge pull request #3515 from StevenPuttemans:fix_FeatureDetector_docs
Roman Donchenko [Tue, 9 Dec 2014 16:13:19 +0000 (19:13 +0300)]
Fix memory leaks appearing when cvOpenFileStorage throws
Vadim Pisarevsky [Thu, 18 Dec 2014 14:49:35 +0000 (14:49 +0000)]
Merge pull request #3522 from ilya-lavrenov:update_android_toolchain_cmake
Ilya Lavrenov [Wed, 17 Dec 2014 17:08:55 +0000 (20:08 +0300)]
update android.toolchain.cmake
Maksim Shabunin [Fri, 12 Dec 2014 07:44:10 +0000 (10:44 +0300)]
Some changes to make migration to 3.0 easier
Vadim Pisarevsky [Mon, 15 Dec 2014 18:08:30 +0000 (18:08 +0000)]
Merge pull request #3498 from ilya-lavrenov:omp
Vadim Pisarevsky [Mon, 15 Dec 2014 18:02:29 +0000 (18:02 +0000)]
Merge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements
StevenPuttemans [Wed, 10 Dec 2014 12:45:42 +0000 (13:45 +0100)]
fix bug 2432 for 2.4 branch
StevenPuttemans [Mon, 15 Dec 2014 10:31:18 +0000 (11:31 +0100)]
add extra to FeatureDetector docs
mattip [Sun, 14 Dec 2014 09:55:02 +0000 (11:55 +0200)]
export thread control to generated wrappers
doltac [Thu, 11 Dec 2014 10:22:40 +0000 (19:22 +0900)]
Fixed typos in latentSVM detector demo.
Ilya Lavrenov [Wed, 3 Dec 2014 11:59:51 +0000 (14:59 +0300)]
ability to enable OpenMP simultaneously with other parallel framework
Ashod Nakashian [Tue, 25 Nov 2014 22:20:54 +0000 (17:20 -0500)]
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
Vadim Pisarevsky [Sat, 6 Dec 2014 08:07:56 +0000 (08:07 +0000)]
Merge pull request #3480 from mshabunin:python-test-24
Vadim Pisarevsky [Sat, 6 Dec 2014 08:03:56 +0000 (08:03 +0000)]
Merge pull request #3488 from jeremyhu:PR-4048
Jeremy Huddleston Sequoia [Fri, 5 Dec 2014 18:22:11 +0000 (10:22 -0800)]
Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5
http://code.opencv.org/issues/4048
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Firat Kalaycilar [Thu, 4 Dec 2014 20:36:42 +0000 (22:36 +0200)]
minor fix to make "updateBackgroundModel=false" option meaningful.
Maksim Shabunin [Wed, 3 Dec 2014 14:57:35 +0000 (17:57 +0300)]
Python test: new options provide local test data paths
StevenPuttemans [Mon, 1 Dec 2014 10:47:30 +0000 (11:47 +0100)]
pulling most recent models
HelenWong [Mon, 1 Dec 2014 18:39:45 +0000 (10:39 -0800)]
Fix#3714:Improve Display Image Tutorial
For Bug #3714, user use the imshow() function without calling
namedWindow() properly, because user did not know the implicit rule for
imshow(). (i.e. without calling namedWindow implied calling namedWindow(
,CV__WINDOW_AUTOSIZE).
Improve the Display Image Tutorial to educate the user for such implied
rule.
Put a note on documentation for Bug#3714
Revise the documentation regarding to imshow() function to better
educate the user the implicit rule. (i.e. without creating the window
before the imshow() function is the same as creating AUTOSIZE window)
Vadim Pisarevsky [Mon, 1 Dec 2014 10:40:56 +0000 (10:40 +0000)]
Merge pull request #3445 from jet47:get-rid-of-cuda-h
Vadim Pisarevsky [Mon, 1 Dec 2014 10:40:12 +0000 (10:40 +0000)]
Merge pull request #3447 from a-wi:Fill_ellipse_arc
Artur Wieczorek [Tue, 25 Nov 2014 17:47:19 +0000 (18:47 +0100)]
Fix determining bounding box of the edge collection in FillEdgeCollection().
There is necessary to account also x-ccordinate of the end of the edge when determining bounding box of the edge collection.
Vladislav Vinogradov [Tue, 25 Nov 2014 15:29:56 +0000 (18:29 +0300)]
get rid of cuda.h usage
Vadim Pisarevsky [Mon, 24 Nov 2014 09:40:21 +0000 (09:40 +0000)]
Merge pull request #3433 from StevenPuttemans:fix_whitebalance_naming
StevenPuttemans [Wed, 19 Nov 2014 11:02:32 +0000 (12:02 +0100)]
fix wrong property name and corresponding documentation
Vadim Pisarevsky [Sun, 16 Nov 2014 18:17:53 +0000 (18:17 +0000)]
Merge pull request #3419 from samyak-268:2.4
Vadim Pisarevsky [Sun, 16 Nov 2014 18:06:20 +0000 (18:06 +0000)]
Merge pull request #3425 from StevenPuttemans:fix_firewire_buffersize
Vadim Pisarevsky [Sun, 16 Nov 2014 18:05:17 +0000 (18:05 +0000)]
Merge pull request #3427 from tstellarAMD:2.4-farneback-crash-fix
StevenPuttemans [Fri, 14 Nov 2014 13:09:43 +0000 (14:09 +0100)]
added extra BUFFERSIZE doc and getter
Tom Stellard [Thu, 13 Nov 2014 16:16:10 +0000 (11:16 -0500)]
ocl: Move static oclMat variables into FarnebackOpticalFlow class
Move some static functions into the FarnebackOpticalFlow class as well,
so they can access these new class variables.
oclMat objects cannot be declared statically, because their destructor
depends on the statically defined __module variable from cl_context.cpp.
Since statically defined variables in separate compilation units have
an undefined destruction order there is always the possibility the
__module will be destructed before an oclMat object, which results
in a segfault.
Vadim Pisarevsky [Thu, 13 Nov 2014 15:40:29 +0000 (15:40 +0000)]
Merge pull request #3421 from SpecLad:ncv-algorithm
Roman Donchenko [Thu, 13 Nov 2014 13:16:26 +0000 (16:16 +0300)]
NCV.cu: include <algorithm>
It's needed for std::max.
Vadim Pisarevsky [Thu, 13 Nov 2014 07:27:33 +0000 (07:27 +0000)]
Merge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params
Vadim Pisarevsky [Thu, 13 Nov 2014 07:20:30 +0000 (07:20 +0000)]
Merge pull request #3414 from SpecLad:vg-stereogc
Alexander Alekhin [Thu, 13 Nov 2014 01:49:06 +0000 (01:49 +0000)]
Merge pull request #3418 from tstellarAMD:2.4-hog-crash-fix
Samyak Datta [Wed, 12 Nov 2014 18:05:02 +0000 (23:35 +0530)]
C++ sample code to detect facial features
Maksim Shabunin [Wed, 12 Nov 2014 17:48:43 +0000 (17:48 +0000)]
Merge pull request #3417 from ilya-lavrenov:dox_warn
Ilya Lavrenov [Wed, 12 Nov 2014 16:18:45 +0000 (19:18 +0300)]
attemp to fix dox warning
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.
Roman Donchenko [Wed, 12 Nov 2014 14:00:08 +0000 (17:00 +0300)]
Fix uninitialized memory reads and memory leaks in StereoGC
StevenPuttemans [Wed, 12 Nov 2014 09:48:24 +0000 (10:48 +0100)]
adding extra buffer parameter
Vadim Pisarevsky [Tue, 11 Nov 2014 13:27:41 +0000 (13:27 +0000)]
Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds
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.
Vadim Pisarevsky [Mon, 10 Nov 2014 08:27:41 +0000 (08:27 +0000)]
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
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
Vadim Pisarevsky [Wed, 5 Nov 2014 11:35:19 +0000 (11:35 +0000)]
Merge pull request #3294 from mshabunin:fix-ios-warnings-24
Vadim Pisarevsky [Wed, 5 Nov 2014 11:13:03 +0000 (11:13 +0000)]
Merge pull request #3376 from vriera:2.4
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.