[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. a43df91217dc434a7a845847cf3c46ab8d5
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2014-03-26 15:50:25
|
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, master has been updated
via a43df91217dc434a7a845847cf3c46ab8d550da5 (commit)
via b3f9c137c7b86b3edb26c63ed8b9685fce1b4265 (commit)
via 4c604aeb054c42a72a99a4c92de7fbd56fff00c4 (commit)
via cf5aba8773703e49b5722beca0d6cf305bfb61e4 (commit)
via d1ea3af820c0d139d4cf5b9729f170bcf652b2cf (commit)
from 07ac05fe815094814d572dc8bc21ecfaab5b2e1e (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/a43df91217dc434a7a845847cf3c46ab8d550da5/
commit a43df91217dc434a7a845847cf3c46ab8d550da5
Author: Sean McBride <se...@ro...>
Date: Wed Mar 26 09:50:07 2014 -0400
Fixed compiler warning by replacing non-ASCII char with ASCII chars
diff --git a/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx b/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx
index e01e283..3df13e1 100644
--- a/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx
+++ b/Source/MessageExchangeDefinition/gdcmNormalizedNetworkFunctions.cxx
@@ -159,7 +159,7 @@ namespace gdcm
break;
case 0xC310:
{
- gdcmErrorMacro( "Refused: The UPS is not in the IN PROGRESS state " );
+ gdcmErrorMacro( "Refused: The UPS is not in the \"IN PROGRESS\" state " );
}
break;
case 0xC301:
@@ -303,7 +303,7 @@ namespace gdcm
break;
case 0xC310:
{
- gdcmErrorMacro( "Refused: The UPS is not yet in the IN PROGRESS state " );
+ gdcmErrorMacro( "Refused: The UPS is not yet in the \"IN PROGRESS\" state " );
}
break;
https://sourceforge.net/p/gdcm/gdcm/ci/b3f9c137c7b86b3edb26c63ed8b9685fce1b4265/
commit b3f9c137c7b86b3edb26c63ed8b9685fce1b4265
Author: Sean McBride <se...@ro...>
Date: Wed Mar 26 09:51:27 2014 -0400
Added missing newline at end of file, fixing warning
diff --git a/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx b/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx
index 8ebb1d5..5f89db4 100644
--- a/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmModalityPerformedProcedureStepSetQuery.cxx
@@ -64,4 +64,4 @@ namespace gdcm
return validDataSet ;
}
-}
\ No newline at end of file
+}
https://sourceforge.net/p/gdcm/gdcm/ci/4c604aeb054c42a72a99a4c92de7fbd56fff00c4/
commit 4c604aeb054c42a72a99a4c92de7fbd56fff00c4
Author: Sean McBride <se...@ro...>
Date: Wed Mar 26 09:50:39 2014 -0400
Fixed warning about unused vars by commenting out more already-commented code
diff --git a/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx b/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx
index 55f08a5..b8439c1 100644
--- a/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx
@@ -122,19 +122,19 @@ namespace gdcm
const std::ostream &BaseQuery::WriteHelpFile(std::ostream &os)
{
+ // TODO
//mash all the query types into a vector for ease-of-use
- std::vector<QueryBase*> theQueries;
- std::vector<QueryBase*>::const_iterator qtor;
+ //std::vector<QueryBase*> theQueries;
+ //std::vector<QueryBase*>::const_iterator qtor;
- std::vector<Tag> theTags;
- std::vector<Tag>::iterator ttor;
+ //std::vector<Tag> theTags;
+ //std::vector<Tag>::iterator ttor;
- static const Global &g = Global::GetInstance();
- static const Dicts &dicts = g.GetDicts();
- static const Dict &pubdict = dicts.GetPublicDict();
- // TODO
+ //static const Global &g = Global::GetInstance();
+ //static const Dicts &dicts = g.GetDicts();
+ //static const Dict &pubdict = dicts.GetPublicDict();
//os << "The following tags must be supported by a C-FIND/C-MOVE " << mHelpDescription << ": " << std::endl;
//for (qtor = theQueries.begin(); qtor < theQueries.end(); qtor++){
// os << "Level: " << (*qtor)->GetName() << std::endl;
https://sourceforge.net/p/gdcm/gdcm/ci/cf5aba8773703e49b5722beca0d6cf305bfb61e4/
commit cf5aba8773703e49b5722beca0d6cf305bfb61e4
Merge: 07ac05f d1ea3af
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Mar 26 16:48:32 2014 +0100
Merge branch 'release'
-----------------------------------------------------------------------
Summary of changes:
Examples/CMakeLists.txt | 5 -----
Source/MessageExchangeDefinition/gdcmBaseQuery.cxx | 16 ++++++++--------
.../gdcmModalityPerformedProcedureStepSetQuery.cxx | 2 +-
.../gdcmNormalizedNetworkFunctions.cxx | 4 ++--
Utilities/gdcmmd5/CMakeLists.txt | 3 ---
Utilities/gdcmopenjpeg-v1/CMakeLists.txt | 4 ----
Utilities/gdcmopenjpeg-v2/CMakeLists.txt | 4 ----
Utilities/wxWidgets/CMakeLists.txt | 5 -----
8 files changed, 11 insertions(+), 32 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|