Attachment #172076 for bug #210794

View | Details | Raw Unified | Return to bug 210794
Collapse All | Expand All




# $FreeBSD: head/graphics/aeskulap/Makefile 416324 2016-06-03 16:44:58Z antoine $

PORTNAME=	aeskulap
PORTVERSION=	0.2.2.20140119
PORTREVISION=	5
CATEGORIES=	graphics
MASTER_SITES=	http://www.sourcefiles.org/Home_and_Education/Health/

MAINTAINER=	ports@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=	libdcmimage.so:devel/dcmtk \
		libglademm-2.4.so:devel/libglademm24

USE_GITHUB=	yes
GH_ACCOUNT=	pipelka
GH_TAGNAME=	ea0a119
USE_LDCONFIG=	${PREFIX}/lib/aeskulap

USES=		autoreconf desktop-file-utils gettext gmake libtool localbase \
		pkgconfig
USE_GNOME=	gconfmm26 gtkmm24 intltool
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-static
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	${PREFIX}/lib/aeskulap
INSTALLS_ICONS=	yes

GCONF_SCHEMAS=	aeskulap.schemas
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/aeskulap/*.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/aeskulap/distinfo (-2 / +2 lines)
1	SHA256 (aeskulap-0.2.1.tar.gz) = 6bbf1a26466ba190b1807e06f3d682575439668d6f11d7a5fa6b3fb1049fab50	1	SHA256 (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = a98e07b31cf6d73b0cb2e4788a04f3e9bfdca856da709f01819fba0b58d21e89
2	SIZE (aeskulap-0.2.1.tar.gz) = 4272339	2	SIZE (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = 4323281

Lines 1-10 Link Here

(-)graphics/aeskulap/files/patch-configuration_aconfiguration.cpp (-10 lines)
1	--- configuration/aconfiguration.cpp.orig 2010-07-26 18:34:00.000000000 +0000
2	+++ configuration/aconfiguration.cpp 2010-07-26 18:34:14.000000000 +0000
3	@@ -27,6 +27,7 @@
4	*/
5
6	#include "aconfiguration.h"
7	+#include <libintl.h>
8
9	namespace Aeskulap {
10




--- 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"




--- dcmtk/dcmimage/include/diargpxt.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/diargpxt.h	2012-06-08 20:02:18.531310065 +0400
@@ -91,7 +91,7 @@
                  const unsigned long planeSize,
                  const int bits)
     {                                             // not very much optimized, but no one really uses ARGB !!
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             register T2 value;
             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
--- dcmtk/dcmimage/include/dicmypxt.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dicmypxt.h	2012-06-08 20:03:41.696298705 +0400
@@ -87,7 +87,7 @@
                  const unsigned long planeSize,
                  const int bits)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             // use the number of input pixels derived from the length of the 'PixelData'
             // attribute), but not more than the size of the intermediate buffer
--- dcmtk/dcmimage/include/dicocpt.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dicocpt.h	2012-06-08 20:07:13.211298345 +0400
@@ -86,7 +86,7 @@
     inline void copy(const T *pixel[3],
                      const unsigned long offset)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             for (int j = 0; j < 3; j++)
                 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
--- dcmtk/dcmimage/include/dicoflt.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dicoflt.h	2012-06-08 20:08:27.084301025 +0400
@@ -98,14 +98,14 @@
                      const int horz,
                      const int vert)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             if (horz && vert)
-                flipHorzVert(pixel, this->Data);
+                this->flipHorzVert(pixel, this->Data);
             else if (horz)
-                flipHorz(pixel, this->Data);
+                this->flipHorz(pixel, this->Data);
             else if (vert)
-                flipVert(pixel, this->Data);
+                this->flipVert(pixel, this->Data);
         }
     }
 };
--- dcmtk/dcmimage/include/dicorot.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dicorot.h	2012-06-08 20:04:43.917297785 +0400
@@ -98,14 +98,14 @@
     inline void rotate(const T *pixel[3],
                        const int degree)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             if (degree == 90)
-                rotateRight(pixel, this->Data);
+                this->rotateRight(pixel, this->Data);
             else if (degree == 180)
-                rotateTopDown(pixel, this->Data);
+                this->rotateTopDown(pixel, this->Data);
             else  if (degree == 270)
-                rotateLeft(pixel, this->Data);
+                this->rotateLeft(pixel, this->Data);
         }
     }
 };
--- dcmtk/dcmimage/include/dicosct.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dicosct.h	2012-06-08 20:05:53.268297505 +0400
@@ -107,8 +107,8 @@
     inline void scale(const T *pixel[3],
                       const int interpolate)
     {
-        if (Init(pixel))
-            scaleData(pixel, this->Data, interpolate);
+        if (this->Init(pixel))
+            this->scaleData(pixel, this->Data, interpolate);
     }
 };
 
--- dcmtk/dcmimage/include/dihsvpxt.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dihsvpxt.h	2012-06-08 20:09:41.902298105 +0400
@@ -87,7 +87,7 @@
                  const unsigned long planeSize,
                  const int bits)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             register T2 *r = this->Data[0];
             register T2 *g = this->Data[1];
--- dcmtk/dcmimage/include/dipalpxt.h	2010-10-14 17:16:29.000000000 +0400
+++ dcmtk/dcmimage/include/dipalpxt.h	2012-06-08 20:10:20.035298545 +0400
@@ -92,7 +92,7 @@
     void convert(const T1 *pixel,
                  DiLookupTable *palette[3])
     {                                                                // can be optimized if necessary !
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             register const T1 *p = pixel;
             register T2 value = 0;
--- dcmtk/dcmimage/include/dirgbpxt.h	2010-10-14 17:16:30.000000000 +0400
+++ dcmtk/dcmimage/include/dirgbpxt.h	2012-06-08 20:11:05.988298185 +0400
@@ -87,7 +87,7 @@
                  const unsigned long planeSize,
                  const int bits)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             // use the number of input pixels derived from the length of the 'PixelData'
             // attribute), but not more than the size of the intermediate buffer
--- dcmtk/dcmimage/include/diybrpxt.h	2010-10-14 17:16:30.000000000 +0400
+++ dcmtk/dcmimage/include/diybrpxt.h	2012-06-08 20:11:45.316297345 +0400
@@ -91,7 +91,7 @@
                  const int bits,
                  const OFBool rgb)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
             // use the number of input pixels derived from the length of the 'PixelData'
--- dcmtk/dcmimage/include/diyf2pxt.h	2010-10-14 17:16:30.000000000 +0400
+++ dcmtk/dcmimage/include/diyf2pxt.h	2012-06-08 20:12:19.882296744 +0400
@@ -95,7 +95,7 @@
                  const int bits,
                  const OFBool rgb)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
             register unsigned long i;
--- dcmtk/dcmimage/include/diyp2pxt.h	2010-10-14 17:16:30.000000000 +0400
+++ dcmtk/dcmimage/include/diyp2pxt.h	2012-06-08 20:13:10.632301225 +0400
@@ -91,7 +91,7 @@
     void convert(const T1 *pixel,
                  const int bits)
     {
-        if (Init(pixel))
+        if (this->Init(pixel))
         {
             register T2 *r = this->Data[0];
             register T2 *g = this->Data[1];
--- dcmtk/dcmimgle/include/diflipt.h	2010-10-14 17:16:26.000000000 +0400
+++ dcmtk/dcmimgle/include/diflipt.h	2012-06-08 19:22:38.840297986 +0400
@@ -129,7 +129,7 @@
             else if (vert)
                 flipVert(src, dest);
             else
-                copyPixel(src, dest);
+                this->copyPixel(src, dest);
         }
     }
 
--- dcmtk/dcmimgle/include/dimoflt.h	2010-10-14 17:16:26.000000000 +0400
+++ dcmtk/dcmimgle/include/dimoflt.h	2012-06-08 19:17:52.632300786 +0400
@@ -106,11 +106,11 @@
             if (this->Data != NULL)
             {
                 if (horz && vert)
-                    flipHorzVert(&pixel, &this->Data);
+                    this->flipHorzVert(&pixel, &this->Data);
                 else if (horz)
-                    flipHorz(&pixel, &this->Data);
+                    this->flipHorz(&pixel, &this->Data);
                 else if (vert)
-                    flipVert(&pixel, &this->Data);
+                    this->flipVert(&pixel, &this->Data);
             }
         }
     }
--- dcmtk/dcmimgle/include/dimoipxt.h	2010-10-14 17:16:26.000000000 +0400
+++ dcmtk/dcmimgle/include/dimoipxt.h	2012-06-08 19:19:50.210297466 +0400
@@ -76,10 +76,10 @@
             else if ((this->Modality != NULL) && this->Modality->hasRescaling())
             {
                 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
-                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
             } else {
                 rescale(pixel);                     // "copy" or reference pixel data
-                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
             }
         }
     }
