sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-31 18:36:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add fix from upstream for bug #1432 (Clang compilation fixes)

Browse source 
https://code.ros.org/trac/opencv/ticket/1432

Reported by:	Roman Divacky <rdivacky@FreeBSD.org>
Obtained from:	OpenCV (revision 6881)
This commit is contained in:
Martin Matuska 2011-12-17 11:42:05 +00:00
parent 0d427a39aa
commit eed66ea71a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=287539
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/opencv/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME?= opencv
PORTVERSION= 2.3.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
DISTNAME= OpenCV-${DISTVERSION}a
@ -223,6 +223,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|${PORTNAME}/samples|examples/${PORTNAME}|g' \
${WRKSRC}/samples/*/CMakeLists.txt \
${WRKSRC}/samples/*/*/CMakeLists.txt
@${FIND} ${WRKSRC} -name '*.orig' -exec rm {} \;
.if defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
@${REINPLACE_CMD} -e '/add_subdirectory(data)/ d' \

17
graphics/opencv/files/patch-modules-flann-include-opencv2-flann-any.h Normal file
View file

@ -0,0 +1,17 @@
Index: modules/flann/include/opencv2/flann/any.h
===================================================================
--- modules/flann/include/opencv2/flann/any.h (revision 6880)
+++ modules/flann/include/opencv2/flann/any.h (revision 6881)
@@ -30,6 +30,12 @@
{
};
+inline std::ostream& operator <<(std::ostream& out, const empty_any&)
+{
+ out << "[empty_any]";
+ return out;
+}
+
struct base_any_policy
{
virtual void static_delete(void** x) = 0;

13
graphics/opencv/files/patch-modules-flann-include-opencv2-flann-lsh_index.h Normal file
View file

@ -0,0 +1,13 @@
Index: modules/flann/include/opencv2/flann/lsh_index.h
===================================================================
--- modules/flann/include/opencv2/flann/lsh_index.h (revision 6880)
+++ modules/flann/include/opencv2/flann/lsh_index.h (revision 6881)
@@ -56,7 +56,7 @@
struct LshIndexParams : public IndexParams
{
- LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level)
+ LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
{
(* this)["algorithm"] = FLANN_INDEX_LSH;
// The number of hash tables to use