X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=a8c61272cae5bfee80e249794a850508cd0749a0;hb=0e88aff6bcac1c201b50acb285ba079f3a6b1a6c;hp=7e2530fc41a50ac9b09d3d6282f69d895224f488;hpb=a5aacc396d46724edd3836af98e87f54415398b0;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 7e2530fc..a8c61272 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2005/12/14 09:51:33 $ - Version: $Revision: 1.76 $ + Date: $Date: 2006/01/26 15:52:43 $ + Version: $Revision: 1.79 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -151,8 +151,8 @@ int main(int argc, char *argv[]) return 1; } - char *fileName = am->ArgMgrGetString("filein",(char *)0); - char *dirName = am->ArgMgrGetString("dirin",(char *)0); + const char *fileName = am->ArgMgrGetString("filein"); + const char *dirName = am->ArgMgrGetString("dirin"); if ( (fileName == 0 && dirName == 0) || (fileName != 0 && dirName != 0) ) @@ -191,11 +191,11 @@ int main(int argc, char *argv[]) bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") ); bool ddict = am->ArgMgrDefined("dict") ? true : false; - char *dict = 0; + const char *dict = 0; if (ddict) { - dict = am->ArgMgrGetString("dict",(char *)0); + dict = am->ArgMgrGetString("dict",0); } /* if unused Param we give up */ @@ -371,7 +371,7 @@ errno = 0; if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; - o->gdcm::Orientation::Delete(); + o->Delete(); //------------------------------ @@ -544,7 +544,7 @@ errno = 0; if ( strPatientOrientation != gdcm::GDCM_UNFOUND && strPatientOrientation != "") std::cout << "PatientOrientation (0x0020,0x0020)= [" - << strPatientOrientation << "]" << std::endl; + << strPatientOrientation << "]" << std::endl; std::string strImageOrientationPatient = f->GetEntryString(0x0020,0x0037); @@ -581,8 +581,7 @@ errno = 0; std::string ori = o->GetOrientation ( f ); if (ori != "\\" ) std::cout << "Orientation [" << ori << "]" << std::endl; - - o->gdcm::Orientation::Delete(); + o->Delete(); //-------------------------------