summaryrefslogtreecommitdiff
path: root/graphics/aeskulap
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/aeskulap')
-rw-r--r--graphics/aeskulap/Makefile23
-rw-r--r--graphics/aeskulap/distinfo5
-rw-r--r--graphics/aeskulap/files/patch-configure.in41
-rw-r--r--graphics/aeskulap/files/patch-imagepool_dicomdir.cpp89
-rw-r--r--graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp41
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolassociation.cpp112
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp31
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolfindassociation.h20
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolinstance.h47
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp73
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h34
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp101
-rw-r--r--graphics/aeskulap/files/patch-imagepool_poolnetwork.h38
-rw-r--r--graphics/aeskulap/pkg-plist2
14 files changed, 45 insertions, 612 deletions
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index d33caf307ac3..65c5f9ecf0fe 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= aeskulap
-PORTVERSION= 0.2.2.20140119
-PORTREVISION= 3
+DISTVERSION= 0.2.2.20180219
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
@@ -12,18 +11,20 @@ COMMENT= Medical image viewer
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24\
- libdcmimage.so:devel/dcmtk
-
-USE_GITHUB= yes
-GH_ACCOUNT= pipelka
-GH_TAGNAME= ea0a119
+LIB_DEPENDS= libdcmimage.so:graphics/dcmtk \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libglademm-2.4.so:devel/libglademm24 \
+ libpng16.so:graphics/png \
+ libtiff.so:graphics/tiff
USES= compiler:c++11-lang autoreconf desktop-file-utils gettext \
- gmake libtool localbase pkgconfig
+ gmake gnome jpeg libtool localbase pkgconfig
+USE_GITHUB= yes
+GH_ACCOUNT= jenslody # was pipelka
+GH_TAGNAME= 8787e95
USE_CXXSTD= c++11
-USE_GNOME= gconfmm26 gtkmm24 intltool
-GCONF_SCHEMAS= aeskulap.schemas
+USE_GNOME= gconfmm26 gtkmm24 intltool libglade2
USE_LDCONFIG= ${PREFIX}/lib/aeskulap
GNU_CONFIGURE= yes
diff --git a/graphics/aeskulap/distinfo b/graphics/aeskulap/distinfo
index c47bdc248e57..287150e01958 100644
--- a/graphics/aeskulap/distinfo
+++ b/graphics/aeskulap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = a98e07b31cf6d73b0cb2e4788a04f3e9bfdca856da709f01819fba0b58d21e89
-SIZE (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = 4323281
+TIMESTAMP = 1544657589
+SHA256 (jenslody-aeskulap-0.2.2.20180219-8787e95_GH0.tar.gz) = cf6bd1bb92599a92b3e4ce20fa77b606c888d8a0be1bde41470cae257923431a
+SIZE (jenslody-aeskulap-0.2.2.20180219-8787e95_GH0.tar.gz) = 2168735
diff --git a/graphics/aeskulap/files/patch-configure.in b/graphics/aeskulap/files/patch-configure.in
deleted file mode 100644
index 791cbc49c923..000000000000
--- a/graphics/aeskulap/files/patch-configure.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.in.orig 2014-01-19 07:38:17 UTC
-+++ configure.in
-@@ -104,17 +104,8 @@ DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -
-
- else
-
--DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
--AC_SUBST(DCMJPEG_LIBS)
--
--DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
--DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
---L../dcmtk/dcmdata/libsrc \
---L../dcmtk/dcmnet/libsrc \
---L../dcmtk/dcmjpeg/libsrc \
---L../dcmtk/dcmimage/libsrc \
---L../dcmtk/dcmimgle/libsrc \
--\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
-+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
-+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -loflog -lofstd"
-
- fi
-
-@@ -130,8 +121,7 @@ fi
-
- DCMTK_SUBDIR=""
- if test x"$MINGW32" = xno ; then
--DCMTK_SUBDIR="dcmtk"
--LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
-+LDFLAGS_AESKULAP_LIBS="-avoid-version"
- else
- LDFLAGS_MINGW32="-mwindows"
- LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
-@@ -161,7 +151,7 @@ packaging/win32/aeskulap.iss
- ])
-
-
--if test x"$MINGW32" = xno ; then
-+if false ; then
-
- cd $srcdir/dcmtk
- export CFLAGS="$CFLAGS"
diff --git a/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp b/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp
deleted file mode 100644
index ca3dfe4c4c61..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
---- imagepool/dicomdir.cpp.orig 2014-01-19 07:38:17 UTC
-+++ 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;
- }
-@@ -151,21 +151,21 @@ namespace ImagePool {
- 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 @@ 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;
-@@ -221,21 +221,21 @@ namespace ImagePool {
- 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 --git a/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp b/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp
deleted file mode 100644
index 4d2ff960d885..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- imagepool/dicomdirloader.cpp.orig 2014-01-19 07:38:17 UTC
-+++ 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;
- }
diff --git a/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp b/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp
index 0ea20b8c0abe..548b9ee7f7be 100644
--- a/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp
+++ b/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp
@@ -1,109 +1,11 @@
---- imagepool/poolassociation.cpp.orig 2014-01-19 07:38:17 UTC
+--- imagepool/poolassociation.cpp.orig 2018-12-12 23:25:10 UTC
+++ imagepool/poolassociation.cpp
-@@ -72,24 +72,24 @@ Association::~Association()
- Drop();
- }
+@@ -120,7 +120,7 @@ OFCondition Association::SendObject(DcmD
+ T_DIMSE_C_StoreRSP rsp;
--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 @@ CONDITION Association::Drop(CONDITION co
- }
-
- void Association::Destroy() {
-- CONDITION cond = ASC_destroyAssociation(&assoc);
-+ OFCondition cond = ASC_destroyAssociation(&assoc);
-
- dcmNet = NULL;
- assoc = NULL;
-@@ -110,8 +110,8 @@ void Association::Destroy() {
-
- }
-
--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 @@ CONDITION Association::SendObject(DcmDat
- 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,18 @@ CONDITION Association::SendObject(DcmDat
-
- const DcmRepresentationParameter *rp = NULL;
-
-+#if 0
-+ if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess14) {
-+#else
- if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess14TransferSyntax) {
-+#endif
- rp = &rp_lossless;
- }
-+#if 0
-+ else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4) {
-+#else
- else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4TransferSyntax) {
-+#endif
- rp = &rp_lossy;
- }
-
-@@ -232,15 +240,15 @@ CONDITION Association::SendObject(DcmDat
- delete statusDetail;
- }
-
-- if (cond != DIMSE_NORMAL)
-+ if (cond != EC_Normal)
+ // check if we SOPClass and SOPInstance in dataset
+- if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, sopInstance))
++ if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, strlen(sopClass), sopInstance, strlen(sopInstance)))
{
- return cond;
+ return DIMSE_BADDATA;
}
-
-- 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 +342,7 @@ Network* Association::GetNetwork()
- return dcmNet;
- }
-
--CONDITION Association::Connect(Network *network, int lossy)
-+OFCondition Association::Connect(Network *network, int lossy)
- {
- dcmNet = network;
- return network->ConnectAssociation(this, lossy);
diff --git a/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp b/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp
index ed27521d2860..1633c7ec0f7a 100644
--- a/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp
+++ b/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp
@@ -1,22 +1,13 @@
---- imagepool/poolfindassociation.cpp.orig 2014-01-19 07:38:17 UTC
+--- imagepool/poolfindassociation.cpp.orig 2018-12-12 23:22:31 UTC
+++ imagepool/poolfindassociation.cpp
-@@ -40,8 +40,8 @@ FindAssociation::~FindAssociation() {
- 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;
-@@ -100,7 +100,7 @@ void FindAssociation::findCallback(void*
- caller->OnResponseReceived(response);
- }
-
--CONDITION FindAssociation::SendObject(DcmDataset *dataset) {
-+OFCondition FindAssociation::SendObject(DcmDataset *dataset) {
- return findSCU(assoc, dataset);
- }
+@@ -57,7 +57,10 @@ OFCondition FindAssociation::findSCU(T_A
+ req.Priority = DIMSE_PRIORITY_LOW;
+ strcpy(req.AffectedSOPClassUID, m_abstractSyntax);
++ int responseCount = 0;
++
+ cond = DIMSE_findUser(assoc, presId, &req, query,
++ responseCount,
+ findCallback, (void*)this,
+ (m_timeout == 0) ? DIMSE_BLOCKING : DIMSE_NONBLOCKING,
+ m_timeout,
diff --git a/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h b/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h
deleted file mode 100644
index 276928d8b6db..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- imagepool/poolfindassociation.h.orig 2014-01-19 07:38:17 UTC
-+++ imagepool/poolfindassociation.h
-@@ -45,7 +45,7 @@ public:
- /**
- 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 @@ private:
- /**
- 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 --git a/graphics/aeskulap/files/patch-imagepool_poolinstance.h b/graphics/aeskulap/files/patch-imagepool_poolinstance.h
deleted file mode 100644
index bd606386a8b7..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolinstance.h
+++ /dev/null
@@ -1,47 +0,0 @@
---- imagepool/poolinstance.h.orig 2014-01-19 07:38:17 UTC
-+++ imagepool/poolinstance.h
-@@ -50,9 +50,9 @@ protected:
-
- Instance(const std::string& sopinstanceuid);
-
-- friend void ImagePool::remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
-+ friend void remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
-
-- friend class ImagePool::Loader;
-+ friend class Loader;
-
- public:
-
-@@ -131,9 +131,9 @@ public:
-
- int instancenumber();
-
-- const Glib::RefPtr<ImagePool::Series>& series();
-+ const Glib::RefPtr<Series>& series();
-
-- const Glib::RefPtr<ImagePool::Study>& study();
-+ const Glib::RefPtr<Study>& study();
-
- const std::string& date();
-
-@@ -176,7 +176,7 @@ public:
-
- bool has_3d_information();
-
-- static Glib::RefPtr<ImagePool::Instance> create(DcmDataset* dset);
-+ static Glib::RefPtr<Instance> create(DcmDataset* dset);
-
- int studyrelatedinstances();
-
-@@ -248,9 +248,9 @@ private:
-
- std::string m_modality;
-
-- Glib::RefPtr<ImagePool::Series> m_series;
-+ Glib::RefPtr<Series> m_series;
-
-- Glib::RefPtr<ImagePool::Study> m_study;
-+ Glib::RefPtr<Study> m_study;
-
- std::string m_date;
-
diff --git a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp b/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
index d0cf1e300cf1..5f90fec65362 100644
--- a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
+++ b/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
@@ -1,64 +1,11 @@
---- imagepool/poolmoveassociation.cpp.orig 2014-01-19 07:38:17 UTC
+--- imagepool/poolmoveassociation.cpp.orig 2018-12-12 23:21:04 UTC
+++ imagepool/poolmoveassociation.cpp
-@@ -68,7 +68,7 @@ void MoveAssociation::Create(const std::
- Association::Create(title, peer, port, ouraet, abstractSyntax);
- }
-
--CONDITION MoveAssociation::SendObject(DcmDataset *dataset) {
-+OFCondition MoveAssociation::SendObject(DcmDataset *dataset) {
- return moveSCU(dataset);
- }
-
-@@ -79,8 +79,8 @@ void MoveAssociation::OnAddPresentationC
- 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 @@ void MoveAssociation::subOpCallback(void
- }
- }
-
--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::acceptSubAsso
-
- }
-
--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 @@ CONDITION MoveAssociation::subOpSCP(T_AS
- 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 @@ void MoveAssociation::storeSCPCallback(v
-
- }
-
--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);
+@@ -310,7 +310,7 @@ void MoveAssociation::storeSCPCallback(v
+ */
+ if (rsp->DimseStatus == STATUS_Success) {
+ /* which SOP class and SOP instance ? */
+- if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass, sopInstance)) {
++ if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass, strlen(sopClass), sopInstance, strlen(sopInstance))) {
+ rsp->DimseStatus = STATUS_STORE_Error_CannotUnderstand;
+ }
+ else if (strcmp(sopClass, req->AffectedSOPClassUID) != 0) {
diff --git a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h b/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h
deleted file mode 100644
index da6979ab7480..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- imagepool/poolmoveassociation.h.orig 2014-01-19 07:38:17 UTC
-+++ imagepool/poolmoveassociation.h
-@@ -39,7 +39,7 @@ public:
-
- 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 @@ private:
- 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 --git a/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp b/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
deleted file mode 100644
index 4a0ff1675906..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
---- imagepool/poolnetwork.cpp.orig 2014-01-19 07:38:17 UTC
-+++ imagepool/poolnetwork.cpp
-@@ -42,8 +42,8 @@ Network::~Network() {
- 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 @@ CONDITION Network::ConnectAssociation(As
- assoc->m_abstractSyntax,
- lossy);
-
-- if (!SUCCESS(cond)) {
-+ if (!cond.good()) {
- assoc->Drop(cond);
- return cond;
- }
-@@ -65,7 +65,7 @@ CONDITION Network::ConnectAssociation(As
- 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 @@ CONDITION Network::InitializeNetwork(int
- 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 @@ CONDITION Network::DropNetwork()
- 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 @@ CONDITION Network::ASC_ConnectAssociatio
- DIC_NODENAME localHost;
-
- cond = ASC_createAssociationParameters(&params, ASC_DEFAULTMAXPDU);
-- if (!SUCCESS(cond))
-+ if (!cond.good())
- {
- return cond;
- }
-@@ -155,9 +155,9 @@ CONDITION Network::ASC_ConnectAssociatio
-
- /* 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 @@ CONDITION Network::ASC_ConnectAssociatio
- 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 @@ CONDITION Network::addAllStoragePresenta
- }
-
- /* the array of Storage SOP Class UIDs comes from dcuid.h */
-- for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && SUCCESS(cond); i++) {
-+ for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && cond.good(); i++) {
- cond = ASC_addPresentationContext(params, pid, dcmAllStorageSOPClassUIDs[i], transferSyntaxes, transferSyntaxes_count);
- pid += 2; /* only odd presentation context id's */
- }
diff --git a/graphics/aeskulap/files/patch-imagepool_poolnetwork.h b/graphics/aeskulap/files/patch-imagepool_poolnetwork.h
deleted file mode 100644
index f55195f726a0..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolnetwork.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- imagepool/poolnetwork.h.orig 2014-01-19 07:38:17 UTC
-+++ imagepool/poolnetwork.h
-@@ -43,17 +43,17 @@ public:
- /**
- Initialize the dicom network
- */
-- CONDITION InitializeNetwork(int timeout=20, int port = 0);
-+ OFCondition InitializeNetwork(int timeout=20, int port = 0);
-
- /**
- Drop the dicom network
- */
-- CONDITION DropNetwork();
-+ OFCondition DropNetwork();
-
- /**
- Connect an association to the specified host
- */
-- CONDITION ConnectAssociation(Association* assoc, int lossy = 0);
-+ OFCondition ConnectAssociation(Association* assoc, int lossy = 0);
-
- /**
- Send C-Echo request to dicom node
-@@ -80,12 +80,12 @@ private:
- /**
- Add all possible presentation contexts to association parameters
- */
-- static CONDITION addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
-+ static OFCondition addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
-
- /**
- Connect to a host and try to establish an association
- */
-- CONDITION ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL, int lossy = 0);
-+ OFCondition ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL, int lossy = 0);
-
- /**
- THE dicom network
diff --git a/graphics/aeskulap/pkg-plist b/graphics/aeskulap/pkg-plist
index e231b5d0c057..2be82d9dcde0 100644
--- a/graphics/aeskulap/pkg-plist
+++ b/graphics/aeskulap/pkg-plist
@@ -24,7 +24,9 @@ lib/aeskulap/libimagepool.so
%%DATADIR%%/images/stock-tool-eraser-22.png
%%DATADIR%%/images/stock-tool-measure-22.png
%%DATADIR%%/images/stock-tool-scale-22.png
+share/appdata/aeskulap.appdata.xml
share/applications/aeskulap.desktop
+share/glib-2.0/schemas/org.gnu.aeskulap.gschema.xml
share/icons/hicolor/64x64/apps/aeskulap.png
share/icons/hicolor/scalable/apps/aeskulap.svg
share/locale/de/LC_MESSAGES/aeskulap.mo
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-05 04:12:29 +0000