[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. 91c9a79feb8cfbfe3370a9748eb8989e229d462a

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, master has been updated
       via  91c9a79feb8cfbfe3370a9748eb8989e229d462a (commit)
      from  36dfb1040c6f1189e7dd42947e9ce9587d184a5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gdcm.git.sourceforge.net/git/gitweb.cgi?p=gdcm/gdcm;a=commit;h=91c9a79feb8cfbfe3370a9748eb8989e229d462a

commit 91c9a79feb8cfbfe3370a9748eb8989e229d462a
Author: Mathieu Malaterre <mat...@gm...>
Date:   Mon May 9 12:19:23 2011 +0200

    Add support for XML/VTI image data file

diff --git a/Utilities/VTK/Applications/gdcm2vtk.cxx b/Utilities/VTK/Applications/gdcm2vtk.cxx
index 8ff9c9e..b490010 100644
--- a/Utilities/VTK/Applications/gdcm2vtk.cxx
+++ b/Utilities/VTK/Applications/gdcm2vtk.cxx
@@ -27,6 +27,7 @@
 #include "vtkPNGWriter.h"
 #if VTK_MAJOR_VERSION >= 5 && VTK_MINOR_VERSION > 0
 #include "vtkMetaImageReader.h"
+#include "vtkXMLImageDataReader.h"
 #include "vtkMetaImageWriter.h"
 #include "vtkDICOMImageReader.h"
 #include "vtkMINCImageReader.h"
@@ -378,18 +379,21 @@ int main(int argc, char *argv[])
     imgfactory->RegisterReader( reader );
   vtkImageReader2* imgreader =
     imgfactory->CreateImageReader2(filename);
-  // Set lowerleft *after* CreateImageReader2
-  imgreader->SetFileLowerLeft( lowerleft );
   vtkStructuredPointsReader *datareader = vtkStructuredPointsReader::New();
   datareader->SetFileName( filename );
+  vtkXMLReader *xmlreader = vtkXMLImageDataReader::New();
   int res = 0;
   if( !imgreader )
     {
-    res = datareader->IsFileStructuredPoints();
-    if( !res )
+    int xmlres = xmlreader->CanReadFile( filename );
+    if( !xmlres )
       {
-      std::cerr << "could not find no reader to handle file: " << filename << std::endl;
-      return 1;
+      res = datareader->IsFileStructuredPoints();
+      if( !res )
+        {
+        std::cerr << "could not find no reader to handle file: " << filename << std::endl;
+        return 1;
+        }
       }
     }
   imgfactory->Delete();
@@ -397,6 +401,7 @@ int main(int argc, char *argv[])
   vtkImageData *imgdata;
   if( imgreader )
     {
+    imgreader->SetFileLowerLeft( lowerleft );
     imgreader->SetFileName(filename);
     imgreader->Update();
     if( imgreader->GetErrorCode() )
@@ -418,6 +423,12 @@ int main(int argc, char *argv[])
       }
     imgdata = datareader->GetOutput();
     }
+  else if( xmlreader->CanReadFile( filename ) )
+    {
+    xmlreader->SetFileName(filename);
+    xmlreader->Update();
+    imgdata = vtkXMLImageDataReader::SafeDownCast(xmlreader)->GetOutput();
+    }
 
   gdcm::Filename fn = outfilename;
   const char *outputextension = fn.GetExtension();

-----------------------------------------------------------------------

Summary of changes:
 Utilities/VTK/Applications/gdcm2vtk.cxx |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM