COMP: Fix wrapping for FrequencyFunction

And derived classes. The TInput parameter is now itk::Vector instead of the default itk::Point. We need to wrap FunctionBase and SpatialFunction for itk::Vector. Fix because there is no automatic conversion anymore between derived classes of FixedArray (Vector to Point in this case). Another alternative fix, but I think it's worse is to change the type returning from GetFrequency in the itkFrequencyIterators from Vector to Point. But I think a Vector is more appropiate than a point for frequencies.
InsightSoftwareConsortium · Jun 14, 2022 · b63d8d5 · b63d8d5
1 parent f2eb399
commit b63d8d5
Show file tree

Hide file tree

Showing 21 changed files with 74 additions and 56 deletions.
diff --git a/include/itkFrequencyFunction.h b/include/itkFrequencyFunction.h
@@ -31,7 +31,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class FrequencyFunction : public SpatialFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkHeldIsotropicWavelet.h b/include/itkHeldIsotropicWavelet.h
@@ -41,7 +41,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class HeldIsotropicWavelet : public IsotropicWaveletFrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkIsotropicFrequencyFunction.h b/include/itkIsotropicFrequencyFunction.h
@@ -35,7 +35,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class IsotropicFrequencyFunction : public FrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkIsotropicWaveletFrequencyFunction.h b/include/itkIsotropicWaveletFrequencyFunction.h
@@ -53,7 +53,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class IsotropicWaveletFrequencyFunction : public IsotropicFrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkRieszFrequencyFunction.h b/include/itkRieszFrequencyFunction.h
@@ -35,7 +35,7 @@ namespace itk
  */
 template <typename TFunctionValue = std::complex<double>,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class RieszFrequencyFunction : public FrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkShannonIsotropicWavelet.h b/include/itkShannonIsotropicWavelet.h
@@ -43,7 +43,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class ShannonIsotropicWavelet : public IsotropicWaveletFrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkSimoncelliIsotropicWavelet.h b/include/itkSimoncelliIsotropicWavelet.h
@@ -48,7 +48,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class SimoncelliIsotropicWavelet : public IsotropicWaveletFrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/include/itkVowIsotropicWavelet.h b/include/itkVowIsotropicWavelet.h
@@ -45,7 +45,7 @@ namespace itk
  */
 template <typename TFunctionValue = double,
           unsigned int VImageDimension = 3,
