Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/07/02 18:09:36 $
- Version: $Revision: 1.246 $
+ Date: $Date: 2005/07/19 14:43:48 $
+ Version: $Revision: 1.250 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* @param filename name of the file whose header we want to analyze
*/
File::File( std::string const &filename )
- :Document(filename)
+ :Document( )
{
RLEInfo = new RLEFramesInfo;
JPEGInfo = new JPEGFragmentsInfo;
- Load( filename );
+ Load( filename ); // gdcm::Document is first Loaded, then the 'File part'
}
/**
//-----------------------------------------------------------------------------
// Public
-
/**
* \brief Loader
- * @param fileName file to be open for parsing
* @return false if file cannot be open or no swap info was found,
* or no tag was found.
*/
-bool File::Load( std::string const &fileName )
+bool File::Load( )
+{
+ if ( ! this->Document::Load( ) )
+ return false;
+
+ return DoTheLoadingJob( );
+}
+
+/**
+ * \brief Does the Loading Job (internal use only)
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ */
+bool File::DoTheLoadingJob( )
{
- this->Document::Load( fileName );
// for some ACR-NEMA images GrPixel, NumPixel is *not* 7fe0,0010
// We may encounter the 'RETired' (0x0028, 0x0200) tag
}
}
+// These are the deprecated method that one day should be removed (after the next release)
+#ifndef GDCM_LEGACY_REMOVE
+/**
+ * \brief Loader. (DEPRECATED : not to break the API)
+ * @param fileName file to be open for parsing
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ * @deprecated Use the Load() function instead
+ */
+bool File::Load( std::string const &fileName )
+{
+ GDCM_LEGACY_REPLACED_BODY(File::Load(std::string), "1.2",
+ File::Load());
+ SetFileName( fileName );
+ if ( ! this->Document::Load( ) )
+ return false;
+
+ return DoTheLoadingJob( );
+}
+#endif
+
//-----------------------------------------------------------------------------
// Print