[med-svn] r22739 - trunk/packages/insighttoolkit/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2016-09-01 15:05:54 +0000 (Thu, 01 Sep 2016)
New Revision: 22739

Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch
Log:
backport upstream patch

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch	2016-09-01 14:59:50 UTC (rev 22738)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10.0-python-wrapping.patch	2016-09-01 15:05:54 UTC (rev 22739)
@@ -12,71 +12,54 @@
  .../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:
+@@ -327,9 +327,9 @@
  // 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() ITK_DELETE_FUNCTION;
+-  Index(const Self &) ITK_DELETE_FUNCTION;
+-  void operator=(const Self &) ITK_DELETE_FUNCTION;
 +  Index();
-+  Index(const Self&);
-+  void operator=(const Self&);
++  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:
+@@ -208,9 +208,9 @@
  // 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() ITK_DELETE_FUNCTION;
+-  Offset(const Self &) ITK_DELETE_FUNCTION;
+-  void operator=(const Self &) ITK_DELETE_FUNCTION;
 +  Offset();
-+  Offset(const Self&);
-+  void operator=(const Self&);
++  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:
+@@ -210,9 +210,9 @@
  // 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() ITK_DELETE_FUNCTION;
+-  Size(const Self &) ITK_DELETE_FUNCTION;
+-  void operator=(const Self &) ITK_DELETE_FUNCTION;
 +  Size();
-+  Size(const Self&);
-+  void operator=(const Self&);
++  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)
+@@ -8,6 +8,7 @@
    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}}")
@@ -84,6 +67,3 @@
      endforeach()
    endforeach()
  
--- 
-1.7.10.4
-