Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2005/01/18 07:50:58 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2005/01/23 10:12:33 $
+ Version: $Revision: 1.56 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
DictSet::~DictSet()
{
- // Remove dictionnaries
+ // Remove dictionaries
for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag)
{
Dict *entryToDelete = tag->second;
* \brief Print, in an informal fashion, the list of all the dictionaries
* contained is this DictSet, along with their respective content.
* @param os Output stream used for printing.
+ * @param indent Indentation string to be prepended during printing
*/
void DictSet::Print(std::ostream &os, std::string const & )
{
/**
* \brief Obtain from the GDCM_DICT_PATH environnement variable the
- * path to directory containing the dictionnaries. When
+ * path to directory containing the dictionaries. When
* the environnement variable is absent the path is defaulted
* to "../Dicts/".
- * @return path to directory containing the dictionnaries
+ * @return path to directory containing the dictionaries
*/
std::string DictSet::BuildDictPath()
{
Dict *DictSet::GetFirstEntry()
{
ItDictHt = Dicts.begin();
- return ItDictHt->second;
+ if( ItDictHt != Dicts.end() )
+ return ItDictHt->second;
+ return NULL;
}
/**
*/
Dict *DictSet::GetNextEntry()
{
- if (ItDictHt != Dicts.end())
- {
- Dict *tmp = ItDictHt->second;
- ++ItDictHt;
-
- return tmp;
- }
- else
- {
- return NULL;
- }
+ gdcmAssertMacro (ItDictHt != Dicts.end());
+
+ ++ItDictHt;
+ if ( ItDictHt != Dicts.end() )
+ return ItDictHt->second;
+ return NULL;
}
//-----------------------------------------------------------------------------