X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkImageCommon.cxx;h=83b9435854ef3f7bec71e764ccee787ba314e0f9;hb=c99295881254fc9245d4ee2a4cf940cf87ca2d7f;hp=4c66654cc11ad1e1e2ddd271c2910bc2a97ad004;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git diff --git a/common/clitkImageCommon.cxx b/common/clitkImageCommon.cxx index 4c66654..83b9435 100644 --- a/common/clitkImageCommon.cxx +++ b/common/clitkImageCommon.cxx @@ -58,30 +58,6 @@ void clitk::ReadImageDimensionAndPixelType(const std::string & filename, } //-------------------------------------------------------------------- -//-------------------------------------------------------------------- -// Read a dicom header -gdcm::File * clitk::readDicomHeader(const std::string & filename, - const bool verbose) -{ -#if GDCM_MAJOR_VERSION == 2 - gdcm::Reader hreader; - hreader.SetFileName(filename.c_str()); - hreader.Read(); - gdcm::SmartPointer p = hreader.GetFile(); - return p; -#else - if (verbose) { - std::cout << "Reading DICOM <" << filename << ">" << std::endl; - } - gdcm::File *header = new gdcm::File(); - header->SetFileName(filename); - header->SetMaxSizeLoadEntry(16384); // required ? - header->Load(); - return header; -#endif -} -///-------------------------------------------------------------------- - //-------------------------------------------------------------------- itk::ImageIOBase::Pointer clitk::readImageHeader(const std::string & filename, bool exit_on_error) { @@ -125,11 +101,11 @@ void clitk::printImageHeader(itk::ImageIOBase::Pointer header, std::ostream & os for(unsigned int i=0; i< dim-1; i++) os << inputSize[i] << "x"; os << inputSize[dim-1] - << " "; + << " "; for(unsigned int i=0; i< dim-1; i++) os << inputSpacing[i] << "x"; os << inputSpacing[dim-1] - << " "; + << " "; for(unsigned int i=0; i< dim-1; i++) os << inputOrigin[i] << "x"; os << inputOrigin[dim-1] << " ";