From: malaterre Date: Fri, 7 Jan 2005 22:19:48 +0000 (+0000) Subject: ENH: Third pass for assert. Now uses the gdcmAssertMacro X-Git-Tag: Version1.0.bp~426 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3869544e5153cebbd44ad8778cbaf35883bfb993;p=gdcm.git ENH: Third pass for assert. Now uses the gdcmAssertMacro --- diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index c1317163..b1c276d2 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2005/01/07 16:45:51 $ - Version: $Revision: 1.39 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.40 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,7 @@ #include "gdcmVR.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include // for std::ios::left, ... #include @@ -175,7 +176,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) else { binary_write(*fp, vr); - assert( vr.size() == 2 ); + gdcmAssertMacro( vr.size() == 2 ); if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") ) { diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index dd7e4bd0..a6c6c262 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2005/01/07 22:03:30 $ - Version: $Revision: 1.37 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.38 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,8 +27,6 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" -#include - namespace gdcm { @@ -66,7 +64,7 @@ ValEntry *DocEntrySet::NewValEntryByNumber(uint16_t group,uint16_t elem, TagName const & vr) { DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); - assert(dictEntry); + gdcmAssertMacro(dictEntry); ValEntry *newEntry = new ValEntry(dictEntry); if (!newEntry) @@ -90,7 +88,7 @@ BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, TagName const & vr) { DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr); - assert(dictEntry); + gdcmAssertMacro(dictEntry); BinEntry *newEntry = new BinEntry(dictEntry); if (!newEntry) @@ -111,7 +109,7 @@ BinEntry *DocEntrySet::NewBinEntryByNumber(uint16_t group,uint16_t elem, SeqEntry* DocEntrySet::NewSeqEntryByNumber(uint16_t group,uint16_t elem) { DictEntry *dictEntry = GetDictEntryByNumber(group, elem, "SQ"); - assert(dictEntry); + gdcmAssertMacro(dictEntry); SeqEntry *newEntry = new SeqEntry( dictEntry ); if (!newEntry) diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 3d58185c..8773fdd5 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/07 22:03:30 $ - Version: $Revision: 1.225 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.226 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -358,7 +358,7 @@ float Header::GetXSpacing() gdcmVerboseMacro("gdcmData/CT-MONO2-8-abdo.dcm problem"); // seems to be a bug in the header ... nbValues = sscanf( strSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing); - assert( nbValues == 2 ); + gdcmAssertMacro( nbValues == 2 ); } return xspacing; diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 2dc0ab07..febf2d12 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/01/07 22:06:47 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.19 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -452,7 +452,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp ) { return false; } - //assert( IsJPEGLossless ); + //gdcmAssertMacro( IsJPEGLossless ); } else { diff --git a/src/gdcmPixelWriteConvert.cxx b/src/gdcmPixelWriteConvert.cxx index 8e74c339..5f97e055 100644 --- a/src/gdcmPixelWriteConvert.cxx +++ b/src/gdcmPixelWriteConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelWriteConvert.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 20:03:28 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,7 +24,6 @@ #include "gdcmDebug.h" #include "gdcmPixelWriteConvert.h" -#include namespace gdcm { diff --git a/src/gdcmSerieHeader.cxx b/src/gdcmSerieHeader.cxx index 51198d24..d4f65013 100644 --- a/src/gdcmSerieHeader.cxx +++ b/src/gdcmSerieHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 20:03:28 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -213,7 +213,7 @@ bool SerieHeader::ImagePositionPatientOrdering() GdcmHeaderVector CoherentGdcmFileVector(n); // CoherentGdcmFileVector.reserve( n ); CoherentGdcmFileVector.resize( n ); - // assert( CoherentGdcmFileVector.capacity() >= n ); + // gdcmAssertMacro( CoherentGdcmFileVector.capacity() >= n ); float step = (max - min)/(n - 1); int pos; diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index bf583caf..d35eee56 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 20:03:28 $ - Version: $Revision: 1.77 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.78 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,6 +18,7 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" +#include // For GetCurrentDate, GetCurrentTime #include @@ -243,7 +244,7 @@ std::string Util::GetCurrentTime() std::string Util::DicomString(const char *s, size_t l) { std::string r(s, s+l); - assert( !(r.size() % 2) ); // == basically 'l' is even + gdcmAssertMacro( !(r.size() % 2) ); // == basically 'l' is even return r; } @@ -267,7 +268,7 @@ std::string Util::DicomString(const char *s) l++; } std::string r(s, s+l); - assert( !(r.size() % 2) ); + gdcmAssertMacro( !(r.size() % 2) ); return r; } @@ -316,7 +317,6 @@ bool Util::IsCurrentProcessorBigEndian() #ifdef _WIN32 #include #include -#include typedef BOOL(WINAPI * pSnmpExtensionInit) ( IN DWORD dwTimeZeroReference, OUT HANDLE * hPollForTrapEvent, diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index ada7ecf6..7b2543a7 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.cxx,v $ Language: C++ - Date: $Date: 2005/01/07 16:45:52 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/01/07 22:19:48 $ + Version: $Revision: 1.44 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,7 @@ #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include @@ -199,7 +200,7 @@ void ValEntry::SetValue(std::string const &val) else { std::string finalVal = Util::DicomString( val.c_str() ); - assert( !(finalVal.size() % 2) ); + gdcmAssertMacro( !(finalVal.size() % 2) ); l = finalVal.length(); SetValueOnly(finalVal); @@ -208,7 +209,7 @@ void ValEntry::SetValue(std::string const &val) else { std::string finalVal = Util::DicomString( val.c_str() ); - assert( !(finalVal.size() % 2) ); + gdcmAssertMacro( !(finalVal.size() % 2) ); l = finalVal.length(); SetValueOnly(finalVal); @@ -266,7 +267,7 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype) return; } - assert( lgr == GetValue().length() ); + gdcmAssertMacro( lgr == GetValue().length() ); binary_write(*fp, GetValue()); }