[med-svn] r20605 - trunk/packages/aeskulap/trunk/debian/patches
Gert Wollny
gert-guest at moszumanska.debian.org
Wed Dec 2 13:11:02 UTC 2015
Author: gert-guest
Date: 2015-12-02 13:11:01 +0000 (Wed, 02 Dec 2015)
New Revision: 20605
Modified:
trunk/packages/aeskulap/trunk/debian/patches/dcmnet_3.6.1_new_condition_handling.patch
Log:
Correct dcmnet condition handling patch
Modified: trunk/packages/aeskulap/trunk/debian/patches/dcmnet_3.6.1_new_condition_handling.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/dcmnet_3.6.1_new_condition_handling.patch 2015-12-02 13:02:32 UTC (rev 20604)
+++ trunk/packages/aeskulap/trunk/debian/patches/dcmnet_3.6.1_new_condition_handling.patch 2015-12-02 13:11:01 UTC (rev 20605)
@@ -5,9 +5,9 @@
SUCCESS macro was dropped.
For some more details see dcmtk/dcmnet/cond.h
-diff -u aeskulap-0.2.2b1/imagepool/dicomdir.cpp aeskulap-0.2.2b1.new/imagepool/dicomdir.cpp
---- aeskulap-0.2.2b1/imagepool/dicomdir.cpp 2015-12-01 07:34:05.000000000 +0100
-+++ aeskulap-0.2.2b1.new/imagepool/dicomdir.cpp 2015-12-01 07:03:25.691632433 +0100
+diff -ru aeskulap-0.2.2b1/imagepool/dicomdir.cpp aeskulap-0.2.2b1.new/imagepool/dicomdir.cpp
+--- aeskulap-0.2.2b1/imagepool/dicomdir.cpp 2015-12-01 08:33:38.000000000 +0100
++++ aeskulap-0.2.2b1.new/imagepool/dicomdir.cpp 2015-12-01 08:35:33.945967778 +0100
@@ -43,7 +43,7 @@
DcmDicomDir dir(dicomdir.c_str());
OFCondition ret;
@@ -17,36 +17,6 @@
std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
return;
}
-@@ -151,21 +151,21 @@
- DcmDataset study;
- DcmElement *el;
-
-- 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->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
- study.insert(el);
-- 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->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
-+ if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == EC_Normal )
- study.insert(el);
-- 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->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
-+ if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == EC_Normal )
- study.insert(el);
-- 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->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));
- }
@@ -179,7 +179,7 @@
DcmDirectoryRecord *seriesRec;
OFCondition ret;
@@ -65,39 +35,9 @@
if ( studyinstanceuid == uid.c_str() ) {
open_dicomdir_series_result(dicomdir, patRec, studyRec, resultslot);
return;
-@@ -221,21 +221,21 @@
- DcmDataset series;
- DcmElement *el;
-
-- 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->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == EC_Normal )
- series.insert(el);
-- 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->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == EC_Normal )
- series.insert(el);
-- 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->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
-+ if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == EC_Normal )
- series.insert(el);
-- 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->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
-diff -u aeskulap-0.2.2b1/imagepool/dicomdirloader.cpp aeskulap-0.2.2b1.new/imagepool/dicomdirloader.cpp
+diff -ru aeskulap-0.2.2b1/imagepool/dicomdirloader.cpp aeskulap-0.2.2b1.new/imagepool/dicomdirloader.cpp
--- aeskulap-0.2.2b1/imagepool/dicomdirloader.cpp 2007-05-04 16:47:06.000000000 +0200
-+++ aeskulap-0.2.2b1.new/imagepool/dicomdirloader.cpp 2015-12-01 07:00:09.000000000 +0100
++++ aeskulap-0.2.2b1.new/imagepool/dicomdirloader.cpp 2015-12-01 08:35:33.945967778 +0100
@@ -42,7 +42,7 @@
return false;
}
@@ -137,9 +77,9 @@
sopRec = seriesRec->nextSub(sopRec);
continue;
}
-diff -u aeskulap-0.2.2b1/imagepool/poolassociation.cpp aeskulap-0.2.2b1.new/imagepool/poolassociation.cpp
+diff -ru aeskulap-0.2.2b1/imagepool/poolassociation.cpp aeskulap-0.2.2b1.new/imagepool/poolassociation.cpp
--- aeskulap-0.2.2b1/imagepool/poolassociation.cpp 2007-05-10 20:07:41.000000000 +0200
-+++ aeskulap-0.2.2b1.new/imagepool/poolassociation.cpp 2015-12-01 07:29:31.601959054 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolassociation.cpp 2015-12-01 08:35:33.945967778 +0100
@@ -72,24 +72,24 @@
Drop();
}
@@ -241,9 +181,9 @@
{
dcmNet = network;
return network->ConnectAssociation(this, lossy);
-diff -u aeskulap-0.2.2b1/imagepool/poolassociation.h aeskulap-0.2.2b1.new/imagepool/poolassociation.h
---- aeskulap-0.2.2b1/imagepool/poolassociation.h 2015-12-01 07:34:05.000000000 +0100
-+++ aeskulap-0.2.2b1.new/imagepool/poolassociation.h 2015-12-01 07:11:49.873669427 +0100
+diff -ru aeskulap-0.2.2b1/imagepool/poolassociation.h aeskulap-0.2.2b1.new/imagepool/poolassociation.h
+--- aeskulap-0.2.2b1/imagepool/poolassociation.h 2015-12-01 08:33:38.000000000 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolassociation.h 2015-12-01 08:35:33.949967794 +0100
@@ -35,6 +35,7 @@
#include <dcmtk/dcmnet/cond.h>
#include <dcmtk/dcmnet/dimse.h>
@@ -281,9 +221,9 @@
/**
Send a C-Echo request through the association
-diff -u aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp aeskulap-0.2.2b1.new/imagepool/poolfindassociation.cpp
---- aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp 2015-12-01 07:34:05.000000000 +0100
-+++ aeskulap-0.2.2b1.new/imagepool/poolfindassociation.cpp 2015-12-01 07:30:35.354216620 +0100
+diff -ru aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp aeskulap-0.2.2b1.new/imagepool/poolfindassociation.cpp
+--- aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp 2015-12-01 08:33:38.000000000 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolfindassociation.cpp 2015-12-01 08:35:33.949967794 +0100
@@ -40,8 +40,8 @@
DeleteResultStack();
}
@@ -313,9 +253,9 @@
return findSCU(assoc, dataset);
}
-diff -u aeskulap-0.2.2b1/imagepool/poolfindassociation.h aeskulap-0.2.2b1.new/imagepool/poolfindassociation.h
+diff -ru aeskulap-0.2.2b1/imagepool/poolfindassociation.h aeskulap-0.2.2b1.new/imagepool/poolfindassociation.h
--- aeskulap-0.2.2b1/imagepool/poolfindassociation.h 2005-08-24 23:55:42.000000000 +0200
-+++ aeskulap-0.2.2b1.new/imagepool/poolfindassociation.h 2015-12-01 07:13:54.346172335 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolfindassociation.h 2015-12-01 08:35:33.949967794 +0100
@@ -45,7 +45,7 @@
/**
Send a query object (C-Find) through association
@@ -334,9 +274,9 @@
/**
Callback function for C-Find service class user
-diff -u aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.cpp
---- aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp 2015-12-01 07:34:05.000000000 +0100
-+++ aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.cpp 2015-12-01 07:31:02.514326356 +0100
+diff -ru aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.cpp
+--- aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp 2015-12-01 08:33:38.000000000 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.cpp 2015-12-01 08:35:33.949967794 +0100
@@ -68,7 +68,7 @@
Association::Create(title, peer, port, ouraet, abstractSyntax);
}
@@ -399,9 +339,9 @@
// the echo succeeded !!
cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);
-diff -u aeskulap-0.2.2b1/imagepool/poolmoveassociation.h aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.h
+diff -ru aeskulap-0.2.2b1/imagepool/poolmoveassociation.h aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.h
--- aeskulap-0.2.2b1/imagepool/poolmoveassociation.h 2006-01-12 11:45:30.000000000 +0100
-+++ aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.h 2015-12-01 07:14:25.514298266 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolmoveassociation.h 2015-12-01 08:35:33.949967794 +0100
@@ -39,7 +39,7 @@
void Create(const std::string& title, const std::string& peer, int port, const std::string& ouraet, /*int ourPort,*/ const char *abstractSyntax = UID_MOVEPatientRootQueryRetrieveInformationModel/*, const char *abstractSyntaxMove = UID_MOVEPatientRootQueryRetrieveInformationModel*/);
@@ -434,9 +374,9 @@
};
#endif // IMAGEPOOL_MOVEASSOCIATION_H
-diff -u aeskulap-0.2.2b1/imagepool/poolnetwork.cpp aeskulap-0.2.2b1.new/imagepool/poolnetwork.cpp
+diff -ru aeskulap-0.2.2b1/imagepool/poolnetwork.cpp aeskulap-0.2.2b1.new/imagepool/poolnetwork.cpp
--- aeskulap-0.2.2b1/imagepool/poolnetwork.cpp 2007-04-24 11:53:38.000000000 +0200
-+++ aeskulap-0.2.2b1.new/imagepool/poolnetwork.cpp 2015-12-01 07:32:38.042712288 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolnetwork.cpp 2015-12-01 08:35:33.949967794 +0100
@@ -42,8 +42,8 @@
DropNetwork();
}
@@ -545,9 +485,9 @@
cond = ASC_addPresentationContext(params, pid, dcmAllStorageSOPClassUIDs[i], transferSyntaxes, transferSyntaxes_count);
pid += 2; /* only odd presentation context id's */
}
-diff -u aeskulap-0.2.2b1/imagepool/poolnetwork.h aeskulap-0.2.2b1.new/imagepool/poolnetwork.h
+diff -ru aeskulap-0.2.2b1/imagepool/poolnetwork.h aeskulap-0.2.2b1.new/imagepool/poolnetwork.h
--- aeskulap-0.2.2b1/imagepool/poolnetwork.h 2006-01-12 11:45:30.000000000 +0100
-+++ aeskulap-0.2.2b1.new/imagepool/poolnetwork.h 2015-12-01 07:13:33.154086719 +0100
++++ aeskulap-0.2.2b1.new/imagepool/poolnetwork.h 2015-12-01 08:35:33.949967794 +0100
@@ -43,17 +43,17 @@
/**
Initialize the dicom network
More information about the debian-med-commit
mailing list