[med-svn] [aeskulap] 01/05: d/p: Add patch to handle newDicomElement in DcmItem
Gert Wollny
gert-guest at moszumanska.debian.org
Fri Jun 23 09:59:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository aeskulap.
commit 6ffe68c7da6b146838c57cefdc6e2923338ba0c3
Author: Gert Wollny <gewo at debian.org>
Date: Fri Jun 23 08:35:32 2017 +0000
d/p: Add patch to handle newDicomElement in DcmItem
---
debian/patches/newDicomElement.patch | 269 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 270 insertions(+)
diff --git a/debian/patches/newDicomElement.patch b/debian/patches/newDicomElement.patch
new file mode 100644
index 0000000..3fe6d79
--- /dev/null
+++ b/debian/patches/newDicomElement.patch
@@ -0,0 +1,269 @@
+Author: Gert Wollny <gewo at debian.org>
+Description: correct code for newDicomElement now being a member of DcmItem
+Bug: https://bugs.debian.org/865591
+
+--- a/imagepool/netloader.cpp
++++ b/imagepool/netloader.cpp
+@@ -101,29 +101,29 @@
+ DcmDataset query;
+ DcmElement* e = NULL;
+
+- e = newDicomElement(DCM_QueryRetrieveLevel);
++ e = DcmItem::newDicomElement(DCM_QueryRetrieveLevel);
+ e->putString("STUDY");
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientName);
++ e = DcmItem::newDicomElement(DCM_PatientName);
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientID);
++ e = DcmItem::newDicomElement(DCM_PatientID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyDate);
++ e = DcmItem::newDicomElement(DCM_StudyDate);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyTime);
++ e = DcmItem::newDicomElement(DCM_StudyTime);
+ query.insert(e);
+
+- e = newDicomElement(DCM_AccessionNumber);
++ e = DcmItem::newDicomElement(DCM_AccessionNumber);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyID);
++ e = DcmItem::newDicomElement(DCM_StudyID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyInstanceUID);
++ e = DcmItem::newDicomElement(DCM_StudyInstanceUID);
+ e->putString(studyinstanceuid.c_str());
+ query.insert(e);
+
+@@ -149,22 +149,22 @@
+ DcmDataset query;
+ DcmElement* e = NULL;
+
+- e = newDicomElement(DCM_QueryRetrieveLevel);
++ e = DcmItem::newDicomElement(DCM_QueryRetrieveLevel);
+ e->putString("SERIES");
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyInstanceUID);
++ e = DcmItem::newDicomElement(DCM_StudyInstanceUID);
+ e->putString(studyinstanceuid.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesInstanceUID);
++ e = DcmItem::newDicomElement(DCM_SeriesInstanceUID);
+ e->putString(i->c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_Modality);
++ e = DcmItem::newDicomElement(DCM_Modality);
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesNumber);
++ e = DcmItem::newDicomElement(DCM_SeriesNumber);
+ query.insert(e);
+
+ std::cout << "C-Move request:" << std::endl;
+--- a/imagepool/netquery.cpp
++++ b/imagepool/netquery.cpp
+@@ -195,64 +195,64 @@
+ DcmDataset query;
+ DcmElement* e = NULL;
+
+- e = newDicomElement(DCM_QueryRetrieveLevel);
++ e = DcmItem::newDicomElement(DCM_QueryRetrieveLevel);
+ e->putString("STUDY");
+ query.insert(e);
+
+- e = newDicomElement(DCM_SpecificCharacterSet);
++ e = DcmItem::newDicomElement(DCM_SpecificCharacterSet);
+ e->putString(dicom_enc.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientName);
++ e = DcmItem::newDicomElement(DCM_PatientName);
+ e->putString(patientsname.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientID);
++ e = DcmItem::newDicomElement(DCM_PatientID);
+ e->putString(convert_string_to(patientid.c_str(), system_enc).c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_SOPClassesInStudy);
++ e = DcmItem::newDicomElement(DCM_SOPClassesInStudy);
+ query.insert(e);
+
+- e = newDicomElement(DCM_ModalitiesInStudy);
++ e = DcmItem::newDicomElement(DCM_ModalitiesInStudy);
+ e->putString(modality.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientBirthDate);
++ e = DcmItem::newDicomElement(DCM_PatientBirthDate);
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientSex);
++ e = DcmItem::newDicomElement(DCM_PatientSex);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyDate);
++ e = DcmItem::newDicomElement(DCM_StudyDate);
+ e->putString(date.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyTime);
++ e = DcmItem::newDicomElement(DCM_StudyTime);
+ query.insert(e);
+
+- e = newDicomElement(DCM_NumberOfStudyRelatedSeries);
++ e = DcmItem::newDicomElement(DCM_NumberOfStudyRelatedSeries);
+ query.insert(e);
+
+- e = newDicomElement(DCM_NumberOfStudyRelatedInstances);
++ e = DcmItem::newDicomElement(DCM_NumberOfStudyRelatedInstances);
+ query.insert(e);
+
+- e = newDicomElement(DCM_AccessionNumber);
++ e = DcmItem::newDicomElement(DCM_AccessionNumber);
+ e->putString(accessionnumber.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyID);
++ e = DcmItem::newDicomElement(DCM_StudyID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyInstanceUID);
++ e = DcmItem::newDicomElement(DCM_StudyInstanceUID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyDescription);
++ e = DcmItem::newDicomElement(DCM_StudyDescription);
+ e->putString(description.c_str());
+ query.insert(e);
+
+ // StationName not allowed in StudyRoot
+- /*e = newDicomElement(DCM_StationName);
++ /*e = DcmItem::newDicomElement(DCM_StationName);
+ e->putString(station.c_str());
+ query.insert(e);*/
+
+@@ -283,36 +283,36 @@
+ DcmDataset query;
+ DcmElement* e = NULL;
+
+- e = newDicomElement(DCM_QueryRetrieveLevel);
++ e = DcmItem::newDicomElement(DCM_QueryRetrieveLevel);
+ e->putString("SERIES");
+ query.insert(e);
+
+- e = newDicomElement(DCM_SpecificCharacterSet);
++ e = DcmItem::newDicomElement(DCM_SpecificCharacterSet);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyInstanceUID);
++ e = DcmItem::newDicomElement(DCM_StudyInstanceUID);
+ e->putString(studyinstanceuid.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesInstanceUID);
++ e = DcmItem::newDicomElement(DCM_SeriesInstanceUID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesNumber);
++ e = DcmItem::newDicomElement(DCM_SeriesNumber);
+ query.insert(e);
+
+- e = newDicomElement(DCM_Modality);
++ e = DcmItem::newDicomElement(DCM_Modality);
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesDescription);
++ e = DcmItem::newDicomElement(DCM_SeriesDescription);
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesTime);
++ e = DcmItem::newDicomElement(DCM_SeriesTime);
+ query.insert(e);
+
+- e = newDicomElement(DCM_StationName);
++ e = DcmItem::newDicomElement(DCM_StationName);
+ query.insert(e);
+
+- e = newDicomElement(DCM_NumberOfSeriesRelatedInstances);
++ e = DcmItem::newDicomElement(DCM_NumberOfSeriesRelatedInstances);
+ query.insert(e);
+
+
+@@ -356,22 +356,22 @@
+ DcmDataset query;
+ DcmElement* e = NULL;
+
+- e = newDicomElement(DCM_QueryRetrieveLevel);
++ e = DcmItem::newDicomElement(DCM_QueryRetrieveLevel);
+ e->putString("IMAGE");
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyInstanceUID);
++ e = DcmItem::newDicomElement(DCM_StudyInstanceUID);
+ e->putString(studyinstanceuid.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesInstanceUID);
++ e = DcmItem::newDicomElement(DCM_SeriesInstanceUID);
+ e->putString(seriesinstanceuid.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_SOPInstanceUID);
++ e = DcmItem::newDicomElement(DCM_SOPInstanceUID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_InstanceNumber);
++ e = DcmItem::newDicomElement(DCM_InstanceNumber);
+ query.insert(e);
+
+ std::cout << "NEW QUERY:" << std::endl;
+@@ -393,21 +393,21 @@
+ DcmDataset query;
+ DcmElement* e = NULL;
+
+- e = newDicomElement(DCM_QueryRetrieveLevel);
++ e = DcmItem::newDicomElement(DCM_QueryRetrieveLevel);
+ e->putString("SERIES");
+ query.insert(e);
+
+- e = newDicomElement(DCM_StudyInstanceUID);
++ e = DcmItem::newDicomElement(DCM_StudyInstanceUID);
+ e->putString(studyinstanceuid.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesInstanceUID);
++ e = DcmItem::newDicomElement(DCM_SeriesInstanceUID);
+ query.insert(e);
+
+- e = newDicomElement(DCM_SeriesNumber);
++ e = DcmItem::newDicomElement(DCM_SeriesNumber);
+ query.insert(e);
+
+- e = newDicomElement(DCM_Modality);
++ e = DcmItem::newDicomElement(DCM_Modality);
+ query.insert(e);
+
+ std::cout << "NEW QUERY:" << std::endl;
+--- a/imagepool/poolassociation.h
++++ b/imagepool/poolassociation.h
+@@ -100,7 +100,7 @@
+ return false;
+ }
+
+- DcmElement *elem = newDicomElement(tag);
++ DcmElement *elem = DcmItem::newDicomElement(tag);
+ if (elem == NULL) {
+ printf("cannot create element for tag: (%04x,%04x)", g, e);
+ return false;
diff --git a/debian/patches/series b/debian/patches/series
index de06625..ef4e039 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ add_dicomdir_option.patch
po_makefile.patch
desktop-file.patch
remove-ignore-typedef.patch
+newDicomElement.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aeskulap.git
More information about the debian-med-commit
mailing list