-          typename TInput = Point<SpacePrecisionType, VImageDimension>>
+          typename TInput = Vector<SpacePrecisionType, VImageDimension>>
 class VowIsotropicWavelet : public IsotropicWaveletFrequencyFunction<TFunctionValue, VImageDimension, TInput>
 {
 public:

diff --git a/test/itkRieszFrequencyFunctionTest.cxx b/test/itkRieszFrequencyFunctionTest.cxx
@@ -46,7 +46,8 @@ runRieszFrequencyFunctionTest(unsigned int inputOrder)
   using RieszFrequencyFunctionType = itk::RieszFrequencyFunction<OutputType, Dimension, InputType>;
   auto rieszFunction = RieszFrequencyFunctionType::New();
 
-  InputType frequencyPoint;
+  using FrequencyArrayType = typename RieszFrequencyFunctionType::InputType;
+  FrequencyArrayType frequencyPoint;
   frequencyPoint.Fill(0.1);
   rieszFunction->SetOrder(1);
 

diff --git a/wrapping/itkFrequencyFunction.wrap b/wrapping/itkFrequencyFunction.wrap
@@ -1,7 +1,24 @@
+# Need to wrap itk::Vector because it's the type returning from frequency iterators.
+itk_wrap_class("itk::FunctionBase" POINTER)
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    foreach(t ${WRAP_ITK_REAL})
+      itk_wrap_template("${ITKM_VD${d}}${ITKM_${t}}"   "${ITKT_VD${d}}, ${ITKT_${t}}")
+    endforeach()
+  endforeach()
+itk_end_wrap_class()
+
+itk_wrap_class("itk::SpatialFunction" POINTER)
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    foreach(t ${WRAP_ITK_REAL})
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
+    endforeach()
+  endforeach()
+itk_end_wrap_class()
+
 itk_wrap_class("itk::FrequencyFunction" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()
diff --git a/wrapping/itkHeldIsotropicWavelet.wrap b/wrapping/itkHeldIsotropicWavelet.wrap
@@ -1,7 +1,7 @@
 itk_wrap_class("itk::HeldIsotropicWavelet" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()
diff --git a/wrapping/itkIsotropicFrequencyFunction.wrap b/wrapping/itkIsotropicFrequencyFunction.wrap
@@ -1,7 +1,7 @@
 itk_wrap_class("itk::IsotropicFrequencyFunction" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()
diff --git a/wrapping/itkIsotropicWaveletFrequencyFunction.wrap b/wrapping/itkIsotropicWaveletFrequencyFunction.wrap
@@ -1,7 +1,7 @@
 itk_wrap_class("itk::IsotropicWaveletFrequencyFunction" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()

diff --git a/wrapping/itkShannonIsotropicWavelet.wrap b/wrapping/itkShannonIsotropicWavelet.wrap
@@ -1,7 +1,7 @@
 itk_wrap_class("itk::ShannonIsotropicWavelet" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()

diff --git a/wrapping/itkSimoncelliIsotropicWavelet.wrap b/wrapping/itkSimoncelliIsotropicWavelet.wrap
@@ -1,7 +1,7 @@
 itk_wrap_class("itk::SimoncelliIsotropicWavelet" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()

diff --git a/wrapping/itkVowIsotropicWavelet.wrap b/wrapping/itkVowIsotropicWavelet.wrap
@@ -1,7 +1,7 @@
 itk_wrap_class("itk::VowIsotropicWavelet" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_REAL})
-      itk_wrap_template("${ITKM_${t}}${d}${ITKM_PD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_PD${d}}")
+      itk_wrap_template("${ITKM_${t}}${d}${ITKM_VD${d}}" "${ITKT_${t}}, ${d}, ${ITKT_VD${d}}")
     endforeach()
   endforeach()
 itk_end_wrap_class()

diff --git a/wrapping/itkWaveletFrequencyFilterBankGenerator.wrap b/wrapping/itkWaveletFrequencyFilterBankGenerator.wrap
@@ -6,14 +6,14 @@ itk_wrap_class("itk::WaveletFrequencyFilterBankGenerator" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(tc ${WRAP_ITK_COMPLEX_REAL})
       foreach(tr ${WRAP_ITK_REAL})
-        itk_wrap_template("${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} >")
-        itk_wrap_template("${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} >")
-        itk_wrap_template("${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} >")
-        itk_wrap_template("${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} >")
+        itk_wrap_template("${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} >")
+        itk_wrap_template("${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} >")
+        itk_wrap_template("${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} >")
+        itk_wrap_template("${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} >")
       endforeach()
     endforeach()
   endforeach()

diff --git a/wrapping/itkWaveletFrequencyForward.wrap b/wrapping/itkWaveletFrequencyForward.wrap
@@ -8,14 +8,14 @@ itk_wrap_class("itk::WaveletFrequencyForward" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(tc ${WRAP_ITK_COMPLEX_REAL})
       foreach(tr ${WRAP_ITK_REAL})
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
       endforeach()
     endforeach()
   endforeach()

diff --git a/wrapping/itkWaveletFrequencyForwardUndecimated.wrap b/wrapping/itkWaveletFrequencyForwardUndecimated.wrap
@@ -7,14 +7,14 @@ itk_wrap_class("itk::WaveletFrequencyForwardUndecimated" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(tc ${WRAP_ITK_COMPLEX_REAL})
       foreach(tr ${WRAP_ITK_REAL})
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
       endforeach()
     endforeach()
   endforeach()

diff --git a/wrapping/itkWaveletFrequencyInverse.wrap b/wrapping/itkWaveletFrequencyInverse.wrap
@@ -8,14 +8,14 @@ itk_wrap_class("itk::WaveletFrequencyInverse" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(tc ${WRAP_ITK_COMPLEX_REAL})
       foreach(tr ${WRAP_ITK_REAL})
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
       endforeach()
     endforeach()
   endforeach()

diff --git a/wrapping/itkWaveletFrequencyInverseUndecimated.wrap b/wrapping/itkWaveletFrequencyInverseUndecimated.wrap
@@ -7,14 +7,14 @@ itk_wrap_class("itk::WaveletFrequencyInverseUndecimated" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(tc ${WRAP_ITK_COMPLEX_REAL})
       foreach(tr ${WRAP_ITK_REAL})
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
-        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_PD${d}}"
-          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_PD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Vow${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::VowIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Held${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::HeldIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Simoncelli${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::SimoncelliIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
+        itk_wrap_template("${ITKM_I${tc}${d}}${ITKM_I${tc}${d}}Shannon${ITKM_${tr}}${d}${ITKM_VD${d}}"
+          "${ITKT_I${tc}${d}}, ${ITKT_I${tc}${d}}, itk::WaveletFrequencyFilterBankGenerator< ${ITKT_I${tc}${d}}, itk::ShannonIsotropicWavelet< ${ITKT_${tr}}, ${d}, ${ITKT_VD${d}} > >")
       endforeach()
     endforeach()
   endforeach()