--- dcmtk/dcmimgle/include/dimorot.h	2010-10-14 17:16:26.000000000 +0400
+++ dcmtk/dcmimgle/include/dimorot.h	2012-06-08 19:18:29.177297946 +0400
@@ -105,11 +105,11 @@
             if (this->Data != NULL)
             {
                 if (degree == 90)
-                    rotateRight(&pixel, &(this->Data));
+                    this->rotateRight(&pixel, &(this->Data));
                 else if (degree == 180)
-                    rotateTopDown(&pixel, &(this->Data));
+                    this->rotateTopDown(&pixel, &(this->Data));
                 else if (degree == 270)
-                    rotateLeft(&pixel, &(this->Data));
+                    this->rotateLeft(&pixel, &(this->Data));
             }
         }
     }
--- dcmtk/dcmimgle/include/dimosct.h	2010-10-14 17:16:26.000000000 +0400
+++ dcmtk/dcmimgle/include/dimosct.h	2012-06-08 18:55:53.254300667 +0400
@@ -124,7 +124,7 @@
             {
                 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
                     OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
-                scaleData(&pixel, &this->Data, interpolate, value);
+                this->scaleData(&pixel, &this->Data, interpolate, value);
              }
         }
     }
--- dcmtk/dcmimgle/include/dirotat.h	2010-10-14 17:16:27.000000000 +0400
+++ dcmtk/dcmimgle/include/dirotat.h	2012-06-08 19:23:11.011295866 +0400
@@ -132,7 +132,7 @@
         else if (degree == 270)
             rotateLeft(src, dest);
         else
-            copyPixel(src, dest);
+            this->copyPixel(src, dest);
     }
 
 
--- dcmtk/ofstd/include/ofoset.h	2010-10-14 17:15:50.000000000 +0400
+++ dcmtk/ofstd/include/ofoset.h	2012-06-08 20:32:10.974296904 +0400
@@ -146,7 +146,7 @@
       {
         // if size equals num, we need more space
         if( this->size == this->num )
-          Resize( this->size * 2 );
+          this->Resize( this->size * 2 );
 
         // copy item
         T *newItem = new T( item );
@@ -189,7 +189,7 @@
         {
           // if size equals num, we need more space
           if( this->size == this->num )
-            Resize( this->size * 2 );
+            this->Resize( this->size * 2 );
 
           // copy item
           T *newItem = new T( item );
--- dcmtk/dcmimgle/include/discalet.h.orig	2006-03-08 10:25:21.000000000 +0100
+++ dcmtk/dcmimgle/include/discalet.h	2012-12-13 10:07:11.000000000 +0100
@@ -201,17 +201,17 @@
                     ofConsole.unlockCerr();
                 }
 #endif
-                fillPixel(dest, value);                                         // ... fill bitmap
+                this->fillPixel(dest, value);                                         // ... fill bitmap
             }
             else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y))                    // no scaling
             {
                 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
-                    copyPixel(src, dest);                                       // copying
+                    this->copyPixel(src, dest);                                       // copying
                 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
                          (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
-                    clipPixel(src, dest);                                       // clipping
+                    this->clipPixel(src, dest);                                       // clipping
                 else
-                    clipBorderPixel(src, dest, value);                          // clipping (with border)
+                    this->clipBorderPixel(src, dest, value);                          // clipping (with border)
             }
             else if ((interpolate == 1) && (this->Bits <= MAX_INTERPOLATION_BITS))    // interpolation (pbmplus)
                 interpolatePixel(src, dest);
@@ -224,7 +224,7 @@
             else if ((this->Src_X % this->Dest_X == 0) && (this->Src_Y % this->Dest_Y == 0))            // supression
                 suppressPixel(src, dest);
             else                                                                // general scaling
-                scalePixel(src, dest);
+                this->scalePixel(src, dest);
         }
     }
 




--- dcmtk/config/configure.orig	2010-08-23 17:05:16.000000000 +0200
+++ dcmtk/config/configure	2010-08-23 17:05:39.000000000 +0200
@@ -17757,8 +17757,8 @@
 	  CFLAGS="-D_POSIX_C_SOURCE=199506L $CFLAGS"
 	  ;;
 	*)
-	  CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
-	  CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
+	  CXXFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
+	  CFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
 	  ;;
     esac
 




--- dcmtk/dcmnet/include/dcompat.h.orig	2010-08-23 16:36:30.000000000 +0200
+++ dcmtk/dcmnet/include/dcompat.h	2010-08-23 16:37:57.000000000 +0200
@@ -146,9 +146,6 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
 
 END_EXTERN_C
 




--- dcmtk/dcmnet/libsrc/dcompat.cc.orig	2010-08-23 16:38:21.000000000 +0200
+++ dcmtk/dcmnet/libsrc/dcompat.cc	2010-08-23 16:38:31.000000000 +0200
@@ -113,9 +113,6 @@
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
 #endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
 #ifdef HAVE_IO_H
 #include <io.h>  /* for access() on Win32 */
 #endif




--- dcmtk/ofstd/include/ofthread.h.orig	2006-03-08 10:25:25.000000000 +0100
+++ dcmtk/ofstd/include/ofthread.h	2013-09-18 17:55:34.000000000 +0200
@@ -38,6 +38,7 @@
 #ifndef OFTHREAD_H
 #define OFTHREAD_H
 
+#include <pthread.h>
 #include "osconfig.h"
 #include "oftypes.h"  /* for class OFBool */
 #include "ofstring.h" /* for class OFString */
@@ -118,14 +119,14 @@
    *  provided in this class.
    *  @return thread ID of target thread if started, 0 otherwise.
    */
-  unsigned long threadID();
+  pthread_t threadID();
 
   /** checks if the given thread ID matches the thread ID of the thread
    *  referenced by this object.
    *  @param tID thread ID to be compared
    *  @return OFTrue if equal, OFFalse otherwise.
    */
-  OFBool equal(unsigned long tID);
+  OFBool equal(pthread_t tID);
 
   /** converts any of the error codes returned by the methods of this class
    *  into a textual description, which is written into the string object.
@@ -158,7 +159,7 @@
    *  provided in this class.
    *  @return thread ID of the calling thread.
    */
-  static unsigned long self();
+  static pthread_t self();
 
 private:
 
@@ -177,7 +178,7 @@
 #endif
 
   /** thread identifier */
-  unsigned long theThread;
+  pthread_t theThread;
 
   /** unimplemented private copy constructor */
   OFThread(const OFThread& arg);




--- dcmtk/ofstd/libsrc/ofthread.cc.orig	2010-08-23 16:27:34.000000000 +0200
+++ dcmtk/ofstd/libsrc/ofthread.cc	2010-08-23 16:32:49.000000000 +0200
@@ -145,7 +145,7 @@
 #elif defined(POSIX_INTERFACE)
   pthread_t tid=0;
   int result = pthread_create(&tid, NULL, thread_stub, OFstatic_cast(void *, this));
-  if (0 == result) theThread = static_cast<unsigned long>(tid); else theThread = 0;      
+  if (0 == result) theThread = tid; else theThread = 0;      
   return result;     
 #elif defined(SOLARIS_INTERFACE)
   thread_t tid=0;
@@ -174,21 +174,21 @@
 #endif
 }
   
-unsigned long OFThread::threadID()
+pthread_t OFThread::threadID()
 {
   return theThread;
 }
 
 #if defined(WINDOWS_INTERFACE) || defined(POSIX_INTERFACE) || defined(SOLARIS_INTERFACE)
-OFBool OFThread::equal(unsigned long tID)
+OFBool OFThread::equal(pthread_t tID)
 #else
-OFBool OFThread::equal(unsigned long /* tID */ )
+OFBool OFThread::equal(pthread_t /* tID */ )
 #endif
 {
 #ifdef WINDOWS_INTERFACE
   if (theThread == tID) return OFTrue; else return OFFalse;
 #elif defined(POSIX_INTERFACE)
-  if (pthread_equal(static_cast<pthread_t>(theThread), static_cast<pthread_t>(tID))) return OFTrue; else return OFFalse;
+  if (pthread_equal(theThread, tID)) return OFTrue; else return OFFalse;
 #elif defined(SOLARIS_INTERFACE)
   if (OFstatic_cast(thread_t, theThread) == OFstatic_cast(thread_t, tID)) return OFTrue; else return OFFalse;
 #else
@@ -209,12 +209,12 @@
   return; // will never be reached
 }
 
-unsigned long OFThread::self()
+pthread_t OFThread::self()
 {
 #ifdef WINDOWS_INTERFACE
   return OFstatic_cast(unsigned long, GetCurrentThreadId());
 #elif defined(POSIX_INTERFACE)
-  return OFstatic_cast(unsigned long, pthread_self());
+  return pthread_self();
 #elif defined(SOLARIS_INTERFACE)
   return OFstatic_cast(unsigned long, thr_self());
 #else

Lines 1-10 Link Here

(-)graphics/aeskulap/files/patch-dcmtk_ofstd_libsrc_oftime.cc (-10 lines)
1	--- dcmtk/ofstd/libsrc/oftime.cc.orig 2006-03-08 09:25:25 UTC
2	+++ dcmtk/ofstd/libsrc/oftime.cc
3	@@ -35,6 +35,7 @@
4
5	#define INCLUDE_CSTDIO
6	#define INCLUDE_CTIME
7	+#define INCLUDE_OSTREAM
8	#include "ofstdinc.h"
9
10	BEGIN_EXTERN_C




--- 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




--- 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;
                             }

