was erroneously defined with a size of 15 instead of 16. [many thanks
to Jean Michel Rouet for pointing out this bug].
* FIX: src/* fix the doxygen warnings.
* src/gdcmVR.cxx: removed some redundant tests (e.g. LO)
* src/gdcmDocument.cxx : fix memory leaks. Fix possible bugs : use an object
after it have been deleted
* src/gdcmDocument.cxx : fix memory leaks. Fix possible bugs : use an object
after it have been deleted
-2004-11-09 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+2004-11-16 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
* FIX: src/* fix the doxygen warnings.
* FIX: src/* fix the doxygen warnings.
+ * src/gdcmVR.cxx: removed some redundant tests (e.g. LO)
+ * src/gdcmDocument.cxx: FIX ::ComputeRLEInfo() rleSegmentOffsetTable[]
+ was erroneously defined with a size of 15 instead of 16. [many thanks
+ to Jean Michel Rouet for pointing out this bug].
2004-11-15 Mathieu Malaterre <Mathieu.Malaterre@creatis.insa-lyon.fr>
1. Finish merging JMR patch for writting DICOM from scratch
2004-11-15 Mathieu Malaterre <Mathieu.Malaterre@creatis.insa-lyon.fr>
1. Finish merging JMR patch for writting DICOM from scratch
Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:28:20 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2004/11/16 14:48:19 $
+ Version: $Revision: 1.15 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
gdcm::File* reference = new gdcm::File( referenceFileName );
if( !reference->GetHeader()->IsReadable() )
{
gdcm::File* reference = new gdcm::File( referenceFileName );
if( !reference->GetHeader()->IsReadable() )
{
- std::cout << " Reference image " << std::endl
- << " " << referenceFileName <<std::endl
- << " is not gdcm compatible." << std::endl;
+ std::cout << " Failed: reference image " << std::endl
+ << " " << referenceFileName <<std::endl
+ << " is not gdcm compatible." << std::endl;
delete tested;
delete reference;
return 1;
delete tested;
delete reference;
return 1;
if (testedDataSize != referenceDataSize)
{
if (testedDataSize != referenceDataSize)
{
- std::cout << " Pixel areas lengths differ: "
+ std::cout << " Failed: pixel areas lengths differ: "
<< testedDataSize << " # " << referenceDataSize
<< std::endl;
delete tested;
<< testedDataSize << " # " << referenceDataSize
<< std::endl;
delete tested;
testedDataSize) != 0 )
{
(void)res;
testedDataSize) != 0 )
{
(void)res;
- std::cout << " Pixel differ (as expanded in memory)."
+ std::cout << " Failed: pixel differ (as expanded in memory)."
<< std::endl;
delete tested;
delete reference;
return 1;
}
<< std::endl;
delete tested;
delete reference;
return 1;
}
- std::cout << " Passed..." << std::endl;
//////////////// Clean up:
delete tested;
delete reference;
//////////////// Clean up:
delete tested;
delete reference;
- std::cout << " Passed clean up." << std::endl ;
+
+ std::cout << " Passed..." << std::endl;
Program: gdcm
Module: $RCSfile: gdcmDocEntry.h,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDocEntry.h,v $
Language: C++
- Date: $Date: 2004/10/25 04:08:20 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2004/11/16 14:48:19 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/// How many details are to be printed (value : 0,1,2)
int PrintLevel;
/// How many details are to be printed (value : 0,1,2)
int PrintLevel;
- /// \brief Generalized key (i.e. a BaseTagKey prepending a TagKey)
- /// of this DocEntry
+ /// \brief Generalized key of this DocEntry (for details on
+ /// the generalized key refer to \ref TagKey documentation).
TagKey Key;
};
} // end namespace gdcm
TagKey Key;
};
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 11:19:05 $
- Version: $Revision: 1.127 $
+ Date: $Date: 2004/11/16 14:48:19 $
+ Version: $Revision: 1.128 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments.");
}
dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments.");
}
- uint32_t rleSegmentOffsetTable[15];
+ uint32_t rleSegmentOffsetTable[16];
for( int k = 1; k <= 15; k++ )
{
rleSegmentOffsetTable[k] = ReadInt32();
for( int k = 1; k <= 15; k++ )
{
rleSegmentOffsetTable[k] = ReadInt32();
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2004/11/03 18:08:56 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2004/11/16 14:48:19 $
+ Version: $Revision: 1.23 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- if (tested == "AE" || tested == "AS" || tested == "DA" || tested == "PN" ||
- tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
- tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
- tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
- tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
+ if ( tested == "AE" ||
+ tested == "AS" ||
+ tested == "CS" ||
+ tested == "DA" ||
+ tested == "DS" ||
+ tested == "IS" ||
+ tested == "LO" ||
+ tested == "LT" ||
+ tested == "PN" ||
+ tested == "SH" ||
+ tested == "SL" ||
+ tested == "SS" ||
+ tested == "ST" ||
+ tested == "TM" ||
+ tested == "UI" ||
+ tested == "UL" ||
+ tested == "UN" ||
+ tested == "US" )