diff --git a/Logic/Common/itkJoinCopyFilter.cxx b/Logic/Common/itkJoinCopyFilter.cxx index 20b7daf2..cf817ba3 100644 --- a/Logic/Common/itkJoinCopyFilter.cxx +++ b/Logic/Common/itkJoinCopyFilter.cxx @@ -10,29 +10,29 @@ namespace itk{ - template - JoinCopyFilter + template + JoinCopyFilter ::JoinCopyFilter(){ m_SeedActive= false; m_SeedIndex.Fill(0); - m_SeedValue= NumericTraits::Zero; + m_SeedValue= NumericTraits::Zero; } - template - void JoinCopyFilter + template + void JoinCopyFilter ::SetJsrc(const TInputImage1 *image1){ this->SetNthInput( 0, const_cast< TInputImage1 * >( image1 ) ); } - template - void JoinCopyFilter + template + void JoinCopyFilter ::SetJdst(const TInputImage2 *image2){ this->SetNthInput( 1, const_cast< TInputImage2 * >( image2 ) ); } - template - void JoinCopyFilter + template + void JoinCopyFilter ::BeforeThreadedGenerateData(){ if(m_SeedActive){ @@ -43,16 +43,16 @@ namespace itk{ } - template - void JoinCopyFilter + template + void JoinCopyFilter ::ThreadedGenerateData(const typename Superclass::OutputImageRegionType& outputRegionForThread, ThreadIdType threadId){ if(m_SeedActive){ typename TInputImage1::ConstPointer input = dynamic_cast( ProcessObject::GetInput(0) ); - typename TOutputImage::Pointer output = this->GetOutput(); + typename TInputImage2::Pointer output = this->GetOutput(); itk::ImageRegionConstIterator iti(input, outputRegionForThread); - itk::ImageRegionIterator ito(output, outputRegionForThread); + itk::ImageRegionIterator ito(output, outputRegionForThread); // support progress methods/callbacks with 1000 updates ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels(), 1000); diff --git a/Logic/Common/itkJoinCopyFilter.h b/Logic/Common/itkJoinCopyFilter.h index 5b0a4150..982897c8 100644 --- a/Logic/Common/itkJoinCopyFilter.h +++ b/Logic/Common/itkJoinCopyFilter.h @@ -9,13 +9,13 @@ namespace itk{ * * \ingroup ImageFilters */ - template + template class JoinCopyFilter: - public InPlaceImageFilter{ + public InPlaceImageFilter{ public: /** Standard class typedefs. */ typedef JoinCopyFilter Self; - typedef InPlaceImageFilter Superclass; + typedef InPlaceImageFilter Superclass; typedef SmartPointer Pointer; typedef SmartPointer< const Self > ConstPointer; @@ -33,8 +33,8 @@ namespace itk{ itkGetConstMacro(SeedIndex, typename TInputImage1::IndexType); /** Set/Get DrawingColor value */ - itkSetMacro(DrawingColor, typename TOutputImage::ValueType); - itkGetConstMacro(DrawingColor, typename TOutputImage::ValueType); + itkSetMacro(DrawingColor, typename TInputImage2::ValueType); + itkGetConstMacro(DrawingColor, typename TInputImage2::ValueType); /** Get UpdateFlag value */ itkGetConstMacro(UpdateFlag, bool); @@ -50,7 +50,7 @@ namespace itk{ bool m_SeedActive; typename TInputImage1::IndexType m_SeedIndex; typename TInputImage1::ValueType m_SeedValue; - typename TOutputImage::ValueType m_DrawingColor; + typename TInputImage2::ValueType m_DrawingColor; bool m_UpdateFlag; diff --git a/Logic/Framework/JOINImageData.h b/Logic/Framework/JOINImageData.h index 5dfbac21..363863f7 100644 --- a/Logic/Framework/JOINImageData.h +++ b/Logic/Framework/JOINImageData.h @@ -58,7 +58,7 @@ class JOINImageData : public GenericImageData typedef JdstImageWrapper::ImageType JdstImageType; typedef WsrcImageWrapper::ImageType WsrcImageType; - typedef itk::JoinCopyFilter JoinCopyFilterType; + typedef itk::JoinCopyFilter JoinCopyFilterType; typedef JoinCopyFilterType::Pointer JoinCopyFilterPointer; /** Initialize to a ROI from another image data object */