[med-svn] r20589 - in trunk/packages/aeskulap/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Tue Dec 1 15:06:01 UTC 2015
Author: tille
Date: 2015-12-01 15:06:00 +0000 (Tue, 01 Dec 2015)
New Revision: 20589
Added:
trunk/packages/aeskulap/trunk/debian/patches/replace_ECC_Normal_not_any_more_in_dcmtk_3.6.1.patch
Modified:
trunk/packages/aeskulap/trunk/debian/changelog
trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch
trunk/packages/aeskulap/trunk/debian/patches/series
Log:
ATTENTION: No idea whether this is a sensible solution: ECC_Normal does not exist in dcmtk 3.6.1 -> use EC_Normal
Modified: trunk/packages/aeskulap/trunk/debian/changelog
===================================================================
--- trunk/packages/aeskulap/trunk/debian/changelog 2015-12-01 13:40:01 UTC (rev 20588)
+++ trunk/packages/aeskulap/trunk/debian/changelog 2015-12-01 15:06:00 UTC (rev 20589)
@@ -2,6 +2,8 @@
* Build-Depends: libdcmtk-dev (rather than libdcmtk2-dev)
Closes: #804578
+ * debian/patches/findAndCopyElement.patch: ECC_Normal does not exist in
+ dcmtk 3.6.1 -> use EC_Normal
-- Andreas Tille <tille at debian.org> Tue, 01 Dec 2015 14:22:49 +0100
Modified: trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch 2015-12-01 13:40:01 UTC (rev 20588)
+++ trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch 2015-12-01 15:06:00 UTC (rev 20589)
@@ -1,8 +1,12 @@
-This change is related to:
+Author: Mathieu Malaterre
+Date: Fri, 18 Feb 2011 08:21:14 +0000
+Revised: Andreas Tille, Tue, 01 Dec 2015 14:22:49 +0100
+Description: This change is related to:
+ http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=1d751592ff858b1dcb0f82647c06de779b8e7c32
+ It allows compilation against DCMTK 3.6.0
+ .
+ Andreas Tille: Dcmtk 3.6.1 does not contain ECC_Normal - use EC_Normal instead.
-http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=1d751592ff858b1dcb0f82647c06de779b8e7c32
-
-It allows compilation against DCMTK 3.6.0
--- a/imagepool/dicomdir.cpp
+++ b/imagepool/dicomdir.cpp
@@ -151,21 +151,21 @@ namespace ImagePool {
@@ -10,28 +14,28 @@
DcmElement *el;
- if ( studyRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( studyRec->findAndCopyElement(DCM_StudyInstanceUID, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( studyRec->findAndCopyElement(DCM_StudyDate, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( studyRec->findAndCopyElement(DCM_StudyTime, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( patRec->findAndCopyElement(DCM_PatientsName, el) == ECC_Normal )
-+ if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( patRec->findAndCopyElement(DCM_PatientsBirthDate, el) == ECC_Normal )
-+ if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
- if ( patRec->findAndCopyElement(DCM_PatientsSex, el) == ECC_Normal )
-+ if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == EC_Normal )
study.insert(el);
resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
}
@@ -40,28 +44,28 @@
DcmElement *el;
- if ( seriesRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( seriesRec->findAndCopyElement(DCM_SeriesDescription, el) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( seriesRec->findAndCopyElement(DCM_SeriesInstanceUID, el) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( seriesRec->findAndCopyElement(DCM_Modality, el) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( seriesRec->findAndCopyElement(DCM_SeriesDate, el) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( seriesRec->findAndCopyElement(DCM_SeriesTime, el) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
- if ( studyRec->findAndCopyElement(DCM_StationName, el) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == EC_Normal )
series.insert(el);
// Count Related SOP Instances
Added: trunk/packages/aeskulap/trunk/debian/patches/replace_ECC_Normal_not_any_more_in_dcmtk_3.6.1.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/replace_ECC_Normal_not_any_more_in_dcmtk_3.6.1.patch (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/replace_ECC_Normal_not_any_more_in_dcmtk_3.6.1.patch 2015-12-01 15:06:00 UTC (rev 20589)
@@ -0,0 +1,74 @@
+Author: Andreas Tille
+Last-Update: Tue, 01 Dec 2015 14:22:49 +0100
+Description: Dcmtk 3.6.1 does not contain ECC_Normal - use EC_Normal instead.
+
+--- a/imagepool/dicomdir.cpp
++++ b/imagepool/dicomdir.cpp
+@@ -43,7 +43,7 @@ namespace ImagePool {
+ DcmDicomDir dir(dicomdir.c_str());
+ OFCondition ret;
+
+- if ( (ret=dir.error()) != ECC_Normal ) {
++ if ( (ret=dir.error()) != EC_Normal ) {
+ std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
+ return;
+ }
+@@ -179,7 +179,7 @@ namespace ImagePool {
+ DcmDirectoryRecord *seriesRec;
+ OFCondition ret;
+
+- if ( dir.error() != ECC_Normal ) {
++ if ( dir.error() != EC_Normal ) {
+ std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
+ return;
+ }
+@@ -191,7 +191,7 @@ namespace ImagePool {
+ for ( studyRec=patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
+ if ( studyRec->getRecordType()==ERT_Study ) {
+ OFString uid;
+- if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
++ if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
+ if ( studyinstanceuid == uid.c_str() ) {
+ open_dicomdir_series_result(dicomdir, patRec, studyRec, resultslot);
+ return;
+--- a/imagepool/dicomdirloader.cpp
++++ b/imagepool/dicomdirloader.cpp
+@@ -42,7 +42,7 @@ namespace ImagePool {
+ return false;
+ }
+
+- if ( (ret=dir.error()) != ECC_Normal ) {
++ if ( (ret=dir.error()) != EC_Normal ) {
+ std::cout << "DicomdirLoader::load Error: " << ret.text() << std::endl;
+ return false;
+ }
+@@ -80,7 +80,7 @@ namespace ImagePool {
+ for ( studyRec = patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
+ if ( studyRec->getRecordType()==ERT_Study ) {
+ OFString uid;
+- if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
++ if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
+ if ( studyinstanceuid == uid.c_str() )
+ return studyRec;
+ }
+@@ -107,9 +107,9 @@ namespace ImagePool {
+ while ( seriesRec ) {
+ OFString modality;
+
+- if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == ECC_Normal ) {
++ if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == EC_Normal ) {
+ OFString seriesinstanceuid;
+- if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != ECC_Normal ) {
++ if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != EC_Normal ) {
+ seriesRec = studyRec->nextSub(seriesRec);
+ continue;
+ }
+@@ -124,7 +124,7 @@ namespace ImagePool {
+ switch ( sopRec->getRecordType() ) {
+ case ERT_Image:
+ case ERT_StoredPrint:
+- if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=ECC_Normal ) {
++ if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=EC_Normal ) {
+ sopRec = seriesRec->nextSub(sopRec);
+ continue;
+ }
Modified: trunk/packages/aeskulap/trunk/debian/patches/series
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/series 2015-12-01 13:40:01 UTC (rev 20588)
+++ trunk/packages/aeskulap/trunk/debian/patches/series 2015-12-01 15:06:00 UTC (rev 20589)
@@ -10,3 +10,4 @@
30_as_needed.patch
move_icon_to_correct_dir.patch
remove_rpath.patch
+replace_ECC_Normal_not_any_more_in_dcmtk_3.6.1.patch
More information about the debian-med-commit
mailing list