Commit 2feedc5f authored by Bill Lorensen's avatar Bill Lorensen Committed by David Gobbi
Browse files

BUG: Restore ImageReader2Factory

ImageReader2Factory was commented out.
ImageReader2Factory needed IO/MINC, but introducing that dependency
caused circular dependencies. This patch removes MINC from
ImageReader2Factory. A MINC solution will appear in a subsequent
patch.

Change-Id: I42f56cd507495e3da899866f473a93bc518fd91d
parent 5f6ae052
...@@ -11,7 +11,7 @@ set(Module_SRCS ...@@ -11,7 +11,7 @@ set(Module_SRCS
vtkImageImportExecutive.cxx vtkImageImportExecutive.cxx
vtkImageReader2Collection.cxx vtkImageReader2Collection.cxx
vtkImageReader2.cxx vtkImageReader2.cxx
#vtkImageReader2Factory.cxx vtkImageReader2Factory.cxx
vtkImageReader.cxx vtkImageReader.cxx
vtkImageWriter.cxx vtkImageWriter.cxx
vtkJPEGReader.cxx vtkJPEGReader.cxx
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "vtkImageReader2.h" #include "vtkImageReader2.h"
#include "vtkImageReader2Collection.h" #include "vtkImageReader2Collection.h"
#include "vtkJPEGReader.h" #include "vtkJPEGReader.h"
#include "vtkMINCImageReader.h"
#include "vtkObjectFactory.h" #include "vtkObjectFactory.h"
#include "vtkObjectFactoryCollection.h" #include "vtkObjectFactoryCollection.h"
#include "vtkPNGReader.h" #include "vtkPNGReader.h"
...@@ -154,9 +153,6 @@ void vtkImageReader2Factory::InitializeReaders() ...@@ -154,9 +153,6 @@ void vtkImageReader2Factory::InitializeReaders()
vtkImageReader2Factory::AvailableReaders-> vtkImageReader2Factory::AvailableReaders->
AddItem((reader = vtkGESignaReader::New())); AddItem((reader = vtkGESignaReader::New()));
reader->Delete(); reader->Delete();
vtkImageReader2Factory::AvailableReaders->
AddItem((reader = vtkMINCImageReader::New()));
reader->Delete();
#ifdef VTK_USE_METAIO #ifdef VTK_USE_METAIO
vtkImageReader2Factory::AvailableReaders-> vtkImageReader2Factory::AvailableReaders->
AddItem((reader = vtkMetaImageReader::New())); AddItem((reader = vtkMetaImageReader::New()));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment