[med-svn] r22738 - trunk/packages/insighttoolkit/trunk/debian/patches
Gert Wollny
gert-guest at moszumanska.debian.org
Thu Sep 1 14:59:51 UTC 2016
Author: gert-guest
Date: 2016-09-01 14:59:50 +0000 (Thu, 01 Sep 2016)
New Revision: 22738
Added:
trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch
trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0_itkTriangleHelper.h.patch
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/bug835761-default-contructor-missing.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Correct python bindings, Closes: #835761
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/bug835761-default-contructor-missing.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/bug835761-default-contructor-missing.patch 2016-09-01 13:02:37 UTC (rev 22737)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/bug835761-default-contructor-missing.patch 2016-09-01 14:59:50 UTC (rev 22738)
@@ -1,13 +0,0 @@
-Index: b/Modules/Core/Common/include/itkTriangleHelper.h
-===================================================================
---- a/Modules/Core/Common/include/itkTriangleHelper.h 2016-05-26 17:32:22.000000000 +0200
-+++ b/Modules/Core/Common/include/itkTriangleHelper.h 2016-08-30 16:00:52.414782888 +0200
-@@ -84,6 +84,8 @@
-
- static CoordRepType ComputeMixedArea( const PointType& iP1, const PointType& iP2, const PointType &iP3 );
-
-+ TriangleHelper() = default;
-+
- private:
- TriangleHelper(const Self &) ITK_DELETE_FUNCTION;
- void operator=(const Self &) ITK_DELETE_FUNCTION;
Added: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch 2016-09-01 14:59:50 UTC (rev 22738)
@@ -0,0 +1,89 @@
+From 1572643f96e151cf5dab25e89a45c5df7e6e1e97 Mon Sep 17 00:00:00 2001
+Author: Zach Williamson <zachary-williamson at uiowa.edu>
+Date: Tue, 2 Aug 2016 15:25:00 -0500
+Description: [PATCH 1/1] BUG: Fix Python Wrappings in C++11
+
+
+Change-Id: I7a8c3db02573d22e01564679cd6f285306321235
+---
+ Modules/Core/Common/include/itkIndex.h | 9 +++++++--
+ Modules/Core/Common/include/itkOffset.h | 9 +++++++--
+ Modules/Core/Common/include/itkSize.h | 9 +++++++--
+ .../Filtering/ImageGrid/wrapping/itkResampleImageFilter.wrap | 1 +
+ 4 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/Modules/Core/Common/include/itkIndex.h b/Modules/Core/Common/include/itkIndex.h
+index 9c968da..9b64565 100644
+--- a/Modules/Core/Common/include/itkIndex.h
++++ b/Modules/Core/Common/include/itkIndex.h
+@@ -327,8 +327,13 @@ public:
+ // force gccxml to find the constructors found before the internal upgrade to
+ // gcc 4.2
+ #if defined( ITK_WRAPPING_PARSER )
+- Index() ITK_DELETED_FUNCTION;
+- ITK_DISALLOW_COPY_AND_ASSIGN(Index);
++ // Do not use c++11 'delete' keyword here. This code block is here to
++ // explicitly provide the wrapping facilities with handles to the default and
++ // copy constructors, and the assignment operator that are otherwise declared
++ // implicitly.
++ Index();
++ Index(const Self&);
++ void operator=(const Self&);
+
+ #endif
+ };
+diff --git a/Modules/Core/Common/include/itkOffset.h b/Modules/Core/Common/include/itkOffset.h
+index 804f447..6e7d500 100644
+--- a/Modules/Core/Common/include/itkOffset.h
++++ b/Modules/Core/Common/include/itkOffset.h
+@@ -208,8 +208,13 @@ public:
+ // force gccxml to find the constructors found before the internal upgrade to
+ // gcc 4.2
+ #if defined( ITK_WRAPPING_PARSER )
+- Offset() ITK_DELETED_FUNCTION;
+- ITK_DISALLOW_COPY_AND_ASSIGN(Offset);
++ // Do not use c++11 'delete' keyword here. This code block is here to
++ // explicitly provide the wrapping facilities with handles to the default and
++ // copy constructors, and the assignment operator that are otherwise declared
++ // implicitly.
++ Offset();
++ Offset(const Self&);
++ void operator=(const Self&);
+
+ #endif
+ };
+diff --git a/Modules/Core/Common/include/itkSize.h b/Modules/Core/Common/include/itkSize.h
+index 14ba4f1..302af04 100644
+--- a/Modules/Core/Common/include/itkSize.h
++++ b/Modules/Core/Common/include/itkSize.h
+@@ -210,8 +210,13 @@ public:
+ // force gccxml to find the constructors found before the internal upgrade to
+ // gcc 4.2
+ #if defined( ITK_WRAPPING_PARSER )
+- Size() ITK_DELETED_FUNCTION;
+- ITK_DISALLOW_COPY_AND_ASSIGN(Size);
++ // Do not use c++11 'delete' keyword here. This code block is here to
++ // explicitly provide the wrapping facilities with handles to the default and
++ // copy constructors, and the assignment operator that are otherwise declared
++ // implicitly.
++ Size();
++ Size(const Self&);
++ void operator=(const Self&);
+
+ #endif
+ };
+diff --git a/Modules/Filtering/ImageGrid/wrapping/itkResampleImageFilter.wrap b/Modules/Filtering/ImageGrid/wrapping/itkResampleImageFilter.wrap
+index abb6a7f..9272323 100644
+--- a/Modules/Filtering/ImageGrid/wrapping/itkResampleImageFilter.wrap
++++ b/Modules/Filtering/ImageGrid/wrapping/itkResampleImageFilter.wrap
+@@ -8,6 +8,7 @@ itk_wrap_class("itk::ResampleImageFilter" POINTER)
+ foreach(d ${ITK_WRAP_IMAGE_DIMS})
+ foreach(t ${to_types})
+ itk_wrap_template("${ITKM_VI${t}${d}}${ITKM_VI${t}${d}}" "${ITKT_VI${t}${d}},${ITKT_VI${t}${d}}")
++ itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}" "${ITKT_I${t}${d}},${ITKT_I${t}${d}}")
+ endforeach()
+ endforeach()
+
+--
+1.7.10.4
+
Added: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0_itkTriangleHelper.h.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0_itkTriangleHelper.h.patch (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0_itkTriangleHelper.h.patch 2016-09-01 14:59:50 UTC (rev 22738)
@@ -0,0 +1,19 @@
+Origin: upstream
+Description: Fix python wrappings
+Debian-Bug: http://bugs.debian.org/835761
+
+diff --git a/Modules/Core/Common/include/itkTriangleHelper.h b/Modules/Core/Common/include/itkTriangleHelper.h
+index b6db671..be9262d 100644
+--- a/Modules/Core/Common/include/itkTriangleHelper.h
++++ b/Modules/Core/Common/include/itkTriangleHelper.h
+@@ -83,10 +83,6 @@ public:
+ static CoordRepType ComputeArea(const PointType & iP1, const PointType & iP2, const PointType & iP3);
+
+ static CoordRepType ComputeMixedArea( const PointType& iP1, const PointType& iP2, const PointType &iP3 );
+-
+-private:
+- TriangleHelper(const Self &) ITK_DELETE_FUNCTION;
+- void operator=(const Self &) ITK_DELETE_FUNCTION;
+ };
+ }
+
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2016-09-01 13:02:37 UTC (rev 22737)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2016-09-01 14:59:50 UTC (rev 22738)
@@ -6,4 +6,5 @@
itk4.10-correct_itkMathDetail_include-order.patch
itk4.10-enable-system-nifti.patch
vnl_complex_test_accuracy.patch
-bug835761-default-contructor-missing.patch
+itk4.10.0_itkTriangleHelper.h.patch
+itk4.10.0-python-wrapping.patch
More information about the debian-med-commit
mailing list