Merge pull request #63 from thewtex/WrapVectorImage

Wrap vector image

Author: thewtex

appveyor.yml

@@ -7,7 +7,7 @@ version: "0.0.1.{build}"
 install:
 
   - curl -L https://rawgit.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
-  - ps: .\windows-download-cache-and-build-module-wheels.ps1 
+  - ps: .\windows-download-cache-and-build-module-wheels.ps1
 
 build: off
 

include/itkCoocurrenceTextureFeaturesImageFilter.hxx

@@ -110,7 +110,7 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>
     }
   filter->SetInput2(input);
   filter->SetFunctor(digitalizer);
-  filter->SetNumberOfThreads(this->GetNumberOfThreads());
+  filter->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
 
   filter->Update();
   m_DigitizedInputImage = filter->GetOutput();

include/itkRunLengthTextureFeaturesImageFilter.hxx

@@ -111,7 +111,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>
     }
   filter->SetInput2(input);
   filter->SetFunctor(digitalizer);
-  filter->SetNumberOfThreads(this->GetNumberOfThreads());
+  filter->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
 
   filter->Update();
   m_DigitizedInputImage = filter->GetOutput();

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name='itk-texturefeatures',
-    version='3.1.0',
+    version='3.2.0',
     author='Insight Software Consortium',
     author_email='[email protected]',
     packages=['itk'],
@@ -48,6 +48,6 @@
     keywords='ITK InsightToolkit glcm texture features image imaging',
     url=r'https://itk.org/',
     install_requires=[
-        r'itk'
+        r'itk>=5.0b01'
     ]
     )

wrapping/itkCoocurrenceTextureFeaturesImageFilter.wrap

@@ -51,10 +51,10 @@ itk_end_wrap_class()
 itk_wrap_class("itk::Statistics::CoocurrenceTextureFeaturesImageFilter" POINTER)
 foreach(d ${ITK_WRAP_IMAGE_DIMS})
   foreach(t ${WRAP_ITK_SCALAR})
-    itk_wrap_template("${ITKM_I${t}${d}}IV${ITKM_F}${OutputVectorDim}${d}"
-                      "${ITKT_I${t}${d}}, itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,${d}>")
     itk_wrap_template("${ITKM_I${t}${d}}${ITKM_VI${ITKM_F}${d}}"
                       "${ITKT_I${t}${d}}, ${ITKT_VI${ITKM_F}${d}}")
+    itk_wrap_template("${ITKM_I${t}${d}}IV${ITKM_F}${OutputVectorDim}${d}"
+                      "${ITKT_I${t}${d}}, itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,${d}>")
   endforeach()
 endforeach()
 itk_end_wrap_class()

wrapping/itkRunLengthTextureFeaturesImageFilter.wrap

@@ -51,10 +51,10 @@ itk_end_wrap_class()
 itk_wrap_class("itk::Statistics::RunLengthTextureFeaturesImageFilter" POINTER)
 foreach(d ${ITK_WRAP_IMAGE_DIMS})
   foreach(t ${WRAP_ITK_SCALAR})
-    itk_wrap_template("${ITKM_I${t}${d}}IV${ITKM_F}${OutputVectorDim}${d}"
-                      "${ITKT_I${t}${d}}, itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,${d}>")
     itk_wrap_template("${ITKM_I${t}${d}}${ITKM_VI${ITKM_F}${d}}"
                       "${ITKT_I${t}${d}}, ${ITKT_VI${ITKM_F}${d}}")
+    itk_wrap_template("${ITKM_I${t}${d}}IV${ITKM_F}${OutputVectorDim}${d}"
+                      "${ITKT_I${t}${d}}, itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,${d}>")
   endforeach()
 endforeach()
 itk_end_wrap_class()