X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetInfoGdcmReader.cxx;h=6940e13c6335f9459b27559d86f06ea45ed8f0b7;hb=5aadf601c2cac6a4b998840f66fef9ba26ae67cd;hp=2c50c94c051b97e501d8e1083aaa8d15340e54d2;hpb=a26b760bbfe886312cbe54bd83b7211f621edf80;p=bbtk.git diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx index 2c50c94..6940e13 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx @@ -9,6 +9,7 @@ #endif #if defined USE_GDCM2 #include +// #include "vtkImageData.h" #include #include #endif @@ -133,29 +134,43 @@ void GetInfoGdcmReader::Process() bbSetOutputOut( reader->GetOutput() ); } #endif + + void GetInfoGdcmReader::bbUserSetDefaultValues() { - reader=NULL; +#if defined USE_GDCM2 + read=NULL; +#endif #if defined USE_GDCM + reader=NULL; f=NULL; #endif bbSetInputIn(""); } + void GetInfoGdcmReader::bbUserInitializeProcessing() { } - - + void GetInfoGdcmReader::bbUserFinalizeProcessing() { +#if defined USE_GDCM2 if( reader ) { reader->Delete(); reader=NULL; } +#endif + #if defined USE_GDCM + if( reader ) + { + reader->Delete(); + reader=NULL; + } + if(f) { f->Delete();