3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +03:00
671a630f47
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 substitutions for these paths when the
aforementioned environment variables are set.
In such case, since the prefix is the target one, not the sysroot one,
these libraries' absolute 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
This patch is a port of [6] on the master branch.
[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
[6] https://github.com/Itseez/opencv/commit/eceada586bbf18fc267e437522ec4f1f23ddc656
Signed-off-by: Samuel Martin <s.martin49@gmail.com >
2015-05-22 16:09:05 +03:00
ef8182e12a
Merge pull request #4025 from vpisarev:features2d_fixes
2015-05-21 19:16:27 +00:00
af47b6551f
another attempt to make the MSER test pass. removed possible randomization in parameters from run to run
2015-05-21 17:10:35 +03:00
4c67ae1a0b
fixed failure in Features2d_MSER.cases
2015-05-21 16:27:34 +03:00
021473e93e
Merge pull request #4040 from dobrypd:libgphoto2-connection
2015-05-21 13:19:22 +00:00
6b04c2b904
Merge pull request #4027 from zenev:master
2015-05-21 12:35:17 +00:00
7061bf0000
Merge pull request #4031 from apavlenko:revert_4014
2015-05-21 12:31:48 +00:00
dab78c26b1
added reasonable test for MSER (including coverage for http://code.opencv.org/issues/4273 , http://code.opencv.org/issues/1723 and http://code.opencv.org/issues/756 ); also, added some "in-progress" info to the Features2d_Feature2d.no_crash test.
2015-05-21 15:03:17 +03:00
fede94e979
it's now true MSER algorithm that works well on binary images too
2015-05-21 05:44:14 +03:00
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
298c98ea32
Merge pull request #4026 from mshabunin:install-cvconfig
2015-05-20 09:58:48 +00:00
ab8afc3bcc
Revert of "Merge pull request #4006 from sgjava:opencv-steve" (reverted from commit 4743184078)
2015-05-19 18:55:57 +03:00
d67d32af48
Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)
2015-05-19 13:30:18 +03:00
6ac4a4ceb6
Merge branch 'master' of https://github.com/zenev/opencv
2015-05-18 13:29:54 -07:00
5cb70d34d7
fixed vector out of range exception in nextImg
2015-05-18 13:29:15 -07:00
b5a7122855
added test to do smoke testing of ORB, KAZE, AKAZE and BRISK on images of different size
2015-05-18 21:16:53 +03:00
e936670571
Install cvconfig.h file
2015-05-18 19:19:48 +03:00
fc06a2384b
added test for batch detection/descriptor extraction ( http://code.opencv.org/issues/3943 )
2015-05-18 19:01:00 +03:00
432cf1152a
added read/write functions for vector<DMatch> + the test ( http://code.opencv.org/issues/4308 )
2015-05-18 18:59:37 +03:00
3136010e1a
Merge pull request #4023 from Dikay900:cleanup_cascadedetect
2015-05-18 14:08:22 +00:00
2fc92448df
Merge pull request #4024 from jet47:cuda-minmaxloc-one-row-input
2015-05-18 14:06:37 +00:00
e22979f334
fix #4343 : cv::cuda::findMinMaxLoc incorrect output for single row matrix
2015-05-18 14:16:55 +03:00
a5242265d7
cleanup after last PR
2015-05-18 00:31:39 +02:00
8b791477df
Merge pull request #3971 from Dikay900:2_4_to_master_3
2015-05-17 00:28:30 +00:00
e0136e39f4
Merge pull request #4011 from cr333:parula
2015-05-16 19:11:32 +00:00
78e89ba3ff
Merge pull request #4001 from LaurentBerger:ExampleBLOB
2015-05-16 18:11:29 +00:00
eb41a574b7
Merge pull request #4005 from MSOpenTech:videoio-contrib
2015-05-16 18:08:28 +00:00
a85bb091c8
Merge pull request #4018 from vpisarev:imgproc_video_fixes
2015-05-15 16:15:01 +00:00
3d20157d4f
Added sample Windows Universal application (UAP) using videoio logic for video preview and processing.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com >
2015-05-15 18:03:06 +03:00
55f78f8a83
Added configuration changes enabling videoio WinRT support.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com >
2015-05-15 16:29:06 +03:00
d08cb6b357
Added WinRT support for videoio.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com >
2015-05-15 16:28:47 +03:00
d40eefd5a4
Moved old WinRT related wrappers from highgui to videoio fixing long broken logic.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com >
2015-05-15 16:28:25 +03:00
4a9b244577
hopefully, fixed crash in sparse mat test
2015-05-15 16:15:10 +03:00
cc086b9452
Merge pull request #3979 from ruslo:fix.cxx11
2015-05-15 12:32:46 +00:00
35884a7e3f
Merge pull request #3982 from patrikhuber:vs2015-support-master
2015-05-15 12:32:27 +00:00
3109c77013
Merge pull request #3983 from ruslo:unify.ios
2015-05-15 12:32:05 +00:00
a26ab3ab16
Merge pull request #3917 from yanlend:patch-1
2015-05-14 21:16:24 +00:00
66eb270cf7
significantly reduced sparse matrix footprint:
...
http://code.opencv.org/issues/2206 ,
http://code.opencv.org/issues/2924
2015-05-14 23:29:09 +03:00
354ed5c4d6
Merge pull request #4009 from mshabunin:fix-ann-moment
2015-05-14 18:25:16 +00:00
c52092e6f8
Merge pull request #3992 from nomarek:master
2015-05-14 18:24:09 +00:00
52fa55a770
Merge pull request #4014 from sgjava:opencv-sgjava
2015-05-14 18:23:28 +00:00
a87e1c2f90
Merge pull request #4012 from mshabunin:doc-fixes
2015-05-14 18:22:26 +00:00
cc92cd07e8
Merge pull request #4017 from headupinclouds:master
2015-05-14 18:16:23 +00:00
7dd67f4997
use _mm_sad_epu8 instead of _mm_movemask_epi8 in countNonZero. Therefore, we do not need any popcount table and this solves http://code.opencv.org/issues/4333
2015-05-14 20:33:53 +03:00
3c769edea0
added extra check in CalibrateDebevec to make sure the points are within the image:
...
http://code.opencv.org/issues/4124
2015-05-14 19:54:48 +03:00
3c7f7de477
avoid possible problems with zero values in tone mapping algorithms ( http://code.opencv.org/issues/4020 )
2015-05-14 19:32:25 +03:00
ffabbfa778
added test to prove that remap does not leak memory ( http://code.opencv.org/issues/2502 ). disabled the test for now to save execution time.
2015-05-14 18:21:26 +03:00
ca90667723
fixed compile warnings on Linux and Windows
2015-05-14 16:42:51 +03:00
05d888316a
added test for http://code.opencv.org/issues/2957
2015-05-14 16:25:18 +03:00
Maksim Shabunin
Samuel Martin
Vadim Pisarevsky
Piotr Dobrowolski
Andrey Pavlenko
zenev
Vladislav Vinogradov
Dikay900
Maxim Kostin