Lines 1-10 Link Here

(-)graphics/aeskulap/files/patch-imagepool_imagepool.h (-10 lines)
1	--- imagepool/imagepool.h.orig 2010-08-23 17:14:59.000000000 +0200
2	+++ imagepool/imagepool.h 2010-08-23 17:15:08.000000000 +0200
3	@@ -36,6 +36,7 @@
4
5	#include <glibmm/slisthandle.h>
6	#include <string>
7	+#include <libintl.h>
8
9
10	class DcmDataset;




--- 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);




--- 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);
 }
 




--- 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




--- 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;
 




--- 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);




--- 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




--- 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 */
 	}




--- 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




--- src/Makefile.am.orig	2010-08-23 17:40:05.000000000 +0200
+++ src/Makefile.am	2010-08-23 17:40:14.000000000 +0200
@@ -25,14 +25,14 @@
 
 
 aeskulap_LDADD = \
+	$(DCMTK_LIBS) \
 	$(GTKMM_LIBS) \
 	$(GLADEMM_LIBS) \
 	$(GTHREAD_LIBS) \
 	../widgets/libgtkdicom.la \
 	../imagepool/libimagepool.la \
 	../configuration/libconfiguration.la \
-	$(GCONFMM_LIBS) \
-	$(DCMTK_LIBS)
+	$(GCONFMM_LIBS)
 
 aeskulap_LDFLAGS = \
 	-Wl,-rpath,${prefix}/lib/aeskulap




--- src/Makefile.in.orig	2010-08-23 17:39:47.000000000 +0200
+++ src/Makefile.in	2010-08-23 17:40:00.000000000 +0200
@@ -286,14 +286,14 @@
 	main.cpp
 
 aeskulap_LDADD = \
+	$(DCMTK_LIBS) \
 	$(GTKMM_LIBS) \
 	$(GLADEMM_LIBS) \
 	$(GTHREAD_LIBS) \
 	../widgets/libgtkdicom.la \
 	../imagepool/libimagepool.la \
 	../configuration/libconfiguration.la \
-	$(GCONFMM_LIBS) \
-	$(DCMTK_LIBS)
+	$(GCONFMM_LIBS)
 
 aeskulap_LDFLAGS = \
 	-Wl,-rpath,${prefix}/lib/aeskulap

Lines 1-11 Link Here

