[med-svn] r5688 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2011-01-22 23:47:40 +0000 (Sat, 22 Jan 2011)
New Revision: 5688

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Applied patch 0003-Added-a-few-Registration-Optimizers-for-Wrapping.patch
from Paul Novotny, as emailed to debian-med 2011-01-22.

* Added a couple new registration optimizers, including LBFGSBOptimizer
  used for B-spline 3D registratoin.
* Also needed to add a few array types to use the optimizers correctly




Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2011-01-22 23:45:06 UTC (rev 5687)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2011-01-22 23:47:40 UTC (rev 5688)
@@ -8,8 +8,13 @@
     with numpy. ItkVtkGlue makes it easy to convert from and to VTK.
   
   * rules: Turn off wrapping 4D images, fix wrap setting misspellings.
+  
+  * patches/add-registration-optimizers.patch: New.  Add a couple new
+    registration optimizers, including LBFGSBOptimizer used for B-spline
+    3D registration.  Add a few array types to use the optimizers
+    correctly.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 22 Jan 2011 17:38:46 -0600
+ -- Steve M. Robbins <smr at debian.org>  Sat, 22 Jan 2011 17:46:45 -0600
 
 insighttoolkit (3.20.0-5) experimental; urgency=low
 

Added: trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/add-registration-optimizers.patch	2011-01-22 23:47:40 UTC (rev 5688)
@@ -0,0 +1,28 @@
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/WrapITKTypes.cmake
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/WrapITKTypes.cmake	2011-01-21 12:36:35.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/WrapITKTypes.cmake	2011-01-21 12:38:05.000000000 -0500
+@@ -80,6 +80,8 @@
+ WRAP_TYPE("itk::Array" "A")
+   WRAP_TEMPLATE("${ITKM_D}" "${ITKT_D}")
+   WRAP_TEMPLATE("${ITKM_F}" "${ITKT_F}")
++  WRAP_TEMPLATE("${ITKM_UL}" "${ITKT_UL}")
++  WRAP_TEMPLATE("${ITKM_SL}" "${ITKT_SL}")
+ END_WRAP_TYPE()
+ SET(itk_Wrap_Array ${WRAPPER_TEMPLATES})
+ 
+Index: insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/BaseNumerics/wrap_ITKOptimizers.cmake
+===================================================================
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/BaseNumerics/wrap_ITKOptimizers.cmake	2011-01-21 12:38:49.000000000 -0500
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/BaseNumerics/wrap_ITKOptimizers.cmake	2011-01-21 12:39:15.000000000 -0500
+@@ -14,3 +14,10 @@
+ WRAP_NON_TEMPLATE_CLASS("itk::RegularStepGradientDescentOptimizer" POINTER)
+ WRAP_NON_TEMPLATE_CLASS("itk::VersorTransformOptimizer" POINTER)
+ WRAP_NON_TEMPLATE_CLASS("itk::AmoebaOptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::CumulativeGaussianOptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::ExhaustiveOptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::FRPROptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::LBFGSBOptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::PowellOptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::SPSAOptimizer" POINTER)
++WRAP_NON_TEMPLATE_CLASS("itk::VersorRigid3DTransformOptimizer" POINTER)

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2011-01-22 23:45:06 UTC (rev 5687)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2011-01-22 23:47:40 UTC (rev 5688)
@@ -6,3 +6,4 @@
 remove-cmake-export-build-settings.patch
 wrapitk.patch
 wrapitk-externalprojects.patch
+add-registration-optimizers.patch