[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. f2d3c2b774d26391abb2ee10591e842569
Cross-platform DICOM implementation
Brought to you by:
malat
Menu
▾
▴
[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. f2d3c2b774d26391abb2ee10591e8425698ddc97
|
From: Mathieu M. <ma...@us...> - 2020-10-21 09:45:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, release has been updated
via f2d3c2b774d26391abb2ee10591e8425698ddc97 (commit)
via 9cbb44641d76ec1e46b71b2c93a2c5c3aeae8683 (commit)
via 4b36c0300e00941d0ff20d33c74d2526c1e1bf32 (commit)
via 7e780e3b00d42cfe3231048eef91b083f1d1df2d (commit)
via 7a3a90c1246bf97f40d143bdf661bd753fbf9353 (commit)
via 12bd562931f8f03ae44ab5d854099cbfe98e6a41 (commit)
via 1b024ebe1ea9712b1cf578f33530242e36b6880f (commit)
via a28fef07bc07285331377fe47591bf0fdf154a36 (commit)
via e2b6adc206c174b71e7767f89689251402ebef62 (commit)
via 4d0c8d1a932498219bb6f156636a43fb4c44a09a (commit)
via 116e34a925eff59e3753e09d0865447bb6064a8a (commit)
via 3118cbccdac1f202db207536c7f7afde1741f909 (commit)
via 6683093ee35c3472a67c57665a68900c7f2e1181 (commit)
via d27a1f9365b44129f5b269ca23d7effdd47df5b7 (commit)
from 8f521bc1519ba7a85cc0d11ad818d4d3f9bf1aff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/f2d3c2b774d26391abb2ee10591e8425698ddc97/
commit f2d3c2b774d26391abb2ee10591e8425698ddc97
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:41:53 2020 +0200
Fix gcc warnings
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmFileMetaInformation.h b/Source/DataStructureAndEncodingDefinition/gdcmFileMetaInformation.h
index 3ea40fe65..4209396a0 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmFileMetaInformation.h
+++ b/Source/DataStructureAndEncodingDefinition/gdcmFileMetaInformation.h
@@ -100,6 +100,13 @@ public:
MetaInformationTS = fmi.MetaInformationTS;
DataSetMS = fmi.DataSetMS;
}
+ FileMetaInformation& operator=(const FileMetaInformation& fmi)
+ {
+ DataSetTS = fmi.DataSetTS;
+ MetaInformationTS = fmi.MetaInformationTS;
+ DataSetMS = fmi.DataSetMS;
+ return *this;
+ }
VL GetFullLength() const {
return P.GetLength() + DataSet::GetLength<ExplicitDataElement>();
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmParseException.h b/Source/DataStructureAndEncodingDefinition/gdcmParseException.h
index a72dd2af9..a85cde108 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmParseException.h
+++ b/Source/DataStructureAndEncodingDefinition/gdcmParseException.h
@@ -36,8 +36,7 @@ namespace gdcm_ns
class ParseException : public Exception
{
public:
- ParseException()
- = default;
+ ParseException() = default;
~ParseException() throw() override {};
/** Assignment operator. */
@@ -47,6 +46,9 @@ public:
//TODO
return *this;
}
+ ParseException(const ParseException& orig):Exception(orig)
+ {
+ }
/** Equivalence operator. */
/* virtual bool operator==( const ParseException &orig )
https://sourceforge.net/p/gdcm/gdcm/ci/9cbb44641d76ec1e46b71b2c93a2c5c3aeae8683/
commit 9cbb44641d76ec1e46b71b2c93a2c5c3aeae8683
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:41:38 2020 +0200
Handle exception by reference
diff --git a/Utilities/socketxx/socket++/sockinet.cpp b/Utilities/socketxx/socket++/sockinet.cpp
index 11341172d..cd46cbde5 100644
--- a/Utilities/socketxx/socket++/sockinet.cpp
+++ b/Utilities/socketxx/socket++/sockinet.cpp
@@ -210,7 +210,7 @@ void sockinetbuf::bind_until_success (int portno)
try {
bind (portno++);
}
- catch (sockerr e) {
+ catch (sockerr &e) {
// if (e.errno () != EADDRINUSE) throw;
if (e.serrno () != EADDRINUSE) throw; // LN
continue;
https://sourceforge.net/p/gdcm/gdcm/ci/4b36c0300e00941d0ff20d33c74d2526c1e1bf32/
commit 4b36c0300e00941d0ff20d33c74d2526c1e1bf32
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:41:23 2020 +0200
simple fall through warning
diff --git a/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx b/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx
index 97009f127..09984bfc0 100644
--- a/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx
+++ b/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx
@@ -1175,10 +1175,9 @@ EStateID ULConnectionManager::RunEventLoop(ULEvent& currentEvent, ULConnection*
receivingData = true; //to continue the loop to process the release
break;
case eAABORTPDUReceivedOpen:
- {
raisedEvent = eEventDoesNotExist;
theState = eStaDoesNotExist;
- } // explicitly declare fall-through for some picky compiler
+ /* fall through */
case eAABORTRequest:
waitingForEvent = false;
inWhichConnection->StopProtocol();
https://sourceforge.net/p/gdcm/gdcm/ci/7e780e3b00d42cfe3231048eef91b083f1d1df2d/
commit 7e780e3b00d42cfe3231048eef91b083f1d1df2d
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:39:20 2020 +0200
Add missing break statements
detected using gcc/fall through warning
diff --git a/Source/MessageExchangeDefinition/gdcmAAssociateRJPDU.cxx b/Source/MessageExchangeDefinition/gdcmAAssociateRJPDU.cxx
index 508839bca..e9bf97cc7 100644
--- a/Source/MessageExchangeDefinition/gdcmAAssociateRJPDU.cxx
+++ b/Source/MessageExchangeDefinition/gdcmAAssociateRJPDU.cxx
@@ -116,6 +116,7 @@ static const char *PrintReasonAsString( uint8_t source, uint8_t reason )
case 0xa:
return "8-10 - reserved";
}
+ break;
case 0x2:
switch( reason )
{
@@ -124,6 +125,7 @@ static const char *PrintReasonAsString( uint8_t source, uint8_t reason )
case 0x2:
return "protocol-version-not-supported";
}
+ break;
case 0x3:
switch( reason )
{
diff --git a/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx b/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx
index 1cf2e36fb..d5a0e350b 100644
--- a/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx
+++ b/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx
@@ -154,6 +154,7 @@ namespace gdcm
{
gdcmWarningMacro( "Requested optional Attributes are not supported." );
}
+ break;
case 0xB305:
{
gdcmWarningMacro( "The UPS is already in the requested state of COMPLETED" );
@@ -269,6 +270,7 @@ namespace gdcm
{
gdcmWarningMacro( "Offending Element: The UPS is already in the requested state of CANCELED" );
}
+ break;
case 0xB306: // The UPS is already in the requested state of COMPLETED
{
gdcmWarningMacro( "The UPS is already in the requested state of COMPLETED" );
https://sourceforge.net/p/gdcm/gdcm/ci/7a3a90c1246bf97f40d143bdf661bd753fbf9353/
commit 7a3a90c1246bf97f40d143bdf661bd753fbf9353
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:38:48 2020 +0200
Handle exception as reference
diff --git a/Examples/Cxx/ReadMultiTimesException.cxx b/Examples/Cxx/ReadMultiTimesException.cxx
index 87fb0d7d2..866879a8e 100644
--- a/Examples/Cxx/ReadMultiTimesException.cxx
+++ b/Examples/Cxx/ReadMultiTimesException.cxx
@@ -43,8 +43,9 @@ int main(int argc, char* argv[])
char *buffer = new char[ len ];
img.GetBuffer( buffer ); // do NOT de-allocate buffer !
}
- catch (std::bad_alloc)
+ catch (std::bad_alloc &ba)
{
+ (void)ba;
std::cerr << "BAD ALLOC Exception caught!" << std::endl;
}
catch (...)
https://sourceforge.net/p/gdcm/gdcm/ci/12bd562931f8f03ae44ab5d854099cbfe98e6a41/
commit 12bd562931f8f03ae44ab5d854099cbfe98e6a41
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:38:35 2020 +0200
Fix simple fall through
diff --git a/Source/Common/gdcmSystem.cxx b/Source/Common/gdcmSystem.cxx
index dcdca7563..fd60ce569 100644
--- a/Source/Common/gdcmSystem.cxx
+++ b/Source/Common/gdcmSystem.cxx
@@ -766,11 +766,11 @@ bool System::ParseDateTime(time_t &timep, long &milliseconds, const char date[22
{
switch (n)
{
- case 1: mon = 1;
- case 2: day = 1;
- case 3: hour = 0;
- case 4: min = 0;
- case 5: sec = 0;
+ case 1: mon = 1; /* Falls through. */
+ case 2: day = 1; /* Falls through. */
+ case 3: hour = 0; /* Falls through. */
+ case 4: min = 0; /* Falls through. */
+ case 5: sec = 0; /* Falls through. */
break; // http://security.coverity.com/blog/2013/Sep/gimme-a-break.html
}
ptm.tm_year = year - 1900;
https://sourceforge.net/p/gdcm/gdcm/ci/1b024ebe1ea9712b1cf578f33530242e36b6880f/
commit 1b024ebe1ea9712b1cf578f33530242e36b6880f
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:38:17 2020 +0200
Do not return bool from main
diff --git a/Examples/Cxx/GetSubSequenceData.cxx b/Examples/Cxx/GetSubSequenceData.cxx
index c512817f7..2e424c8fc 100644
--- a/Examples/Cxx/GetSubSequenceData.cxx
+++ b/Examples/Cxx/GetSubSequenceData.cxx
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
DataSet &subds3 = item3.GetNestedDataSet();
const PrivateTag tseq6(0x7fe1,0x26,"GEMS_Ultrasound_MovieGroup_001");
- if( !subds3.FindDataElement( tseq6 ) ) return true;
+ if( !subds3.FindDataElement( tseq6 ) ) return 1;
const DataElement& seq6 = subds3.GetDataElement( tseq6 );
SmartPointer<SequenceOfItems> sqi6 = seq6.GetValueAsSQ();
size_t ni6= sqi6->GetNumberOfItems();
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
}
const PrivateTag tseq3(0x7fe1,0x36,"GEMS_Ultrasound_MovieGroup_001");
- if( !subds3.FindDataElement( tseq3 ) ) return true;
+ if( !subds3.FindDataElement( tseq3 ) ) return 1;
const DataElement& seq3 = subds3.GetDataElement( tseq3 );
// std::cout << seq3 << std::endl;
@@ -119,14 +119,14 @@ int main(int argc, char *argv[])
Item &item4 = sqi4->GetItem(i4);
DataSet &subds4 = item4.GetNestedDataSet();
- if( !subds4.FindDataElement( tseq8 ) ) return true;
+ if( !subds4.FindDataElement( tseq8 ) ) return 1;
const DataElement& de8 = subds4.GetDataElement( tseq8 );
Element<VR::UL,VM::VM1> ldimz;
ldimz.SetFromDataElement( de8 );
dimz += ldimz.GetValue();
- if( !subds4.FindDataElement( tseq4 ) ) return true;
+ if( !subds4.FindDataElement( tseq4 ) ) return 1;
const DataElement& seq4 = subds4.GetDataElement( tseq4 );
- if( !subds4.FindDataElement( tseq5 ) ) return true;
+ if( !subds4.FindDataElement( tseq5 ) ) return 1;
const DataElement& seq5 = subds4.GetDataElement( tseq5 );
// std::cout << seq4 << std::endl;
https://sourceforge.net/p/gdcm/gdcm/ci/a28fef07bc07285331377fe47591bf0fdf154a36/
commit a28fef07bc07285331377fe47591bf0fdf154a36
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:38:01 2020 +0200
Remove simple warning
diff --git a/Examples/Cxx/DumpExamCard.cxx b/Examples/Cxx/DumpExamCard.cxx
index 9e332510d..d6d8a5b3d 100644
--- a/Examples/Cxx/DumpExamCard.cxx
+++ b/Examples/Cxx/DumpExamCard.cxx
@@ -194,7 +194,7 @@ struct param
assert( bla < sizeof(name0) );
is.read( name0, bla);
size_t l = strlen(name0);
- assert( l == bla );
+ assert( l == bla ); (void)l;
char * ptr = strdup( name0 );
v4.ptr = ptr;
type = param_string;
@@ -209,7 +209,7 @@ struct param
assert( bla < sizeof(name0) );
is.read( name0, bla);
size_t l = strlen(name0);
- assert( l == bla );
+ assert( l == bla ); (void)l;
memcpy( this->name, name0, bla );
is.read( (char*)&bla, sizeof(bla) );
assert( bla == 0x1 );
https://sourceforge.net/p/gdcm/gdcm/ci/e2b6adc206c174b71e7767f89689251402ebef62/
commit e2b6adc206c174b71e7767f89689251402ebef62
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:37:38 2020 +0200
Fix simple fall through warnings
diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx
index c347de97b..7ed8c0bcd 100644
--- a/Applications/Cxx/gdcminfo.cxx
+++ b/Applications/Cxx/gdcminfo.cxx
@@ -216,11 +216,11 @@ static std::string getInfoDate(Dict *infoDict, const char *key)
{
switch (n)
{
- case 1: mon = 1;
- case 2: day = 1;
- case 3: hour = 0;
- case 4: min = 0;
- case 5: sec = 0;
+ case 1: mon = 1; /* fall through */
+ case 2: day = 1; /* fall through */
+ case 3: hour = 0; /* fall through */
+ case 4: min = 0; /* fall through */
+ case 5: sec = 0; /* fall through */
}
tmStruct.tm_year = year - 1900;
tmStruct.tm_mon = mon - 1;
diff --git a/Applications/Cxx/gdcmpdf.cxx b/Applications/Cxx/gdcmpdf.cxx
index 2c6e0d143..0f3977906 100644
--- a/Applications/Cxx/gdcmpdf.cxx
+++ b/Applications/Cxx/gdcmpdf.cxx
@@ -64,11 +64,11 @@ static std::string getInfoDate(Dict *infoDict, const char *key)
{
switch (n)
{
- case 1: mon = 1;
- case 2: day = 1;
- case 3: hour = 0;
- case 4: min = 0;
- case 5: sec = 0;
+ case 1: mon = 1; /* fall through */
+ case 2: day = 1; /* fall through */
+ case 3: hour = 0; /* fall through */
+ case 4: min = 0; /* fall through */
+ case 5: sec = 0; /* fall through */
}
tmStruct.tm_year = year - 1900;
tmStruct.tm_mon = mon - 1;
https://sourceforge.net/p/gdcm/gdcm/ci/4d0c8d1a932498219bb6f156636a43fb4c44a09a/
commit 4d0c8d1a932498219bb6f156636a43fb4c44a09a
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:37:24 2020 +0200
Fix return of bool from main
diff --git a/Applications/Cxx/gdcmpdf.cxx b/Applications/Cxx/gdcmpdf.cxx
index cdcd231d9..2c6e0d143 100644
--- a/Applications/Cxx/gdcmpdf.cxx
+++ b/Applications/Cxx/gdcmpdf.cxx
@@ -470,7 +470,7 @@ http://msdn.microsoft.com/en-us/library/078sfkak(VS.80).aspx
char date[22];
const size_t datelen = 8;
int res = gdcm::System::GetCurrentDateTime(date);
- if( !res ) return false;
+ if( !res ) return 1;
{
gdcm::DataElement de( gdcm::Tag(0x0008,0x0020) );
// Do not copy the whole cstring:
https://sourceforge.net/p/gdcm/gdcm/ci/116e34a925eff59e3753e09d0865447bb6064a8a/
commit 116e34a925eff59e3753e09d0865447bb6064a8a
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 11:36:55 2020 +0200
Fix simple warning
diff --git a/Applications/Cxx/gdcmxml.cxx b/Applications/Cxx/gdcmxml.cxx
index 3a9683196..15e125b56 100644
--- a/Applications/Cxx/gdcmxml.cxx
+++ b/Applications/Cxx/gdcmxml.cxx
@@ -355,7 +355,7 @@ static void PopulateDataSet(xmlTextReaderPtr reader,DataSet &DS, int depth, bool
READ_NEXT \
char *value_char = (char*)xmlTextReaderConstValue(reader); \
int nvalue = sscanf(value_char,"%d",&(values[count++])); \
- assert( nvalue == 1 ); \
+ assert( nvalue == 1 ); (void)nvalue; \
READ_NEXT /*Value ending tag*/ \
name = (const char*)xmlTextReaderConstName(reader); \
READ_NEXT \
https://sourceforge.net/p/gdcm/gdcm/ci/3118cbccdac1f202db207536c7f7afde1741f909/
commit 3118cbccdac1f202db207536c7f7afde1741f909
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 10:56:55 2020 +0200
Fix a bunch of const_cast pedantic warnings
diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx
index a134e9487..c347de97b 100644
--- a/Applications/Cxx/gdcminfo.cxx
+++ b/Applications/Cxx/gdcminfo.cxx
@@ -196,7 +196,7 @@ static std::string getInfoDate(Dict *infoDict, const char *key)
std::string out;
#ifdef LIBPOPPLER_NEW_OBJECT_API
- if ((obj = infoDict->lookup((char*)key)).isString())
+ if ((obj = infoDict->lookup(const_cast<char*>(key))).isString())
#else
if (infoDict->lookup((char*)key, &obj)->isString())
#endif
@@ -277,7 +277,7 @@ static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uM
std::string out;
#ifdef LIBPOPPLER_NEW_OBJECT_API
- if ((obj = infoDict->lookup((char*)key)).isString())
+ if ((obj = infoDict->lookup(const_cast<char*>(key))).isString())
#else
if (infoDict->lookup((char*)key, &obj)->isString())
#endif
@@ -491,7 +491,7 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs
MemStream *appearStream;
- appearStream = new MemStream((char*)bv->GetPointer(), 0,
+ appearStream = new MemStream(const_cast<char*>(bv->GetPointer()), 0,
#ifdef LIBPOPPLER_NEW_OBJECT_API
bv->GetLength(), std::move(appearDict));
#else
diff --git a/Applications/Cxx/gdcmpdf.cxx b/Applications/Cxx/gdcmpdf.cxx
index 59ca77a28..cdcd231d9 100644
--- a/Applications/Cxx/gdcmpdf.cxx
+++ b/Applications/Cxx/gdcmpdf.cxx
@@ -44,7 +44,7 @@ static std::string getInfoDate(Dict *infoDict, const char *key)
std::string out;
#ifdef LIBPOPPLER_NEW_OBJECT_API
- if ((obj = infoDict->lookup((char*)key)).isString())
+ if ((obj = infoDict->lookup(const_cast<char*>(key))).isString())
#else
if (infoDict->lookup((char*)key, &obj)->isString())
#endif
@@ -125,7 +125,7 @@ static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uM
std::string out;
#ifdef LIBPOPPLER_NEW_OBJECT_API
- if ((obj = infoDict->lookup((char*)key)).isString())
+ if ((obj = infoDict->lookup(const_cast<char*>(key))).isString())
#else
if (infoDict->lookup((char*)key, &obj)->isString())
#endif
diff --git a/Utilities/VTK/Examples/Cxx/gdcmrtionplan.cxx b/Utilities/VTK/Examples/Cxx/gdcmrtionplan.cxx
index 2cc6bdc55..fdc2726ab 100644
--- a/Utilities/VTK/Examples/Cxx/gdcmrtionplan.cxx
+++ b/Utilities/VTK/Examples/Cxx/gdcmrtionplan.cxx
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
std::cout << at4.GetValue(0) << std::endl;
vtkDoubleArray *d = vtkDoubleArray::New();
- d->SetArray( (double*)pts , at1.GetValue() * at2.GetValue() , 0 );
+ d->SetArray( const_cast<double*>(pts) , at1.GetValue() * at2.GetValue() , 0 );
vtkImageData *img = vtkImageData::New();
img->Initialize();
diff --git a/Utilities/VTK/Examples/Cxx/gdcmrtplan.cxx b/Utilities/VTK/Examples/Cxx/gdcmrtplan.cxx
index 15cfe079d..a9b6a7e7c 100644
--- a/Utilities/VTK/Examples/Cxx/gdcmrtplan.cxx
+++ b/Utilities/VTK/Examples/Cxx/gdcmrtplan.cxx
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
std::cout << at4.GetValue(0) << std::endl;
vtkDoubleArray *d = vtkDoubleArray::New();
- d->SetArray( (double*)pts , at1.GetValue() * at2.GetValue() , 0 );
+ d->SetArray( const_cast<double*>(pts) , at1.GetValue() * at2.GetValue() , 0 );
vtkImageData *img = vtkImageData::New();
img->Initialize();
https://sourceforge.net/p/gdcm/gdcm/ci/6683093ee35c3472a67c57665a68900c7f2e1181/
commit 6683093ee35c3472a67c57665a68900c7f2e1181
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 10:50:50 2020 +0200
Add missing override keyword were needed
diff --git a/Source/Common/gdcmEvent.h b/Source/Common/gdcmEvent.h
index 442ef87b0..9de245571 100644
--- a/Source/Common/gdcmEvent.h
+++ b/Source/Common/gdcmEvent.h
@@ -66,10 +66,10 @@ inline std::ostream& operator<<(std::ostream& os, Event &e)
typedef super Superclass; \
classname() {} \
virtual ~classname() override = default; \
- virtual const char * GetEventName() const { return #classname; } \
- virtual bool CheckEvent(const ::gdcm::Event* e) const \
+ virtual const char * GetEventName() const override { return #classname; } \
+ virtual bool CheckEvent(const ::gdcm::Event* e) const override \
{ return dynamic_cast<const Self*>(e) ? true : false; } \
- virtual ::gdcm::Event* MakeObject() const \
+ virtual ::gdcm::Event* MakeObject() const override \
{ return new Self; } \
classname(const Self&s) : super(s){}; \
private: \
https://sourceforge.net/p/gdcm/gdcm/ci/d27a1f9365b44129f5b269ca23d7effdd47df5b7/
commit d27a1f9365b44129f5b269ca23d7effdd47df5b7
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Oct 21 10:45:50 2020 +0200
destructors cannot throw in c++11
diff --git a/Utilities/socketxx/socket++/sockstream.cpp b/Utilities/socketxx/socket++/sockstream.cpp
index 2421d2d82..02d59ad1f 100644
--- a/Utilities/socketxx/socket++/sockstream.cpp
+++ b/Utilities/socketxx/socket++/sockstream.cpp
@@ -400,11 +400,15 @@ sockbuf::~sockbuf ()
int c = closesocket(rep->sock);
#endif
delete rep;
+#if 0
if (c == SOCKET_ERROR)
#if defined(__CYGWIN__) || !defined(WIN32)
throw sockerr (errno, "sockbuf::~sockbuf", sockname.text.c_str());
#else
throw sockerr(WSAGetLastError(), "sockbuf::~sockbuf", sockname.text.c_str());
+#endif
+#else
+ assert(c != SOCKET_ERROR); (void)c;
#endif
}
}
-----------------------------------------------------------------------
Summary of changes:
Applications/Cxx/gdcminfo.cxx | 16 ++++++++--------
Applications/Cxx/gdcmpdf.cxx | 16 ++++++++--------
Applications/Cxx/gdcmxml.cxx | 2 +-
Examples/Cxx/DumpExamCard.cxx | 4 ++--
Examples/Cxx/GetSubSequenceData.cxx | 10 +++++-----
Examples/Cxx/ReadMultiTimesException.cxx | 3 ++-
Source/Common/gdcmEvent.h | 6 +++---
Source/Common/gdcmSystem.cxx | 10 +++++-----
.../gdcmFileMetaInformation.h | 7 +++++++
.../gdcmParseException.h | 6 ++++--
Source/MessageExchangeDefinition/gdcmAAssociateRJPDU.cxx | 2 ++
.../gdcmNormalizedNetworkFunctions.cxx | 2 ++
.../gdcmULConnectionManager.cxx | 3 +--
Utilities/VTK/Examples/Cxx/gdcmrtionplan.cxx | 2 +-
Utilities/VTK/Examples/Cxx/gdcmrtplan.cxx | 2 +-
Utilities/socketxx/socket++/sockinet.cpp | 2 +-
Utilities/socketxx/socket++/sockstream.cpp | 4 ++++
17 files changed, 57 insertions(+), 40 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|