(-)graphics/aeskulap/files/patch-widgets_awindowleveltoolbutton.cpp (-11 lines)
1	--- widgets/awindowleveltoolbutton.cpp.orig 2010-07-27 14:58:36.000000000 +0000
2	+++ widgets/awindowleveltoolbutton.cpp 2010-07-27 14:58:44.000000000 +0000
3	@@ -2,6 +2,8 @@
4	#include "aiconfactory.h"
5	#include <iostream>
6
7	+#include <libintl.h>
8	+
9	namespace Aeskulap {
10
11	std::set<WindowLevelToolButton*> WindowLevelToolButton::m_widgetlist;

Lines 5-8 Link Here

(-)graphics/aeskulap/pkg-descr (-1 / +1 lines)
5	create a full open source replacement for commercially available DICOM	5	create a full open source replacement for commercially available DICOM
6	viewers.	6	viewers.
7		7
8	WWW: https://github.com/pipelka/aeskulap/	8	WWW: https://github.com/pipelka/aeskulap




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

%%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

Return to bug 210794

Lines 2-35 Link Here

(-)graphics/aeskulap/Makefile (-15 / +12 lines)
2	# $FreeBSD: head/graphics/aeskulap/Makefile 416324 2016-06-03 16:44:58Z antoine $	2	# $FreeBSD: head/graphics/aeskulap/Makefile 416324 2016-06-03 16:44:58Z antoine $
3		3
4	PORTNAME= aeskulap	4	PORTNAME= aeskulap
5	PORTVERSION= 0.2.1	5	PORTVERSION= 0.2.2.20140119
6	PORTREVISION= 5
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= http://www.sourcefiles.org/Home_and_Education/Health/
9		7
10	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Medical image viewer	9	COMMENT= Medical image viewer
12		10
13	BROKEN= unfetchable
14	DEPRECATED= Broken for more than 6 months
15	EXPIRATION_DATE= 2016-07-04
16	LICENSE= GPLv2	11	LICENSE= GPLv2
17	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
18		13
19	LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24	14	LIB_DEPENDS= libdcmimage.so:devel/dcmtk \
		15	libglademm-2.4.so:devel/libglademm24
20		16
21	USES= desktop-file-utils gettext libtool pkgconfig	17	USE_GITHUB= yes
22	USE_GNOME= gconfmm26 gtkmm24 intltool	18	GH_ACCOUNT= pipelka
23	GCONF_SCHEMAS= aeskulap.schemas	19	GH_TAGNAME= ea0a119
24	USE_LDCONFIG= ${PREFIX}/lib/aeskulap
25		20
		21	USES= autoreconf desktop-file-utils gettext gmake libtool localbase \
		22	pkgconfig
		23	USE_GNOME= gconfmm26 gtkmm24 intltool
26	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --disable-static	25	CONFIGURE_ARGS= --disable-static
28	CPPFLAGS+= -I${LOCALBASE}/include
29	LIBS+= -L${LOCALBASE}/lib
30	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip
		27	USE_LDCONFIG= ${PREFIX}/lib/aeskulap
		28	INSTALLS_ICONS= yes
31		29
32	post-install:	30	GCONF_SCHEMAS= aeskulap.schemas
33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/aeskulap/*.so
34		31
35	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/aeskulap/files/patch-configure.in (+41 lines)
	1	--- configure.in.orig 2014-01-19 07:38:17 UTC
	2	+++ configure.in
	3	@@ -104,17 +104,8 @@ DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -
	4
	5	else
	6
	7	-DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
	8	-AC_SUBST(DCMJPEG_LIBS)
	9	-
	10	-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"
	11	-DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
	12	--L../dcmtk/dcmdata/libsrc \
	13	--L../dcmtk/dcmnet/libsrc \
	14	--L../dcmtk/dcmjpeg/libsrc \
	15	--L../dcmtk/dcmimage/libsrc \
	16	--L../dcmtk/dcmimgle/libsrc \
	17	-\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
	18	+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
	19	+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -loflog -lofstd"
	20
	21	fi
	22
	23	@@ -130,8 +121,7 @@ fi
	24
	25	DCMTK_SUBDIR=""
	26	if test x"$MINGW32" = xno ; then
	27	-DCMTK_SUBDIR="dcmtk"
	28	-LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
	29	+LDFLAGS_AESKULAP_LIBS="-avoid-version"
	30	else
	31	LDFLAGS_MINGW32="-mwindows"
	32	LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
	33	@@ -161,7 +151,7 @@ packaging/win32/aeskulap.iss
	34	])
	35
	36
	37	-if test x"$MINGW32" = xno ; then
	38	+if false ; then
	39
	40	cd $srcdir/dcmtk
	41	export CFLAGS="$CFLAGS"

Lines 1-289 Link Here

(-)graphics/aeskulap/files/patch-dcmtk-clang (-289 lines)
1	--- dcmtk/dcmimage/include/diargpxt.h 2010-10-14 17:16:29.000000000 +0400
2	+++ dcmtk/dcmimage/include/diargpxt.h 2012-06-08 20:02:18.531310065 +0400
3	@@ -91,7 +91,7 @@
4	const unsigned long planeSize,
5	const int bits)
6	{ // not very much optimized, but no one really uses ARGB !!
7	- if (Init(pixel))
8	+ if (this->Init(pixel))
9	{
10	register T2 value;
11	const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
12	--- dcmtk/dcmimage/include/dicmypxt.h 2010-10-14 17:16:29.000000000 +0400
13	+++ dcmtk/dcmimage/include/dicmypxt.h 2012-06-08 20:03:41.696298705 +0400
14	@@ -87,7 +87,7 @@
15	const unsigned long planeSize,
16	const int bits)
17	{
18	- if (Init(pixel))
19	+ if (this->Init(pixel))
20	{
21	// use the number of input pixels derived from the length of the 'PixelData'
22	// attribute), but not more than the size of the intermediate buffer
23	--- dcmtk/dcmimage/include/dicocpt.h 2010-10-14 17:16:29.000000000 +0400
24	+++ dcmtk/dcmimage/include/dicocpt.h 2012-06-08 20:07:13.211298345 +0400
25	@@ -86,7 +86,7 @@
26	inline void copy(const T *pixel[3],
27	const unsigned long offset)
28	{
29	- if (Init(pixel))
30	+ if (this->Init(pixel))
31	{
32	for (int j = 0; j < 3; j++)
33	OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
34	--- dcmtk/dcmimage/include/dicoflt.h 2010-10-14 17:16:29.000000000 +0400
35	+++ dcmtk/dcmimage/include/dicoflt.h 2012-06-08 20:08:27.084301025 +0400
36	@@ -98,14 +98,14 @@
37	const int horz,
38	const int vert)
39	{
40	- if (Init(pixel))
41	+ if (this->Init(pixel))
42	{
43	if (horz && vert)
44	- flipHorzVert(pixel, this->Data);
45	+ this->flipHorzVert(pixel, this->Data);
46	else if (horz)
47	- flipHorz(pixel, this->Data);
48	+ this->flipHorz(pixel, this->Data);
49	else if (vert)
50	- flipVert(pixel, this->Data);
51	+ this->flipVert(pixel, this->Data);
52	}
53	}
54	};
55	--- dcmtk/dcmimage/include/dicorot.h 2010-10-14 17:16:29.000000000 +0400
56	+++ dcmtk/dcmimage/include/dicorot.h 2012-06-08 20:04:43.917297785 +0400
57	@@ -98,14 +98,14 @@
58	inline void rotate(const T *pixel[3],
59	const int degree)
60	{
61	- if (Init(pixel))
62	+ if (this->Init(pixel))
63	{
64	if (degree == 90)
65	- rotateRight(pixel, this->Data);
66	+ this->rotateRight(pixel, this->Data);
67	else if (degree == 180)
68	- rotateTopDown(pixel, this->Data);
69	+ this->rotateTopDown(pixel, this->Data);
70	else if (degree == 270)
71	- rotateLeft(pixel, this->Data);
72	+ this->rotateLeft(pixel, this->Data);
73	}
74	}
75	};
76	--- dcmtk/dcmimage/include/dicosct.h 2010-10-14 17:16:29.000000000 +0400
77	+++ dcmtk/dcmimage/include/dicosct.h 2012-06-08 20:05:53.268297505 +0400
78	@@ -107,8 +107,8 @@
79	inline void scale(const T *pixel[3],
80	const int interpolate)
81	{
82	- if (Init(pixel))
83	- scaleData(pixel, this->Data, interpolate);
84	+ if (this->Init(pixel))
85	+ this->scaleData(pixel, this->Data, interpolate);
86	}
87	};
88
89	--- dcmtk/dcmimage/include/dihsvpxt.h 2010-10-14 17:16:29.000000000 +0400
90	+++ dcmtk/dcmimage/include/dihsvpxt.h 2012-06-08 20:09:41.902298105 +0400
91	@@ -87,7 +87,7 @@
92	const unsigned long planeSize,
93	const int bits)
94	{
95	- if (Init(pixel))
96	+ if (this->Init(pixel))
97	{
98	register T2 *r = this->Data[0];
99	register T2 *g = this->Data[1];
100	--- dcmtk/dcmimage/include/dipalpxt.h 2010-10-14 17:16:29.000000000 +0400
101	+++ dcmtk/dcmimage/include/dipalpxt.h 2012-06-08 20:10:20.035298545 +0400
102	@@ -92,7 +92,7 @@
103	void convert(const T1 *pixel,
104	DiLookupTable *palette[3])
105	{ // can be optimized if necessary !
106	- if (Init(pixel))
107	+ if (this->Init(pixel))
108	{
109	register const T1 *p = pixel;
110	register T2 value = 0;
111	--- dcmtk/dcmimage/include/dirgbpxt.h 2010-10-14 17:16:30.000000000 +0400
112	+++ dcmtk/dcmimage/include/dirgbpxt.h 2012-06-08 20:11:05.988298185 +0400
113	@@ -87,7 +87,7 @@
114	const unsigned long planeSize,
115	const int bits)
116	{
117	- if (Init(pixel))
118	+ if (this->Init(pixel))
119	{
120	// use the number of input pixels derived from the length of the 'PixelData'
121	// attribute), but not more than the size of the intermediate buffer
122	--- dcmtk/dcmimage/include/diybrpxt.h 2010-10-14 17:16:30.000000000 +0400
123	+++ dcmtk/dcmimage/include/diybrpxt.h 2012-06-08 20:11:45.316297345 +0400
124	@@ -91,7 +91,7 @@
125	const int bits,
126	const OFBool rgb)
127	{
128	- if (Init(pixel))
129	+ if (this->Init(pixel))
130	{
131	const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
132	// use the number of input pixels derived from the length of the 'PixelData'
133	--- dcmtk/dcmimage/include/diyf2pxt.h 2010-10-14 17:16:30.000000000 +0400
134	+++ dcmtk/dcmimage/include/diyf2pxt.h 2012-06-08 20:12:19.882296744 +0400
135	@@ -95,7 +95,7 @@
136	const int bits,
137	const OFBool rgb)
138	{
139	- if (Init(pixel))
140	+ if (this->Init(pixel))
141	{
142	const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
143	register unsigned long i;
144	--- dcmtk/dcmimage/include/diyp2pxt.h 2010-10-14 17:16:30.000000000 +0400
145	+++ dcmtk/dcmimage/include/diyp2pxt.h 2012-06-08 20:13:10.632301225 +0400
146	@@ -91,7 +91,7 @@
147	void convert(const T1 *pixel,
148	const int bits)
149	{
150	- if (Init(pixel))
151	+ if (this->Init(pixel))
152	{
153	register T2 *r = this->Data[0];
154	register T2 *g = this->Data[1];
155	--- dcmtk/dcmimgle/include/diflipt.h 2010-10-14 17:16:26.000000000 +0400
156	+++ dcmtk/dcmimgle/include/diflipt.h 2012-06-08 19:22:38.840297986 +0400
157	@@ -129,7 +129,7 @@
158	else if (vert)
159	flipVert(src, dest);
160	else
161	- copyPixel(src, dest);
162	+ this->copyPixel(src, dest);
163	}
164	}
165
166	--- dcmtk/dcmimgle/include/dimoflt.h 2010-10-14 17:16:26.000000000 +0400
167	+++ dcmtk/dcmimgle/include/dimoflt.h 2012-06-08 19:17:52.632300786 +0400
168	@@ -106,11 +106,11 @@
169	if (this->Data != NULL)
170	{
171	if (horz && vert)
172	- flipHorzVert(&pixel, &this->Data);
173	+ this->flipHorzVert(&pixel, &this->Data);
174	else if (horz)
175	- flipHorz(&pixel, &this->Data);
176	+ this->flipHorz(&pixel, &this->Data);
177	else if (vert)
178	- flipVert(&pixel, &this->Data);
179	+ this->flipVert(&pixel, &this->Data);
180	}
181	}
182	}
183	--- dcmtk/dcmimgle/include/dimoipxt.h 2010-10-14 17:16:26.000000000 +0400
184	+++ dcmtk/dcmimgle/include/dimoipxt.h 2012-06-08 19:19:50.210297466 +0400
185	@@ -76,10 +76,10 @@
186	else if ((this->Modality != NULL) && this->Modality->hasRescaling())
187	{
188	rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
189	- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
190	+ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
191	} else {
192	rescale(pixel); // "copy" or reference pixel data
193	- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
194	+ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
195	}
196	}
197	}
198	--- dcmtk/dcmimgle/include/dimorot.h 2010-10-14 17:16:26.000000000 +0400
199	+++ dcmtk/dcmimgle/include/dimorot.h 2012-06-08 19:18:29.177297946 +0400
200	@@ -105,11 +105,11 @@
201	if (this->Data != NULL)
202	{
203	if (degree == 90)
204	- rotateRight(&pixel, &(this->Data));
205	+ this->rotateRight(&pixel, &(this->Data));
206	else if (degree == 180)
207	- rotateTopDown(&pixel, &(this->Data));
208	+ this->rotateTopDown(&pixel, &(this->Data));
209	else if (degree == 270)
210	- rotateLeft(&pixel, &(this->Data));
211	+ this->rotateLeft(&pixel, &(this->Data));
212	}
213	}
214	}
215	--- dcmtk/dcmimgle/include/dimosct.h 2010-10-14 17:16:26.000000000 +0400
216	+++ dcmtk/dcmimgle/include/dimosct.h 2012-06-08 18:55:53.254300667 +0400
217	@@ -124,7 +124,7 @@
218	{
219	const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
220	OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
221	- scaleData(&pixel, &this->Data, interpolate, value);
222	+ this->scaleData(&pixel, &this->Data, interpolate, value);
223	}
224	}
225	}
226	--- dcmtk/dcmimgle/include/dirotat.h 2010-10-14 17:16:27.000000000 +0400
227	+++ dcmtk/dcmimgle/include/dirotat.h 2012-06-08 19:23:11.011295866 +0400
228	@@ -132,7 +132,7 @@
229	else if (degree == 270)
230	rotateLeft(src, dest);
231	else
232	- copyPixel(src, dest);
233	+ this->copyPixel(src, dest);
234	}
235
236
237	--- dcmtk/ofstd/include/ofoset.h 2010-10-14 17:15:50.000000000 +0400
238	+++ dcmtk/ofstd/include/ofoset.h 2012-06-08 20:32:10.974296904 +0400
239	@@ -146,7 +146,7 @@
240	{
241	// if size equals num, we need more space
242	if( this->size == this->num )
243	- Resize( this->size * 2 );
244	+ this->Resize( this->size * 2 );
245
246	// copy item
247	T *newItem = new T( item );
248	@@ -189,7 +189,7 @@
249	{
250	// if size equals num, we need more space
251	if( this->size == this->num )
252	- Resize( this->size * 2 );
253	+ this->Resize( this->size * 2 );
254
255	// copy item
256	T *newItem = new T( item );
257	--- dcmtk/dcmimgle/include/discalet.h.orig 2006-03-08 10:25:21.000000000 +0100
258	+++ dcmtk/dcmimgle/include/discalet.h 2012-12-13 10:07:11.000000000 +0100
259	@@ -201,17 +201,17 @@
260	ofConsole.unlockCerr();
261	}
262	#endif
263	- fillPixel(dest, value); // ... fill bitmap
264	+ this->fillPixel(dest, value); // ... fill bitmap
265	}
266	else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
267	{
268	if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
269	- copyPixel(src, dest); // copying
270	+ this->copyPixel(src, dest); // copying
271	else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
272	(Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
273	- clipPixel(src, dest); // clipping
274	+ this->clipPixel(src, dest); // clipping
275	else
276	- clipBorderPixel(src, dest, value); // clipping (with border)
277	+ this->clipBorderPixel(src, dest, value); // clipping (with border)
278	}
279	else if ((interpolate == 1) && (this->Bits <= MAX_INTERPOLATION_BITS)) // interpolation (pbmplus)
280	interpolatePixel(src, dest);
281	@@ -224,7 +224,7 @@
282	else if ((this->Src_X % this->Dest_X == 0) && (this->Src_Y % this->Dest_Y == 0)) // supression
283	suppressPixel(src, dest);
284	else // general scaling
285	- scalePixel(src, dest);
286	+ this->scalePixel(src, dest);
287	}
288	}
289

Lines 1-13 Link Here

(-)graphics/aeskulap/files/patch-dcmtk-config_configure (-13 lines)
1	--- dcmtk/config/configure.orig 2010-08-23 17:05:16.000000000 +0200
2	+++ dcmtk/config/configure 2010-08-23 17:05:39.000000000 +0200
3	@@ -17757,8 +17757,8 @@
4	CFLAGS="-D_POSIX_C_SOURCE=199506L $CFLAGS"
5	;;
6	*)
7	- CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
8	- CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
9	+ CXXFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
10	+ CFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
11	;;
12	esac
13

Lines 1-12 Link Here

(-)graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h (-12 lines)
1	--- dcmtk/dcmnet/include/dcompat.h.orig 2010-08-23 16:36:30.000000000 +0200
2	+++ dcmtk/dcmnet/include/dcompat.h 2010-08-23 16:37:57.000000000 +0200
3	@@ -146,9 +146,6 @@
4	#ifdef HAVE_SYS_SELECT_H
5	#include <sys/select.h>
6	#endif
7	-#ifdef HAVE_SYS_FILE_H
8	-#include <sys/file.h>
9	-#endif
10
11	END_EXTERN_C
12

Lines 1-12 Link Here

(-)graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc (-12 lines)
1	--- dcmtk/dcmnet/libsrc/dcompat.cc.orig 2010-08-23 16:38:21.000000000 +0200
2	+++ dcmtk/dcmnet/libsrc/dcompat.cc 2010-08-23 16:38:31.000000000 +0200
3	@@ -113,9 +113,6 @@
4	#ifdef HAVE_SYS_UTSNAME_H
5	#include <sys/utsname.h>
6	#endif
7	-#ifdef HAVE_SYS_FILE_H
8	-#include <sys/file.h>
9	-#endif
10	#ifdef HAVE_IO_H
11	#include <io.h> /* for access() on Win32 */
12	#endif

Lines 1-45 Link Here

(-)graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h (-45 lines)
1	--- dcmtk/ofstd/include/ofthread.h.orig 2006-03-08 10:25:25.000000000 +0100
2	+++ dcmtk/ofstd/include/ofthread.h 2013-09-18 17:55:34.000000000 +0200
3	@@ -38,6 +38,7 @@
4	#ifndef OFTHREAD_H
5	#define OFTHREAD_H
6
7	+#include <pthread.h>
8	#include "osconfig.h"
9	#include "oftypes.h" /* for class OFBool */
10	#include "ofstring.h" /* for class OFString */
11	@@ -118,14 +119,14 @@
12	* provided in this class.
13	* @return thread ID of target thread if started, 0 otherwise.
14	*/
15	- unsigned long threadID();
16	+ pthread_t threadID();
17
18	/** checks if the given thread ID matches the thread ID of the thread
19	* referenced by this object.
20	* @param tID thread ID to be compared
21	* @return OFTrue if equal, OFFalse otherwise.
22	*/
23	- OFBool equal(unsigned long tID);
24	+ OFBool equal(pthread_t tID);
25
26	/** converts any of the error codes returned by the methods of this class
27	* into a textual description, which is written into the string object.
28	@@ -158,7 +159,7 @@
29	* provided in this class.
30	* @return thread ID of the calling thread.
31	*/
32	- static unsigned long self();
33	+ static pthread_t self();
34
35	private:
36
37	@@ -177,7 +178,7 @@
38	#endif
39
40	/** thread identifier */
41	- unsigned long theThread;
42	+ pthread_t theThread;
43
44	/** unimplemented private copy constructor */
45	OFThread(const OFThread& arg);

Lines 1-52 Link Here

(-)graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc (-52 lines)
1	--- dcmtk/ofstd/libsrc/ofthread.cc.orig 2010-08-23 16:27:34.000000000 +0200
2	+++ dcmtk/ofstd/libsrc/ofthread.cc 2010-08-23 16:32:49.000000000 +0200
3	@@ -145,7 +145,7 @@
4	#elif defined(POSIX_INTERFACE)
5	pthread_t tid=0;
6	int result = pthread_create(&tid, NULL, thread_stub, OFstatic_cast(void *, this));
7	- if (0 == result) theThread = static_cast<unsigned long>(tid); else theThread = 0;
8	+ if (0 == result) theThread = tid; else theThread = 0;
9	return result;
10	#elif defined(SOLARIS_INTERFACE)
11	thread_t tid=0;
12	@@ -174,21 +174,21 @@
13	#endif
14	}
15
16	-unsigned long OFThread::threadID()
17	+pthread_t OFThread::threadID()
18	{
19	return theThread;
20	}
21
22	#if defined(WINDOWS_INTERFACE) \|\| defined(POSIX_INTERFACE) \|\| defined(SOLARIS_INTERFACE)
23	-OFBool OFThread::equal(unsigned long tID)
24	+OFBool OFThread::equal(pthread_t tID)
25	#else
26	-OFBool OFThread::equal(unsigned long /* tID */ )
27	+OFBool OFThread::equal(pthread_t /* tID */ )
28	#endif
29	{
30	#ifdef WINDOWS_INTERFACE
31	if (theThread == tID) return OFTrue; else return OFFalse;
32	#elif defined(POSIX_INTERFACE)
33	- if (pthread_equal(static_cast<pthread_t>(theThread), static_cast<pthread_t>(tID))) return OFTrue; else return OFFalse;
34	+ if (pthread_equal(theThread, tID)) return OFTrue; else return OFFalse;
35	#elif defined(SOLARIS_INTERFACE)
36	if (OFstatic_cast(thread_t, theThread) == OFstatic_cast(thread_t, tID)) return OFTrue; else return OFFalse;
37	#else
38	@@ -209,12 +209,12 @@
39	return; // will never be reached
40	}
41
42	-unsigned long OFThread::self()
43	+pthread_t OFThread::self()
44	{
45	#ifdef WINDOWS_INTERFACE
46	return OFstatic_cast(unsigned long, GetCurrentThreadId());
47	#elif defined(POSIX_INTERFACE)
48	- return OFstatic_cast(unsigned long, pthread_self());
49	+ return pthread_self();
50	#elif defined(SOLARIS_INTERFACE)
51	return OFstatic_cast(unsigned long, thr_self());
52	#else

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_dicomdir.cpp (+89 lines)
		1	--- imagepool/dicomdir.cpp.orig 2014-01-19 07:38:17 UTC
		2	+++ imagepool/dicomdir.cpp
		3	@@ -43,7 +43,7 @@ namespace ImagePool {
		4	DcmDicomDir dir(dicomdir.c_str());
		5	OFCondition ret;
		6
		7	- if ( (ret=dir.error()) != ECC_Normal ) {
		8	+ if ( (ret=dir.error()) != EC_Normal ) {
		9	std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
		10	return;
		11	}
		12	@@ -151,21 +151,21 @@ namespace ImagePool {
		13	DcmDataset study;
		14	DcmElement *el;
		15
		16	- if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
		17	+ if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
		18	study.insert(el);
		19	- if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
		20	+ if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
		21	study.insert(el);
		22	- if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
		23	+ if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == EC_Normal )
		24	study.insert(el);
		25	- if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
		26	+ if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == EC_Normal )
		27	study.insert(el);
		28	- if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
		29	+ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
		30	study.insert(el);
		31	- if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
		32	+ if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == EC_Normal )
		33	study.insert(el);
		34	- if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
		35	+ if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == EC_Normal )
		36	study.insert(el);
		37	- if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
		38	+ if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == EC_Normal )
		39	study.insert(el);
		40	resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
		41	}
		42	@@ -179,7 +179,7 @@ namespace ImagePool {
		43	DcmDirectoryRecord *seriesRec;
		44	OFCondition ret;
		45
		46	- if ( dir.error() != ECC_Normal ) {
		47	+ if ( dir.error() != EC_Normal ) {
		48	std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
		49	return;
		50	}
		51	@@ -191,7 +191,7 @@ namespace ImagePool {
		52	for ( studyRec=patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
		53	if ( studyRec->getRecordType()==ERT_Study ) {
		54	OFString uid;
		55	- if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
		56	+ if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
		57	if ( studyinstanceuid == uid.c_str() ) {
		58	open_dicomdir_series_result(dicomdir, patRec, studyRec, resultslot);
		59	return;
		60	@@ -221,21 +221,21 @@ namespace ImagePool {
		61	DcmDataset series;
		62	DcmElement *el;
		63
		64	- if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
65	+ if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
66	series.insert(el);
67	- if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
68	+ if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == EC_Normal )
69	series.insert(el);
70	- if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
71	+ if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
72	series.insert(el);
73	- if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
74	+ if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == EC_Normal )
75	series.insert(el);
76	- if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
77	+ if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == EC_Normal )
78	series.insert(el);
79	- if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
80	+ if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == EC_Normal )
81	series.insert(el);
82	- if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
83	+ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
84	series.insert(el);
85	- if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
86	+ if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == EC_Normal )
87	series.insert(el);
88
89	// Count Related SOP Instances

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp (+41 lines)
	1	--- imagepool/dicomdirloader.cpp.orig 2014-01-19 07:38:17 UTC
	2	+++ imagepool/dicomdirloader.cpp
	3	@@ -42,7 +42,7 @@ namespace ImagePool {
	4	return false;
	5	}
	6
	7	- if ( (ret=dir.error()) != ECC_Normal ) {
	8	+ if ( (ret=dir.error()) != EC_Normal ) {
	9	std::cout << "DicomdirLoader::load Error: " << ret.text() << std::endl;
	10	return false;
	11	}
	12	@@ -80,7 +80,7 @@ namespace ImagePool {
	13	for ( studyRec = patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
	14	if ( studyRec->getRecordType()==ERT_Study ) {
	15	OFString uid;
	16	- if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
	17	+ if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
	18	if ( studyinstanceuid == uid.c_str() )
	19	return studyRec;
	20	}
	21	@@ -107,9 +107,9 @@ namespace ImagePool {
	22	while ( seriesRec ) {
	23	OFString modality;
	24
	25	- if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == ECC_Normal ) {
	26	+ if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == EC_Normal ) {
	27	OFString seriesinstanceuid;
	28	- if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != ECC_Normal ) {
	29	+ if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != EC_Normal ) {
	30	seriesRec = studyRec->nextSub(seriesRec);
	31	continue;
	32	}
	33	@@ -124,7 +124,7 @@ namespace ImagePool {
	34	switch ( sopRec->getRecordType() ) {
	35	case ERT_Image:
	36	case ERT_StoredPrint:
	37	- if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=ECC_Normal ) {
	38	+ if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=EC_Normal ) {
	39	sopRec = seriesRec->nextSub(sopRec);
	40	continue;
	41	}

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolassociation.cpp (+109 lines)
		1	--- imagepool/poolassociation.cpp.orig 2014-01-19 07:38:17 UTC
		2	+++ imagepool/poolassociation.cpp
		3	@@ -72,24 +72,24 @@ Association::~Association()
		4	Drop();
		5	}
		6
		7	-CONDITION Association::Drop(CONDITION cond) {
		8	+OFCondition Association::Drop(OFCondition cond) {
		9	// tear down association
		10	- if(cond == DIMSE_NORMAL) {
		11	+ if(cond == EC_Normal) {
		12	/* release association */
		13	cond = ASC_releaseAssociation(assoc);
		14	}
		15	- else if(cond == DIMSE_PEERREQUESTEDRELEASE) {
		16	+ else if(cond == DUL_PEERREQUESTEDRELEASE) {
		17	cond = ASC_abortAssociation(assoc);
		18	- if (SUCCESS(cond)) {
		19	+ if (cond.good()) {
		20	return cond;
		21	}
		22	}
		23	- else if(cond == DIMSE_PEERABORTEDASSOCIATION) {
		24	+ else if(cond == DUL_PEERABORTEDASSOCIATION) {
		25	return cond;
		26	}
		27	else {
		28	cond = ASC_abortAssociation(assoc);
		29	- if (SUCCESS(cond)) {
		30	+ if (cond.good()) {
		31	return cond;
		32	}
		33	}
		34	@@ -99,7 +99,7 @@ CONDITION Association::Drop(CONDITION co
		35	}
		36
		37	void Association::Destroy() {
		38	- CONDITION cond = ASC_destroyAssociation(&assoc);
		39	+ OFCondition cond = ASC_destroyAssociation(&assoc);
		40
		41	dcmNet = NULL;
		42	assoc = NULL;
		43	@@ -110,8 +110,8 @@ void Association::Destroy() {
		44
		45	}
		46
		47	-CONDITION Association::SendObject(DcmDataset *dataset) {
		48	- CONDITION cond;
		49	+OFCondition Association::SendObject(DcmDataset *dataset) {
		50	+ OFCondition cond;
		51	DcmDataset *statusDetail = NULL;
		52
		53	T_DIMSE_C_StoreRQ req;
		54	@@ -163,7 +163,7 @@ CONDITION Association::SendObject(DcmDat
		55	if(opt_oxferSyn.getXfer() != ori_oxferSyn) {
		56	std::cout << "Converting object to accepted transfer-syntax " << opt_oxferSyn.getXferName() << std::endl;
		57
		58	- CONDITION cond;
		59	+ OFCondition cond;
		60	// create RepresentationParameter
		61	DJ_RPLossless rp_lossless(6, 0);
		62	DJ_RPLossy rp_lossy(m_CompressionQuality);
		63	@@ -172,10 +172,18 @@ CONDITION Association::SendObject(DcmDat
		64
65	const DcmRepresentationParameter *rp = NULL;
66
67	+#if 0
68	+ if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1 \|\| opt_oxferSyn.getXfer() == EXS_JPEGProcess14) {
69	+#else
70	if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1TransferSyntax \|\| opt_oxferSyn.getXfer() == EXS_JPEGProcess14TransferSyntax) {
71	+#endif
72	rp = &rp_lossless;
73	}
74	+#if 0
75	+ else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1 \|\| opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4) {
76	+#else
77	else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1TransferSyntax \|\| opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4TransferSyntax) {
78	+#endif
79	rp = &rp_lossy;
80	}
81
82	@@ -232,15 +240,15 @@ CONDITION Association::SendObject(DcmDat
83	delete statusDetail;
84	}
85
86	- if (cond != DIMSE_NORMAL)
87	+ if (cond != EC_Normal)
88	{
89	return cond;
90	}
91
92	- return (rsp.DimseStatus == STATUS_Success) ? DIMSE_NORMAL : DIMSE_BADDATA;
93	+ return (rsp.DimseStatus == STATUS_Success) ? EC_Normal : DIMSE_BADDATA;
94	}
95
96	-CONDITION Association::SendObject(DcmFileFormat *dcmff)
97	+OFCondition Association::SendObject(DcmFileFormat *dcmff)
98	{
99	DcmDataset* dataset = dcmff->getDataset();
100	return SendObject(dataset);
101	@@ -334,7 +342,7 @@ Network* Association::GetNetwork()
102	return dcmNet;
103	}
104
105	-CONDITION Association::Connect(Network *network, int lossy)
106	+OFCondition Association::Connect(Network *network, int lossy)
107	{
108	dcmNet = network;
109	return network->ConnectAssociation(this, lossy);

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp (+22 lines)
	1	--- imagepool/poolfindassociation.cpp.orig 2014-01-19 07:38:17 UTC
	2	+++ imagepool/poolfindassociation.cpp
	3	@@ -40,8 +40,8 @@ FindAssociation::~FindAssociation() {
	4	DeleteResultStack();
	5	}
	6
	7	-CONDITION FindAssociation::findSCU(T_ASC_Association assoc, DcmDataset query) {
	8	- CONDITION cond;
	9	+OFCondition FindAssociation::findSCU(T_ASC_Association assoc, DcmDataset query) {
	10	+ OFCondition cond;
	11	DIC_US msgId = assoc->nextMsgID++;
	12	T_ASC_PresentationContextID presId;
	13	T_DIMSE_C_FindRQ req;
	14	@@ -100,7 +100,7 @@ void FindAssociation::findCallback(void*
	15	caller->OnResponseReceived(response);
	16	}
	17
	18	-CONDITION FindAssociation::SendObject(DcmDataset *dataset) {
	19	+OFCondition FindAssociation::SendObject(DcmDataset *dataset) {
	20	return findSCU(assoc, dataset);
	21	}
	22

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolfindassociation.h (+20 lines)
	1	--- imagepool/poolfindassociation.h.orig 2014-01-19 07:38:17 UTC
	2	+++ imagepool/poolfindassociation.h
	3	@@ -45,7 +45,7 @@ public:
	4	/**
	5	Send a query object (C-Find) through association
	6	*/
	7	- CONDITION SendObject(DcmDataset *dataset);
	8	+ OFCondition SendObject(DcmDataset *dataset);
	9
	10	/**
	11	Get the result stack of the last query
	12	@@ -88,7 +88,7 @@ private:
	13	/**
	14	C-Find service class user
	15	*/
	16	- CONDITION findSCU(T_ASC_Association * assoc, DcmDataset * query);
	17	+ OFCondition findSCU(T_ASC_Association * assoc, DcmDataset * query);
	18
	19	/**
	20	Callback function for C-Find service class user

Lines 1-11 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolinstance.h (-4 / +40 lines)
1	--- imagepool/poolinstance.h.orig 2012-12-13 10:27:07.000000000 +0100	1	--- imagepool/poolinstance.h.orig 2014-01-19 07:38:17 UTC
2	+++ imagepool/poolinstance.h 2012-12-13 10:30:33.000000000 +0100	2	+++ imagepool/poolinstance.h
3	@@ -49,7 +49,7 @@	3	@@ -50,9 +50,9 @@ protected:
4		4
5	Instance(const std::string& sopinstanceuid);	5	Instance(const std::string& sopinstanceuid);
6		6
7	- friend void ImagePool::remove_instance(const Glib::RefPtr<ImagePool::Instance>&);	7	- friend void ImagePool::remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
8	+ friend void remove_instance(const Glib::RefPtr<ImagePool::Instance>&);	8	+ friend void remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
9		9
10	friend class ImagePool::Loader;	10	- friend class ImagePool::Loader;
		11	+ friend class Loader;
		12
		13	public:
		14
		15	@@ -131,9 +131,9 @@ public:
		16
		17	int instancenumber();
		18
		19	- const Glib::RefPtr<ImagePool::Series>& series();
		20	+ const Glib::RefPtr<Series>& series();
		21
		22	- const Glib::RefPtr<ImagePool::Study>& study();
		23	+ const Glib::RefPtr<Study>& study();
		24
		25	const std::string& date();
		26
		27	@@ -176,7 +176,7 @@ public:
		28
		29	bool has_3d_information();
		30
		31	- static Glib::RefPtr<ImagePool::Instance> create(DcmDataset* dset);
		32	+ static Glib::RefPtr<Instance> create(DcmDataset* dset);
		33
		34	int studyrelatedinstances();
		35
		36	@@ -248,9 +248,9 @@ private:
		37
		38	std::string m_modality;
		39
		40	- Glib::RefPtr<ImagePool::Series> m_series;
		41	+ Glib::RefPtr<Series> m_series;
		42
		43	- Glib::RefPtr<ImagePool::Study> m_study;
		44	+ Glib::RefPtr<Study> m_study;
		45
		46	std::string m_date;
11		47

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp (+64 lines)
	1	--- imagepool/poolmoveassociation.cpp.orig 2014-01-19 07:38:17 UTC
	2	+++ imagepool/poolmoveassociation.cpp
	3	@@ -68,7 +68,7 @@ void MoveAssociation::Create(const std::
	4	Association::Create(title, peer, port, ouraet, abstractSyntax);
	5	}
	6
	7	-CONDITION MoveAssociation::SendObject(DcmDataset *dataset) {
	8	+OFCondition MoveAssociation::SendObject(DcmDataset *dataset) {
	9	return moveSCU(dataset);
	10	}
	11
	12	@@ -79,8 +79,8 @@ void MoveAssociation::OnAddPresentationC
	13	ASC_addPresentationContext(params, 5, m_abstractSyntax, mpeg_transfer, DIM_OF(mpeg_transfer));
	14	}
	15
	16	-CONDITION MoveAssociation::moveSCU(DcmDataset *pdset) {
	17	- CONDITION cond;
	18	+OFCondition MoveAssociation::moveSCU(DcmDataset *pdset) {
	19	+ OFCondition cond;
	20	T_ASC_PresentationContextID presId;
	21	T_DIMSE_C_MoveRQ req;
	22	T_DIMSE_C_MoveRSP rsp;
	23	@@ -161,8 +161,8 @@ void MoveAssociation::subOpCallback(void
	24	}
	25	}
	26
	27	-CONDITION MoveAssociation::acceptSubAssoc(T_ASC_Network aNet, T_ASC_Association *assoc) {
	28	- CONDITION cond = ASC_NORMAL;
	29	+OFCondition MoveAssociation::acceptSubAssoc(T_ASC_Network aNet, T_ASC_Association *assoc) {
	30	+ OFCondition cond = EC_Normal;
	31	const char* knownAbstractSyntaxes[] = { UID_VerificationSOPClass };
	32	const char* transferSyntaxes[] = { UID_JPEGProcess14SV1TransferSyntax, NULL, NULL, UID_LittleEndianImplicitTransferSyntax, UID_MPEG2MainProfileAtMainLevelTransferSyntax };
	33
	34	@@ -222,7 +222,7 @@ CONDITION MoveAssociation::acceptSubAsso
	35
	36	}
	37
	38	-CONDITION MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
	39	+OFCondition MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
	40	T_DIMSE_Message msg;
	41	T_ASC_PresentationContextID presID;
	42
	43	@@ -269,8 +269,8 @@ CONDITION MoveAssociation::subOpSCP(T_AS
	44	return cond;
	45	}
	46
	47	-CONDITION MoveAssociation::storeSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID) {
	48	- CONDITION cond;
	49	+OFCondition MoveAssociation::storeSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID) {
	50	+ OFCondition cond;
	51	T_DIMSE_C_StoreRQ* req;
	52	DcmDataset *dset = new DcmDataset;
	53
	54	@@ -328,8 +328,8 @@ void MoveAssociation::storeSCPCallback(v
	55
	56	}
	57
	58	-CONDITION MoveAssociation::echoSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID) {
	59	- CONDITION cond;
	60	+OFCondition MoveAssociation::echoSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID) {
	61	+ OFCondition cond;
	62
	63	// the echo succeeded !!
	64	cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h (+34 lines)
	1	--- imagepool/poolmoveassociation.h.orig 2014-01-19 07:38:17 UTC
	2	+++ imagepool/poolmoveassociation.h
	3	@@ -39,7 +39,7 @@ public:
	4
	5	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/);
	6
	7	- CONDITION SendObject(DcmDataset *dataset);
	8	+ OFCondition SendObject(DcmDataset *dataset);
	9
	10	protected:
	11
	12	@@ -62,17 +62,17 @@ private:
	13	MoveAssociation* pCaller;
	14	} StoreCallbackInfo;
	15
	16	- CONDITION moveSCU(DcmDataset *pdset);
	17	+ OFCondition moveSCU(DcmDataset *pdset);
	18	static void moveCallback(void callbackData, T_DIMSE_C_MoveRQ request, int responseCount, T_DIMSE_C_MoveRSP *response);
	19
	20	- CONDITION acceptSubAssoc(T_ASC_Network aNet, T_ASC_Association *assoc);
	21	- CONDITION subOpSCP(T_ASC_Association **subAssoc);
	22	+ OFCondition acceptSubAssoc(T_ASC_Network aNet, T_ASC_Association *assoc);
	23	+ OFCondition subOpSCP(T_ASC_Association **subAssoc);
	24	static void subOpCallback(void * pCaller, T_ASC_Network aNet, T_ASC_Association *subAssoc);
	25
	26	- CONDITION storeSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID);
	27	+ OFCondition storeSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID);
	28	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);
	29
	30	- CONDITION echoSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID);
	31	+ OFCondition echoSCP(T_ASC_Association assoc, T_DIMSE_Message msg, T_ASC_PresentationContextID presID);
	32	};
	33
	34	#endif // IMAGEPOOL_MOVEASSOCIATION_H

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp (+101 lines)
		1	--- imagepool/poolnetwork.cpp.orig 2014-01-19 07:38:17 UTC
		2	+++ imagepool/poolnetwork.cpp
		3	@@ -42,8 +42,8 @@ Network::~Network() {
		4	DropNetwork();
		5	}
		6
		7	-CONDITION Network::ConnectAssociation(Association* assoc, int lossy) {
		8	- CONDITION cond;
		9	+OFCondition Network::ConnectAssociation(Association* assoc, int lossy) {
		10	+ OFCondition cond;
		11
		12	cond = ASC_ConnectAssociation(
		13	assoc,
		14	@@ -54,7 +54,7 @@ CONDITION Network::ConnectAssociation(As
		15	assoc->m_abstractSyntax,
		16	lossy);
		17
		18	- if (!SUCCESS(cond)) {
		19	+ if (!cond.good()) {
		20	assoc->Drop(cond);
		21	return cond;
		22	}
		23	@@ -65,7 +65,7 @@ CONDITION Network::ConnectAssociation(As
		24	return cond;
		25	}
		26
		27	-CONDITION Network::InitializeNetwork(int timeout, int port) {
		28	+OFCondition Network::InitializeNetwork(int timeout, int port) {
		29	#ifdef _WIN32
		30	WORD wVersionRequested;
		31	WSADATA wsaData;
		32	@@ -78,9 +78,9 @@ CONDITION Network::InitializeNetwork(int
		33	return ASC_initializeNetwork(NET_ACCEPTORREQUESTOR, port, timeout, &net);
		34	}
		35
		36	-CONDITION Network::DropNetwork()
		37	+OFCondition Network::DropNetwork()
		38	{
		39	- CONDITION cond = ASC_dropNetwork(&net);
		40	+ OFCondition cond = ASC_dropNetwork(&net);
		41	net = NULL;
		42
		43	#ifdef _WIN32
		44	@@ -90,9 +90,9 @@ CONDITION Network::DropNetwork()
		45	return cond;
		46	}
		47
		48	-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)
		49	+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)
		50	{
		51	- CONDITION cond;
		52	+ OFCondition cond;
		53	T_ASC_Parameters *params;
		54	bool bProposeCompression = assoc->GetProposeCompression();
		55
		56	@@ -100,7 +100,7 @@ CONDITION Network::ASC_ConnectAssociatio
		57	DIC_NODENAME localHost;
		58
		59	cond = ASC_createAssociationParameters(&params, ASC_DEFAULTMAXPDU);
		60	- if (!SUCCESS(cond))
		61	+ if (!cond.good())
		62	{
		63	return cond;
		64	}
65	@@ -155,9 +155,9 @@ CONDITION Network::ASC_ConnectAssociatio
66
67	/* create association */
68	cond = ASC_requestAssociation(net, params, &(assoc->assoc));
69	- if (cond != ASC_NORMAL)
70	+ if (cond != EC_Normal)
71	{
72	- if (cond == ASC_ASSOCIATIONREJECTED)
73	+ if (cond == DUL_ASSOCIATIONREJECTED)
74	{
75	T_ASC_RejectParameters rej;
76
77	@@ -178,12 +178,12 @@ CONDITION Network::ASC_ConnectAssociatio
78	return cond;
79	}
80
81	- return ASC_NORMAL;
82	+ return EC_Normal;
83	}
84
85	-CONDITION Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy)
86	+OFCondition Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy)
87	{
88	- CONDITION cond = ASC_NORMAL;
89	+ OFCondition cond = EC_Normal;
90	int i;
91	int pid = 1;
92
93	@@ -232,7 +232,7 @@ CONDITION Network::addAllStoragePresenta
94	}
95
96	/* the array of Storage SOP Class UIDs comes from dcuid.h */
97	- for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && SUCCESS(cond); i++) {
98	+ for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && cond.good(); i++) {
99	cond = ASC_addPresentationContext(params, pid, dcmAllStorageSOPClassUIDs[i], transferSyntaxes, transferSyntaxes_count);
100	pid += 2; /* only odd presentation context id's */
101	}

Line 0 Link Here

(-)graphics/aeskulap/files/patch-imagepool_poolnetwork.h (+38 lines)
	1	--- imagepool/poolnetwork.h.orig 2014-01-19 07:38:17 UTC
	2	+++ imagepool/poolnetwork.h
	3	@@ -43,17 +43,17 @@ public:
	4	/**
	5	Initialize the dicom network
	6	*/
	7	- CONDITION InitializeNetwork(int timeout=20, int port = 0);
	8	+ OFCondition InitializeNetwork(int timeout=20, int port = 0);
	9
	10	/**
	11	Drop the dicom network
	12	*/
	13	- CONDITION DropNetwork();
	14	+ OFCondition DropNetwork();
	15
	16	/**
	17	Connect an association to the specified host
	18	*/
	19	- CONDITION ConnectAssociation(Association* assoc, int lossy = 0);
	20	+ OFCondition ConnectAssociation(Association* assoc, int lossy = 0);
	21
	22	/**
	23	Send C-Echo request to dicom node
	24	@@ -80,12 +80,12 @@ private:
	25	/**
	26	Add all possible presentation contexts to association parameters
	27	*/
	28	- static CONDITION addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
	29	+ static OFCondition addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
	30
	31	/**
	32	Connect to a host and try to establish an association
	33	*/
	34	- 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);
	35	+ 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);
	36
	37	/**
	38	THE dicom network

Lines 1-19 Link Here

(-)graphics/aeskulap/files/patch-src_Makefile.am (-19 lines)
1	--- src/Makefile.am.orig 2010-08-23 17:40:05.000000000 +0200
2	+++ src/Makefile.am 2010-08-23 17:40:14.000000000 +0200
3	@@ -25,14 +25,14 @@
4
5
6	aeskulap_LDADD = \
7	+ $(DCMTK_LIBS) \
8	$(GTKMM_LIBS) \
9	$(GLADEMM_LIBS) \
10	$(GTHREAD_LIBS) \
11	../widgets/libgtkdicom.la \
12	../imagepool/libimagepool.la \
13	../configuration/libconfiguration.la \
14	- $(GCONFMM_LIBS) \
15	- $(DCMTK_LIBS)
16	+ $(GCONFMM_LIBS)
17
18	aeskulap_LDFLAGS = \
19	-Wl,-rpath,${prefix}/lib/aeskulap

Lines 1-19 Link Here

(-)graphics/aeskulap/files/patch-src_Makefile.in (-19 lines)
1	--- src/Makefile.in.orig 2010-08-23 17:39:47.000000000 +0200
2	+++ src/Makefile.in 2010-08-23 17:40:00.000000000 +0200
3	@@ -286,14 +286,14 @@
4	main.cpp
5
6	aeskulap_LDADD = \
7	+ $(DCMTK_LIBS) \
8	$(GTKMM_LIBS) \
9	$(GLADEMM_LIBS) \
10	$(GTHREAD_LIBS) \
11	../widgets/libgtkdicom.la \
12	../imagepool/libimagepool.la \
13	../configuration/libconfiguration.la \
14	- $(GCONFMM_LIBS) \
15	- $(DCMTK_LIBS)
16	+ $(GCONFMM_LIBS)
17
18	aeskulap_LDFLAGS = \
19	-Wl,-rpath,${prefix}/lib/aeskulap

Lines 1-18 Link Here

(-)graphics/aeskulap/pkg-plist (-11 / +4 lines)
1	bin/aeskulap	1	bin/aeskulap
2	lib/aeskulap/libconfiguration.so	2	lib/aeskulap/libconfiguration.so
3	lib/aeskulap/libimagepool.so	3	lib/aeskulap/libimagepool.so
4	lib/aeskulap/libofstd.so
5	lib/aeskulap/libdcmdata.so
6	lib/aeskulap/libdcmnet.so
7	lib/aeskulap/libdcmimgle.so
8	lib/aeskulap/libdcmimage.so
9	lib/aeskulap/libijg8.so
10	lib/aeskulap/libijg12.so
11	lib/aeskulap/libijg16.so
12	lib/aeskulap/libdcmjpeg.so
13	share/applications/aeskulap.desktop
14	%%DATADIR%%/glade/aeskulap.glade	4	%%DATADIR%%/glade/aeskulap.glade
15	%%DATADIR%%/images/aeskulap.png
16	%%DATADIR%%/images/cursor_pan.png	5	%%DATADIR%%/images/cursor_pan.png
17	%%DATADIR%%/images/cursor_windowlevel.png	6	%%DATADIR%%/images/cursor_windowlevel.png
18	%%DATADIR%%/images/cursor_zoom.png	7	%%DATADIR%%/images/cursor_zoom.png
Lines 31-39 Link Here
31	%%DATADIR%%/images/series-4x4.png	20	%%DATADIR%%/images/series-4x4.png
32	%%DATADIR%%/images/start-here.png	21	%%DATADIR%%/images/start-here.png
33	%%DATADIR%%/images/stock-layers-24.png	22	%%DATADIR%%/images/stock-layers-24.png
		23	%%DATADIR%%/images/stock-tool-color-picker-22.png
34	%%DATADIR%%/images/stock-tool-eraser-22.png	24	%%DATADIR%%/images/stock-tool-eraser-22.png
35	%%DATADIR%%/images/stock-tool-measure-22.png	25	%%DATADIR%%/images/stock-tool-measure-22.png
36	%%DATADIR%%/images/stock-tool-scale-22.png	26	%%DATADIR%%/images/stock-tool-scale-22.png
		27	share/applications/aeskulap.desktop
		28	share/icons/hicolor/64x64/apps/aeskulap.png
		29	share/icons/hicolor/scalable/apps/aeskulap.svg
37	share/locale/de/LC_MESSAGES/aeskulap.mo	30	share/locale/de/LC_MESSAGES/aeskulap.mo
38	share/locale/en/LC_MESSAGES/aeskulap.mo	31	share/locale/en/LC_MESSAGES/aeskulap.mo
39	share/locale/es/LC_MESSAGES/aeskulap.mo	32	share/locale/es/LC_MESSAGES/aeskulap.mo