[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 617b57a9b31b3ac604c64e06c9a1f2b84f
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: malat <ma...@us...> - 2023-04-04 08:21:30
|
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 617b57a9b31b3ac604c64e06c9a1f2b84ff98125 (commit)
from e25e5ebcfc5072d8a16ed2be6b7adf2177cd8b65 (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/617b57a9b31b3ac604c64e06c9a1f2b84ff98125/
commit 617b57a9b31b3ac604c64e06c9a1f2b84ff98125
Author: Sean McBride <se...@ro...>
Date: Fri Mar 24 18:45:37 2023 -0400
Fixed all clang -Wzero-as-null-pointer-constant warnings
diff --git a/Applications/Cxx/gdcmclean.cxx b/Applications/Cxx/gdcmclean.cxx
index 2dc65c50a..a618fd99d 100644
--- a/Applications/Cxx/gdcmclean.cxx
+++ b/Applications/Cxx/gdcmclean.cxx
@@ -191,28 +191,28 @@ int main(int argc, char *argv[]) {
// int this_option_optind = optind ? optind : 1;
int option_index = 0;
static struct option long_options[] = {
- {"input", required_argument, NULL, 'i'}, // i
- {"output", required_argument, NULL, 'o'}, // o
- {"recursive", no_argument, NULL, 'r'},
+ {"input", required_argument, nullptr, 'i'}, // i
+ {"output", required_argument, nullptr, 'o'}, // o
+ {"recursive", no_argument, nullptr, 'r'},
{"empty", required_argument, &empty_tag, 1}, // 3
{"remove", required_argument, &remove_tag, 1}, // 4
{"scrub", required_argument, &scrub_tag, 1}, // 5
{"preserve", required_argument, &preserve_tag, 1}, // 5
- {"continue", no_argument, NULL, 'c'},
+ {"continue", no_argument, nullptr, 'c'},
{"skip-meta", 0, &skipmeta, 1}, // should I document this one ?
{"preserve-missing-private-creator", 0,
&preserveAllMissingPrivateCreator, 1}, //
{"preserve-group-length", 0, &preserveAllGroupLength, 1}, //
{"preserve-illegal", 0, &preserveAllIllegal, 1}, //
- {"verbose", no_argument, NULL, 'V'},
- {"warning", no_argument, NULL, 'W'},
- {"debug", no_argument, NULL, 'D'},
- {"error", no_argument, NULL, 'E'},
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'v'},
+ {"verbose", no_argument, nullptr, 'V'},
+ {"warning", no_argument, nullptr, 'W'},
+ {"debug", no_argument, nullptr, 'D'},
+ {"error", no_argument, nullptr, 'E'},
+ {"help", no_argument, nullptr, 'h'},
+ {"version", no_argument, nullptr, 'v'},
- {0, 0, 0, 0}};
+ {nullptr, 0, nullptr, 0}};
c = getopt_long(argc, argv, "i:o:rcVWDEhv", long_options, &option_index);
if (c == -1) {
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmPrivateTag.cxx b/Source/DataStructureAndEncodingDefinition/gdcmPrivateTag.cxx
index 449260a34..052b4f2cc 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmPrivateTag.cxx
+++ b/Source/DataStructureAndEncodingDefinition/gdcmPrivateTag.cxx
@@ -42,7 +42,7 @@ namespace gdcm_ns
SetElement( (uint8_t)element );
const char *owner = str + nchar;
SetOwner( owner );
- const bool hasBackslash = strchr(owner,'\\') != NULL;
+ const bool hasBackslash = strchr(owner,'\\') != nullptr;
const char * creator = GetOwner();
if( !*creator || hasBackslash )
{
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
index d122b45c0..46b8698ba 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
@@ -683,7 +683,7 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
break;
default:
gdcmErrorMacro( "Impossible happen" );
- return std::make_pair<char*,size_t>(0,0);
+ return std::make_pair<char*,size_t>(nullptr,0);
}
#if ((OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR >= 3) || (OPJ_VERSION_MAJOR > 2))
opj_codec_set_threads(dinfo, Internals->nNumberOfThreadsForDecompression);
@@ -714,7 +714,7 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
opj_destroy_codec(dinfo);
opj_stream_destroy(cio);
gdcmErrorMacro( "opj_setup_decoder failure" );
- return std::make_pair<char*,size_t>(0,0);
+ return std::make_pair<char*,size_t>(nullptr,0);
}
#if 0
OPJ_INT32 l_tile_x0,l_tile_y0;
@@ -729,7 +729,7 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
opj_destroy_codec(dinfo);
opj_stream_destroy(cio);
gdcmErrorMacro( "opj_setup_decoder failure" );
- return std::make_pair<char*,size_t>(0,0);
+ return std::make_pair<char*,size_t>(nullptr,0);
}
#if 0
/* Optional if you want decode the entire image */
@@ -743,7 +743,7 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
opj_destroy_codec(dinfo);
opj_stream_destroy(cio);
gdcmErrorMacro( "opj_decode failed" );
- return std::make_pair<char*,size_t>(0,0);
+ return std::make_pair<char*,size_t>(nullptr,0);
}
bResult = bResult && (image != nullptr);
bResult = bResult && opj_end_decompress(dinfo,cio);
@@ -752,7 +752,7 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
opj_destroy_codec(dinfo);
opj_stream_destroy(cio);
gdcmErrorMacro( "opj_decode failed" );
- return std::make_pair<char*,size_t>(0,0);
+ return std::make_pair<char*,size_t>(nullptr,0);
}
#if 0
diff --git a/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx b/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx
index 4393fb358..9ea5bc98e 100644
--- a/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx
+++ b/Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx
@@ -333,7 +333,7 @@ bool ULConnectionManager::EstablishConnectionMove(const std::string& inAETitle,
std::vector<BasePDU*>::iterator itor;
for (itor = thePDUs.begin(); itor != thePDUs.end(); itor++)
{
- if (*itor == NULL) continue; //can have a nulled pdu, apparently
+ if (*itor == nullptr) continue; //can have a nulled pdu, apparently
(*itor)->Print(Trace::GetStream());
}
}
diff --git a/Source/MessageExchangeDefinition/gdcmULEvent.h b/Source/MessageExchangeDefinition/gdcmULEvent.h
index df3846e0f..87c0fca42 100644
--- a/Source/MessageExchangeDefinition/gdcmULEvent.h
+++ b/Source/MessageExchangeDefinition/gdcmULEvent.h
@@ -42,9 +42,9 @@ class ULEvent {
void DeletePDUVector(){
std::vector<BasePDU*>::iterator baseItor;
for (baseItor = mBasePDU.begin(); baseItor < mBasePDU.end(); baseItor++){
- if (*baseItor != NULL){
+ if (*baseItor != nullptr){
delete *baseItor;
- *baseItor = NULL;
+ *baseItor = nullptr;
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Applications/Cxx/gdcmclean.cxx | 22 +++++++++++-----------
.../gdcmPrivateTag.cxx | 2 +-
.../gdcmJPEG2000Codec.cxx | 10 +++++-----
.../gdcmULConnectionManager.cxx | 2 +-
Source/MessageExchangeDefinition/gdcmULEvent.h | 4 ++--
5 files changed, 20 insertions(+), 20 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|