[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 084a86c1d5f333ffd9fad1fe94f499ee82
Cross-platform DICOM implementation
Brought to you by:
malat
Menu
▾
▴
[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 084a86c1d5f333ffd9fad1fe94f499ee82bcaf70
|
From: Mathieu M. <ma...@us...> - 2021-02-11 13:31:27
|
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 084a86c1d5f333ffd9fad1fe94f499ee82bcaf70 (commit)
via ec42b72814472716dc483d5163638475789da34c (commit)
via ba05b91692b68b7b3a7147700f6f2954fd9a6b67 (commit)
via cbad1dde3bd0f0b504e6cfd1cee2b41e53ef6d28 (commit)
via e2aad3af7ba12035b449a5d410324fb1351489b0 (commit)
via e8d6cf09c7733df59b9c3c456489dfc98ff7b26f (commit)
via fddff147376fcd529aab065a8c74778d1bb4c2ef (commit)
from ab5ceac4613d028ba98525b65f4690f67802535a (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/084a86c1d5f333ffd9fad1fe94f499ee82bcaf70/
commit 084a86c1d5f333ffd9fad1fe94f499ee82bcaf70
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:29:12 2021 +0100
minor warnings
diff --git a/Source/MessageExchangeDefinition/gdcmFindPatientRootQuery.cxx b/Source/MessageExchangeDefinition/gdcmFindPatientRootQuery.cxx
index 7bc68831f..31b69b1ab 100644
--- a/Source/MessageExchangeDefinition/gdcmFindPatientRootQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmFindPatientRootQuery.cxx
@@ -98,8 +98,9 @@ bool FindPatientRootQuery::ValidateQuery(bool inStrict) const
const DataSet &ds = GetQueryDataSet();
if (ds.Size() == 0)
{
- if (inStrict)
+ if (inStrict) {
gdcmWarningMacro( "Empty DataSet in ValidateQuery" );
+ }
return false;
}
diff --git a/Source/MessageExchangeDefinition/gdcmFindStudyRootQuery.cxx b/Source/MessageExchangeDefinition/gdcmFindStudyRootQuery.cxx
index 669e9946a..85cbeefff 100644
--- a/Source/MessageExchangeDefinition/gdcmFindStudyRootQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmFindStudyRootQuery.cxx
@@ -99,8 +99,9 @@ bool FindStudyRootQuery::ValidateQuery(bool inStrict) const
const DataSet & ds = GetQueryDataSet();
if (ds.Size() == 0)
{
- if (inStrict)
+ if (inStrict) {
gdcmWarningMacro( "Empty DataSet in ValidateQuery" );
+ }
return false;
}
diff --git a/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepCreateQuery.cxx b/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepCreateQuery.cxx
index 9bbd4c3aa..4dbb34404 100644
--- a/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepCreateQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepCreateQuery.cxx
@@ -30,8 +30,9 @@ namespace gdcm
const DataSet &ds = GetQueryDataSet();
if (ds.Size() == 0)
{
- if (inStrict)
+ if (inStrict) {
gdcmWarningMacro( "Empty DataSet in ValidateQuery" );
+ }
return false;
}
gdcm::DataSet requiredDataSet = GetRequiredDataSet();
diff --git a/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx b/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx
index 5f89db4e3..6050ab0bc 100644
--- a/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx
@@ -30,8 +30,9 @@ namespace gdcm
const DataSet &ds = GetQueryDataSet();
if (ds.Size() == 0)
{
- if (inStrict)
+ if (inStrict) {
gdcmWarningMacro( "Empty DataSet in ValidateQuery" );
+ }
return false;
}
gdcm::DataSet requiredDataSet = GetRequiredDataSet();
diff --git a/Source/MessageExchangeDefinition/gdcmMovePatientRootQuery.cxx b/Source/MessageExchangeDefinition/gdcmMovePatientRootQuery.cxx
index 1a0451447..b653b714d 100644
--- a/Source/MessageExchangeDefinition/gdcmMovePatientRootQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmMovePatientRootQuery.cxx
@@ -98,8 +98,9 @@ bool MovePatientRootQuery::ValidateQuery(bool inStrict) const
const DataSet &ds = GetQueryDataSet();
if (ds.Size() == 0)
{
- if (inStrict)
+ if (inStrict) {
gdcmWarningMacro( "Empty DataSet in ValidateQuery" );
+ }
return false;
}
diff --git a/Source/MessageExchangeDefinition/gdcmMoveStudyRootQuery.cxx b/Source/MessageExchangeDefinition/gdcmMoveStudyRootQuery.cxx
index c8b76df6f..8a8d059fb 100644
--- a/Source/MessageExchangeDefinition/gdcmMoveStudyRootQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmMoveStudyRootQuery.cxx
@@ -88,8 +88,9 @@ bool MoveStudyRootQuery::ValidateQuery(bool inStrict) const
const DataSet &ds = GetQueryDataSet();
if (ds.Size() == 0)
{
- if (inStrict)
+ if (inStrict) {
gdcmWarningMacro( "Empty DataSet in ValidateQuery" );
+ }
return false;
}
https://sourceforge.net/p/gdcm/gdcm/ci/ec42b72814472716dc483d5163638475789da34c/
commit ec42b72814472716dc483d5163638475789da34c
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:26:57 2021 +0100
minor warning
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
index 0bf9a0e61..1c0bc19e0 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
@@ -190,7 +190,7 @@ bool JPEGLSCodec::Decode(DataElement const &in, DataElement &out)
{
const SequenceOfFragments *sf = in.GetSequenceOfFragments();
if (!sf) return false;
- size_t totalLen = sf->ComputeByteLength();
+ unsigned long totalLen = sf->ComputeByteLength();
char *buffer = new char[totalLen];
sf->GetBuffer(buffer, totalLen);
https://sourceforge.net/p/gdcm/gdcm/ci/ba05b91692b68b7b3a7147700f6f2954fd9a6b67/
commit ba05b91692b68b7b3a7147700f6f2954fd9a6b67
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:24:43 2021 +0100
minor warnings
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
index 83d474aa5..c3df785de 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
@@ -787,16 +787,16 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
if( this->GetPhotometricInterpretation() == PhotometricInterpretation::RGB
|| this->GetPhotometricInterpretation() == PhotometricInterpretation::YBR_FULL )
{
- if( mct ) gdcmWarningMacro("Invalid PhotometricInterpretation, should be YBR_RCT");
+ if( mct ) { gdcmWarningMacro("Invalid PhotometricInterpretation, should be YBR_RCT"); }
}
else if( this->GetPhotometricInterpretation() == PhotometricInterpretation::YBR_RCT
|| this->GetPhotometricInterpretation() == PhotometricInterpretation::YBR_ICT )
{
- if( !mct ) gdcmWarningMacro("Invalid PhotometricInterpretation, should be RGB");
+ if( !mct ) { gdcmWarningMacro("Invalid PhotometricInterpretation, should be RGB"); }
}
else
{
- if( mct ) gdcmWarningMacro("MCT flag was set in SamplesPerPixel = 1 image. corrupt j2k ?");
+ if( mct ) { gdcmWarningMacro("MCT flag was set in SamplesPerPixel = 1 image. corrupt j2k ?"); }
}
/* close the byte stream */
https://sourceforge.net/p/gdcm/gdcm/ci/cbad1dde3bd0f0b504e6cfd1cee2b41e53ef6d28/
commit cbad1dde3bd0f0b504e6cfd1cee2b41e53ef6d28
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:23:55 2021 +0100
minor warning
diff --git a/Source/MediaStorageAndFileFormat/gdcmRLECodec.cxx b/Source/MediaStorageAndFileFormat/gdcmRLECodec.cxx
index 19d06a4c6..850f9e40c 100644
--- a/Source/MediaStorageAndFileFormat/gdcmRLECodec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmRLECodec.cxx
@@ -581,7 +581,7 @@ size_t RLECodec::DecodeFragment(Fragment const & frag, char *buffer, size_t llen
std::streamoff check = bv.GetLength() - p;
// check == 2 for gdcmDataExtra/gdcmSampleData/US_DataSet/GE_US/2929J686-breaker
//assert( check == 0 || check == 1 || check == 2 );
- if( check ) gdcmDebugMacro( "tiny offset detected in between RLE segments: " << check );
+ if( check ) { gdcmDebugMacro( "tiny offset detected in between RLE segments: " << check ); }
}
else
{
https://sourceforge.net/p/gdcm/gdcm/ci/e2aad3af7ba12035b449a5d410324fb1351489b0/
commit e2aad3af7ba12035b449a5d410324fb1351489b0
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:22:44 2021 +0100
remove simple warning
diff --git a/Source/MediaStorageAndFileFormat/gdcmIPPSorter.cxx b/Source/MediaStorageAndFileFormat/gdcmIPPSorter.cxx
index 275569d80..a61ebc3c7 100644
--- a/Source/MediaStorageAndFileFormat/gdcmIPPSorter.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmIPPSorter.cxx
@@ -206,8 +206,9 @@ bool IPPSorter::Sort(std::vector<std::string> const & filenames)
const char *value2 = scanner.GetValue(filename, tiop);
if( !dc2.SetFromString( value2 ) )
{
- if( value2 )
+ if( value2 ) {
gdcmWarningMacro( filename << " cant read IOP: " << value2 );
+ }
return false;
}
double cd = dc2.CrossDot( dc );
https://sourceforge.net/p/gdcm/gdcm/ci/e8d6cf09c7733df59b9c3c456489dfc98ff7b26f/
commit e8d6cf09c7733df59b9c3c456489dfc98ff7b26f
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:21:27 2021 +0100
cast to double should work since 32bits max
diff --git a/Source/MediaStorageAndFileFormat/gdcmRescaler.cxx b/Source/MediaStorageAndFileFormat/gdcmRescaler.cxx
index 855c3f0fe..643999b32 100644
--- a/Source/MediaStorageAndFileFormat/gdcmRescaler.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmRescaler.cxx
@@ -126,8 +126,8 @@ static inline PixelFormat::ScalarType ComputeBestFit(const PixelFormat &pf, doub
assert( slope == (int)slope && intercept == (int)intercept);
assert( pf.GetMin() <= pf.GetMax() );
- const double pfmin = slope >= 0 ? pf.GetMin() : pf.GetMax();
- const double pfmax = slope >= 0 ? pf.GetMax() : pf.GetMin();
+ const double pfmin = slope >= 0. ? (double)pf.GetMin() : (double)pf.GetMax();
+ const double pfmax = slope >= 0. ? (double)pf.GetMax() : (double)pf.GetMin();
const double min = slope * pfmin + intercept;
const double max = slope * pfmax + intercept;
assert( min <= max );
https://sourceforge.net/p/gdcm/gdcm/ci/fddff147376fcd529aab065a8c74778d1bb4c2ef/
commit fddff147376fcd529aab065a8c74778d1bb4c2ef
Author: Mathieu Malaterre <mat...@gm...>
Date: Thu Feb 11 14:18:34 2021 +0100
remove simple warning
diff --git a/Source/MediaStorageAndFileFormat/gdcmBitmap.cxx b/Source/MediaStorageAndFileFormat/gdcmBitmap.cxx
index 0918a8559..28a1398ab 100644
--- a/Source/MediaStorageAndFileFormat/gdcmBitmap.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmBitmap.cxx
@@ -291,7 +291,7 @@ unsigned long Bitmap::GetBufferLength() const
save *= Dimensions[2];
if(Dimensions[0] % 8 == 0 )
assert( save * 8 == mul );
- mul = save;
+ mul = (unsigned int)save;
}
else if( PF.GetBitsAllocated() % 8 != 0 )
{
-----------------------------------------------------------------------
Summary of changes:
Source/MediaStorageAndFileFormat/gdcmBitmap.cxx | 2 +-
Source/MediaStorageAndFileFormat/gdcmIPPSorter.cxx | 3 ++-
Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx | 6 +++---
Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx | 2 +-
Source/MediaStorageAndFileFormat/gdcmRLECodec.cxx | 2 +-
Source/MediaStorageAndFileFormat/gdcmRescaler.cxx | 4 ++--
Source/MessageExchangeDefinition/gdcmFindPatientRootQuery.cxx | 3 ++-
Source/MessageExchangeDefinition/gdcmFindStudyRootQuery.cxx | 3 ++-
.../gdcmModalityPerformedProcedureStepCreateQuery.cxx | 3 ++-
.../gdcmModalityPerformedProcedureStepSetQuery.cxx | 3 ++-
Source/MessageExchangeDefinition/gdcmMovePatientRootQuery.cxx | 3 ++-
Source/MessageExchangeDefinition/gdcmMoveStudyRootQuery.cxx | 3 ++-
12 files changed, 22 insertions(+), 15 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|
