svn commit: r418019 - in head/graphics/aeskulap: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Jul 4 13:24:12 UTC 2016
Author: mat
Date: Mon Jul 4 13:24:09 2016
New Revision: 418019
URL: https://svnweb.freebsd.org/changeset/ports/418019
Log:
Update to version 0.2.2.20140119.
PR: 210794
Submitted by: tkato432 yahoo com
Sponsored by: Absolight
Added:
head/graphics/aeskulap/files/patch-configure.in (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolnetwork.h (contents, props changed)
Deleted:
head/graphics/aeskulap/files/patch-configuration_aconfiguration.cpp
head/graphics/aeskulap/files/patch-dcmtk-clang
head/graphics/aeskulap/files/patch-dcmtk-config_configure
head/graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h
head/graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc
head/graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h
head/graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc
head/graphics/aeskulap/files/patch-dcmtk_ofstd_libsrc_oftime.cc
head/graphics/aeskulap/files/patch-imagepool_imagepool.h
head/graphics/aeskulap/files/patch-src_Makefile.am
head/graphics/aeskulap/files/patch-src_Makefile.in
head/graphics/aeskulap/files/patch-widgets_awindowleveltoolbutton.cpp
Modified:
head/graphics/aeskulap/Makefile (contents, props changed)
head/graphics/aeskulap/distinfo (contents, props changed)
head/graphics/aeskulap/files/patch-imagepool_poolinstance.h (contents, props changed)
head/graphics/aeskulap/pkg-descr (contents, props changed)
head/graphics/aeskulap/pkg-plist (contents, props changed)
Modified: head/graphics/aeskulap/Makefile
==============================================================================
--- head/graphics/aeskulap/Makefile Mon Jul 4 13:24:02 2016 (r418018)
+++ head/graphics/aeskulap/Makefile Mon Jul 4 13:24:09 2016 (r418019)
@@ -2,34 +2,32 @@
# $FreeBSD$
PORTNAME= aeskulap
-PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTVERSION= 0.2.2.20140119
CATEGORIES= graphics
-MASTER_SITES= http://www.sourcefiles.org/Home_and_Education/Health/
MAINTAINER= ports at FreeBSD.org
COMMENT= Medical image viewer
-BROKEN= unfetchable
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2016-07-04
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24
+LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24\
+ libdcmimage.so:devel/dcmtk
-USES= desktop-file-utils gettext libtool pkgconfig
+USE_GITHUB= yes
+GH_ACCOUNT= pipelka
+GH_TAGNAME= ea0a119
+
+USES= autoreconf desktop-file-utils gettext gmake libtool localbase \
+ pkgconfig
USE_GNOME= gconfmm26 gtkmm24 intltool
GCONF_SCHEMAS= aeskulap.schemas
USE_LDCONFIG= ${PREFIX}/lib/aeskulap
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
+INSTALLS_ICONS= yes
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/aeskulap/*.so
.include <bsd.port.mk>
Modified: head/graphics/aeskulap/distinfo
==============================================================================
--- head/graphics/aeskulap/distinfo Mon Jul 4 13:24:02 2016 (r418018)
+++ head/graphics/aeskulap/distinfo Mon Jul 4 13:24:09 2016 (r418019)
@@ -1,2 +1,2 @@
-SHA256 (aeskulap-0.2.1.tar.gz) = 6bbf1a26466ba190b1807e06f3d682575439668d6f11d7a5fa6b3fb1049fab50
-SIZE (aeskulap-0.2.1.tar.gz) = 4272339
+SHA256 (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = a98e07b31cf6d73b0cb2e4788a04f3e9bfdca856da709f01819fba0b58d21e89
+SIZE (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = 4323281
Added: head/graphics/aeskulap/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-configure.in Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,41 @@
+--- 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"
Added: head/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,89 @@
+--- 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
Added: head/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,41 @@
+--- 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;
+ }
Added: head/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,109 @@
+--- imagepool/poolassociation.cpp.orig 2014-01-19 07:38:17 UTC
++++ imagepool/poolassociation.cpp
+@@ -72,24 +72,24 @@ Association::~Association()
+ 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 @@ 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)
+ {
+ 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 +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);
Added: head/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,22 @@
+--- imagepool/poolfindassociation.cpp.orig 2014-01-19 07:38:17 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);
+ }
+
Added: head/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,20 @@
+--- 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
Modified: head/graphics/aeskulap/files/patch-imagepool_poolinstance.h
==============================================================================
--- head/graphics/aeskulap/files/patch-imagepool_poolinstance.h Mon Jul 4 13:24:02 2016 (r418018)
+++ head/graphics/aeskulap/files/patch-imagepool_poolinstance.h Mon Jul 4 13:24:09 2016 (r418019)
@@ -1,11 +1,47 @@
---- imagepool/poolinstance.h.orig 2012-12-13 10:27:07.000000000 +0100
-+++ imagepool/poolinstance.h 2012-12-13 10:30:33.000000000 +0100
-@@ -49,7 +49,7 @@
+--- 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 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;
Added: head/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,64 @@
+--- imagepool/poolmoveassociation.cpp.orig 2014-01-19 07:38:17 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);
Added: head/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,34 @@
+--- 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
Added: head/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,101 @@
+--- 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(¶ms, 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 */
+ }
Added: head/graphics/aeskulap/files/patch-imagepool_poolnetwork.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/aeskulap/files/patch-imagepool_poolnetwork.h Mon Jul 4 13:24:09 2016 (r418019)
@@ -0,0 +1,38 @@
+--- 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
Modified: head/graphics/aeskulap/pkg-descr
==============================================================================
--- head/graphics/aeskulap/pkg-descr Mon Jul 4 13:24:02 2016 (r418018)
+++ head/graphics/aeskulap/pkg-descr Mon Jul 4 13:24:09 2016 (r418019)
@@ -5,4 +5,4 @@ Aeskulap is able to query and fetch DICO
create a full open source replacement for commercially available DICOM
viewers.
-WWW: https://github.com/pipelka/aeskulap/
+WWW: https://github.com/pipelka/aeskulap
Modified: head/graphics/aeskulap/pkg-plist
==============================================================================
--- head/graphics/aeskulap/pkg-plist Mon Jul 4 13:24:02 2016 (r418018)
+++ head/graphics/aeskulap/pkg-plist Mon Jul 4 13:24:09 2016 (r418019)
@@ -1,18 +1,7 @@
bin/aeskulap
lib/aeskulap/libconfiguration.so
lib/aeskulap/libimagepool.so
-lib/aeskulap/libofstd.so
-lib/aeskulap/libdcmdata.so
-lib/aeskulap/libdcmnet.so
-lib/aeskulap/libdcmimgle.so
-lib/aeskulap/libdcmimage.so
-lib/aeskulap/libijg8.so
-lib/aeskulap/libijg12.so
-lib/aeskulap/libijg16.so
-lib/aeskulap/libdcmjpeg.so
-share/applications/aeskulap.desktop
%%DATADIR%%/glade/aeskulap.glade
-%%DATADIR%%/images/aeskulap.png
%%DATADIR%%/images/cursor_pan.png
%%DATADIR%%/images/cursor_windowlevel.png
%%DATADIR%%/images/cursor_zoom.png
@@ -31,9 +20,13 @@ share/applications/aeskulap.desktop
%%DATADIR%%/images/series-4x4.png
%%DATADIR%%/images/start-here.png
%%DATADIR%%/images/stock-layers-24.png
+%%DATADIR%%/images/stock-tool-color-picker-22.png
%%DATADIR%%/images/stock-tool-eraser-22.png
%%DATADIR%%/images/stock-tool-measure-22.png
%%DATADIR%%/images/stock-tool-scale-22.png
+share/applications/aeskulap.desktop
+share/icons/hicolor/64x64/apps/aeskulap.png
+share/icons/hicolor/scalable/apps/aeskulap.svg
share/locale/de/LC_MESSAGES/aeskulap.mo
share/locale/en/LC_MESSAGES/aeskulap.mo
share/locale/es/LC_MESSAGES/aeskulap.mo
More information about the svn-ports-all
mailing list