diff -Nru aeskulap-0.2.2b1/debian/aeskulap.menu aeskulap-0.2.2b1/debian/aeskulap.menu --- aeskulap-0.2.2b1/debian/aeskulap.menu 2013-09-12 09:00:04.000000000 +0000 +++ aeskulap-0.2.2b1/debian/aeskulap.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -?package(aeskulap):needs="X11" section="Applications/Science/Medicine"\ - title="Aeskulap" icon="/usr/share/pixmaps/aeskulap.xpm" command="/usr/bin/aeskulap"\ - hints="Medical image viewer and DICOM network client" diff -Nru aeskulap-0.2.2b1/debian/changelog aeskulap-0.2.2b1/debian/changelog --- aeskulap-0.2.2b1/debian/changelog 2015-11-09 22:58:36.000000000 +0000 +++ aeskulap-0.2.2b1/debian/changelog 2015-12-02 13:27:32.000000000 +0000 @@ -1,3 +1,17 @@ +aeskulap (0.2.2b1-15) unstable; urgency=medium + + [ Andreas Tille ] + * 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 + * Remove menu file + + [ Gert Wollny ] + * catches all cases of the CONDITION->OFCondition transition of dcmtk 3.6.1 + + -- Andreas Tille Wed, 02 Dec 2015 14:12:41 +0100 + aeskulap (0.2.2b1-14) unstable; urgency=medium * Build-Depends libdcmtk-dev instead of libdcmtk2-dev diff -Nru aeskulap-0.2.2b1/debian/control aeskulap-0.2.2b1/debian/control --- aeskulap-0.2.2b1/debian/control 2015-11-09 22:58:15.000000000 +0000 +++ aeskulap-0.2.2b1/debian/control 2015-12-01 13:23:01.000000000 +0000 @@ -11,7 +11,7 @@ libgconfmm-2.6-dev, libwrap0-dev, intltool, - libdcmtk2-dev, + libdcmtk-dev, libtiff-dev Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/aeskulap/trunk/ diff -Nru aeskulap-0.2.2b1/debian/patches/dcmnet_3.6.1_new_condition_handling.patch aeskulap-0.2.2b1/debian/patches/dcmnet_3.6.1_new_condition_handling.patch --- aeskulap-0.2.2b1/debian/patches/dcmnet_3.6.1_new_condition_handling.patch 1970-01-01 00:00:00.000000000 +0000 +++ aeskulap-0.2.2b1/debian/patches/dcmnet_3.6.1_new_condition_handling.patch 2015-12-02 13:11:21.000000000 +0000 @@ -0,0 +1,526 @@ +Authors: Andreas Tille, Gert Wollny +Last-Update: Wed, 02 Dec 2015 13:08:49 +0100 +Description: Dcmtk 3.6.1 changes the handling of conditions in dcmnet + Specifically, CONDITION has been replaced by OFCondition and the + SUCCESS macro was dropped. + For some more details see dcmtk/dcmnet/cond.h + +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; + +- 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 @@ + 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 @@ + 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; +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 08:35:33.945967778 +0100 +@@ -42,7 +42,7 @@ + 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 @@ + 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 @@ + 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 @@ + 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; + } +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 08:35:33.945967778 +0100 +@@ -72,24 +72,24 @@ + Drop(); + } + +-CONDITION Association::Drop(CONDITION cond) { ++OFCondition Association::Drop(OFCondition cond) { + // tear down association +- if(cond == DIMSE_NORMAL) { ++ if(cond == EC_Normal) { + /* release association */ + cond = ASC_releaseAssociation(assoc); + } +- else if(cond == DIMSE_PEERREQUESTEDRELEASE) { ++ else if(cond == DUL_PEERREQUESTEDRELEASE) { + cond = ASC_abortAssociation(assoc); +- if (SUCCESS(cond)) { ++ if (cond.good()) { + return cond; + } + } +- else if(cond == DIMSE_PEERABORTEDASSOCIATION) { ++ else if(cond == DUL_PEERABORTEDASSOCIATION) { + return cond; + } + else { + cond = ASC_abortAssociation(assoc); +- if (SUCCESS(cond)) { ++ if (cond.good()) { + return cond; + } + } +@@ -99,7 +99,7 @@ + } + + void Association::Destroy() { +- CONDITION cond = ASC_destroyAssociation(&assoc); ++ OFCondition cond = ASC_destroyAssociation(&assoc); + + dcmNet = NULL; + assoc = NULL; +@@ -110,8 +110,8 @@ + + } + +-CONDITION Association::SendObject(DcmDataset *dataset) { +- CONDITION cond; ++OFCondition Association::SendObject(DcmDataset *dataset) { ++ OFCondition cond; + DcmDataset *statusDetail = NULL; + + T_DIMSE_C_StoreRQ req; +@@ -163,7 +163,7 @@ + if(opt_oxferSyn.getXfer() != ori_oxferSyn) { + std::cout << "Converting object to accepted transfer-syntax " << opt_oxferSyn.getXferName() << std::endl; + +- CONDITION cond; ++ OFCondition cond; + // create RepresentationParameter + DJ_RPLossless rp_lossless(6, 0); + DJ_RPLossy rp_lossy(m_CompressionQuality); +@@ -172,10 +172,10 @@ + + const DcmRepresentationParameter *rp = NULL; + +- if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess14TransferSyntax) { ++ if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess14) { + rp = &rp_lossless; + } +- else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4TransferSyntax) { ++ else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4) { + rp = &rp_lossy; + } + +@@ -232,15 +232,15 @@ + delete statusDetail; + } + +- if (cond != DIMSE_NORMAL) ++ if (cond != EC_Normal) + { + return cond; + } + +- return (rsp.DimseStatus == STATUS_Success) ? DIMSE_NORMAL : DIMSE_BADDATA; ++ return (rsp.DimseStatus == STATUS_Success) ? EC_Normal : DIMSE_BADDATA; + } + +-CONDITION Association::SendObject(DcmFileFormat *dcmff) ++OFCondition Association::SendObject(DcmFileFormat *dcmff) + { + DcmDataset* dataset = dcmff->getDataset(); + return SendObject(dataset); +@@ -334,7 +334,7 @@ + return dcmNet; + } + +-CONDITION Association::Connect(Network *network, int lossy) ++OFCondition Association::Connect(Network *network, int lossy) + { + dcmNet = network; + return network->ConnectAssociation(this, lossy); +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 + #include + #include ++#include + + class Network; + +@@ -56,24 +57,24 @@ + /** + Connect the association to a dicom network + */ +- CONDITION Connect(Network* network, int lossy = 0); ++ OFCondition Connect(Network* network, int lossy = 0); + + void Destroy(); + + /** + Drop the association + */ +- CONDITION Drop(CONDITION cond=DIMSE_NORMAL); ++ OFCondition Drop(OFCondition cond=EC_Normal); + + /** + Send a dataset through the association (C-Store) + */ +- virtual CONDITION SendObject(DcmDataset* dataset); ++ virtual OFCondition SendObject(DcmDataset* dataset); + + /** + Send a fileformat object through the association (C-Store) + */ +- virtual CONDITION SendObject(DcmFileFormat* dcmff); ++ virtual OFCondition SendObject(DcmFileFormat* dcmff); + + /** + Send a C-Echo request through the association +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(); + } + +-CONDITION FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) { +- CONDITION cond; ++OFCondition FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) { ++ OFCondition cond; + DIC_US msgId = assoc->nextMsgID++; + T_ASC_PresentationContextID presId; + T_DIMSE_C_FindRQ req; +@@ -72,7 +72,7 @@ + &rsp, &statusDetail); + + +- if (cond == DIMSE_NORMAL) { ++ if (cond == EC_Normal) { + if (rsp.DimseStatus == STATUS_Success) { + } + } +@@ -100,7 +100,7 @@ + caller->OnResponseReceived(response); + } + +-CONDITION FindAssociation::SendObject(DcmDataset *dataset) { ++OFCondition FindAssociation::SendObject(DcmDataset *dataset) { + return findSCU(assoc, dataset); + } + +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 08:35:33.949967794 +0100 +@@ -45,7 +45,7 @@ + /** + Send a query object (C-Find) through association + */ +- CONDITION SendObject(DcmDataset *dataset); ++ OFCondition SendObject(DcmDataset *dataset); + + /** + Get the result stack of the last query +@@ -88,7 +88,7 @@ + /** + C-Find service class user + */ +- CONDITION findSCU(T_ASC_Association * assoc, DcmDataset * query); ++ OFCondition findSCU(T_ASC_Association * assoc, DcmDataset * query); + + /** + Callback function for C-Find service class user +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); + } + +-CONDITION MoveAssociation::SendObject(DcmDataset *dataset) { ++OFCondition MoveAssociation::SendObject(DcmDataset *dataset) { + return moveSCU(dataset); + } + +@@ -79,8 +79,8 @@ + ASC_addPresentationContext(params, 5, m_abstractSyntax, mpeg_transfer, DIM_OF(mpeg_transfer)); + } + +-CONDITION MoveAssociation::moveSCU(DcmDataset *pdset) { +- CONDITION cond; ++OFCondition MoveAssociation::moveSCU(DcmDataset *pdset) { ++ OFCondition cond; + T_ASC_PresentationContextID presId; + T_DIMSE_C_MoveRQ req; + T_DIMSE_C_MoveRSP rsp; +@@ -161,8 +161,8 @@ + } + } + +-CONDITION MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) { +- CONDITION cond = ASC_NORMAL; ++OFCondition MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) { ++ OFCondition cond = EC_Normal; + const char* knownAbstractSyntaxes[] = { UID_VerificationSOPClass }; + const char* transferSyntaxes[] = { UID_JPEGProcess14SV1TransferSyntax, NULL, NULL, UID_LittleEndianImplicitTransferSyntax, UID_MPEG2MainProfileAtMainLevelTransferSyntax }; + +@@ -222,7 +222,7 @@ + + } + +-CONDITION MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) { ++OFCondition MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) { + T_DIMSE_Message msg; + T_ASC_PresentationContextID presID; + +@@ -269,8 +269,8 @@ + return cond; + } + +-CONDITION MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) { +- CONDITION cond; ++OFCondition MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) { ++ OFCondition cond; + T_DIMSE_C_StoreRQ* req; + DcmDataset *dset = new DcmDataset; + +@@ -328,8 +328,8 @@ + + } + +-CONDITION MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) { +- CONDITION cond; ++OFCondition MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) { ++ OFCondition cond; + + // the echo succeeded !! + cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL); +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 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*/); + +- CONDITION SendObject(DcmDataset *dataset); ++ OFCondition SendObject(DcmDataset *dataset); + + protected: + +@@ -62,17 +62,17 @@ + MoveAssociation* pCaller; + } StoreCallbackInfo; + +- CONDITION moveSCU(DcmDataset *pdset); ++ OFCondition moveSCU(DcmDataset *pdset); + static void moveCallback(void *callbackData, T_DIMSE_C_MoveRQ *request, int responseCount, T_DIMSE_C_MoveRSP *response); + +- CONDITION acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc); +- CONDITION subOpSCP(T_ASC_Association **subAssoc); ++ OFCondition acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc); ++ OFCondition subOpSCP(T_ASC_Association **subAssoc); + static void subOpCallback(void * pCaller, T_ASC_Network *aNet, T_ASC_Association **subAssoc); + +- CONDITION storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID); ++ OFCondition storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID); + static void storeSCPCallback(void *callbackData, T_DIMSE_StoreProgress *progress, T_DIMSE_C_StoreRQ *req, char *imageFileName, DcmDataset **imageDataSet, T_DIMSE_C_StoreRSP *rsp, DcmDataset **statusDetail); + +- CONDITION echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID); ++ OFCondition echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID); + }; + + #endif // IMAGEPOOL_MOVEASSOCIATION_H +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 08:35:33.949967794 +0100 +@@ -42,8 +42,8 @@ + DropNetwork(); + } + +-CONDITION Network::ConnectAssociation(Association* assoc, int lossy) { +- CONDITION cond; ++OFCondition Network::ConnectAssociation(Association* assoc, int lossy) { ++ OFCondition cond; + + cond = ASC_ConnectAssociation( + assoc, +@@ -54,7 +54,7 @@ + assoc->m_abstractSyntax, + lossy); + +- if (!SUCCESS(cond)) { ++ if (!cond.good()) { + assoc->Drop(cond); + return cond; + } +@@ -65,7 +65,7 @@ + return cond; + } + +-CONDITION Network::InitializeNetwork(int timeout, int port) { ++OFCondition Network::InitializeNetwork(int timeout, int port) { + #ifdef _WIN32 + WORD wVersionRequested; + WSADATA wsaData; +@@ -78,9 +78,9 @@ + return ASC_initializeNetwork(NET_ACCEPTORREQUESTOR, port, timeout, &net); + } + +-CONDITION Network::DropNetwork() ++OFCondition Network::DropNetwork() + { +- CONDITION cond = ASC_dropNetwork(&net); ++ OFCondition cond = ASC_dropNetwork(&net); + net = NULL; + + #ifdef _WIN32 +@@ -90,9 +90,9 @@ + return cond; + } + +-CONDITION Network::ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax, int lossy) ++OFCondition Network::ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax, int lossy) + { +- CONDITION cond; ++ OFCondition cond; + T_ASC_Parameters *params; + bool bProposeCompression = assoc->GetProposeCompression(); + +@@ -100,7 +100,7 @@ + DIC_NODENAME localHost; + + cond = ASC_createAssociationParameters(¶ms, ASC_DEFAULTMAXPDU); +- if (!SUCCESS(cond)) ++ if (!cond.good()) + { + return cond; + } +@@ -113,7 +113,7 @@ + if(abstractSyntax == NULL) + { + cond = addAllStoragePresentationContexts(params, bProposeCompression, lossy); +- if (!SUCCESS(cond)) ++ if (!cond.good()) + { + return cond; + } +@@ -155,9 +155,9 @@ + + /* create association */ + cond = ASC_requestAssociation(net, params, &(assoc->assoc)); +- if (cond != ASC_NORMAL) ++ if (cond != EC_Normal) + { +- if (cond == ASC_ASSOCIATIONREJECTED) ++ if (cond == DUL_ASSOCIATIONREJECTED) + { + T_ASC_RejectParameters rej; + +@@ -178,12 +178,12 @@ + return cond; + } + +- return ASC_NORMAL; ++ return EC_Normal; + } + +-CONDITION Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy) ++OFCondition Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy) + { +- CONDITION cond = ASC_NORMAL; ++ OFCondition cond = EC_Normal; + int i; + int pid = 1; + +@@ -232,7 +232,7 @@ + } + + /* the array of Storage SOP Class UIDs comes from dcuid.h */ +- for (i=0; ifindAndCopyElement(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 diff -Nru aeskulap-0.2.2b1/debian/patches/series aeskulap-0.2.2b1/debian/patches/series --- aeskulap-0.2.2b1/debian/patches/series 2013-12-12 09:27:04.000000000 +0000 +++ aeskulap-0.2.2b1/debian/patches/series 2015-12-02 12:50:22.000000000 +0000 @@ -10,3 +10,4 @@ 30_as_needed.patch move_icon_to_correct_dir.patch remove_rpath.patch +dcmnet_3.6.1_new_condition_handling.patch