[med-svn] [dcmtk] 01/05: unapply all patches
Gert Wollny
gert-guest at moszumanska.debian.org
Sat Dec 12 19:51:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository dcmtk.
commit c7812163e8c4d6f5290e2d0e55f7a33cfec3558a
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Thu Dec 10 22:15:55 2015 +0100
unapply all patches
---
CMake/dcmtkMacros.cmake | 4 +--
CMake/dcmtkPrepare.cmake | 2 +-
CMake/osconfig.h.in | 12 -------
config/aclocal.m4 | 41 ---------------------
config/configure | 60 -------------------------------
config/include/dcmtk/config/osconfig.h.in | 6 ----
dcmdata/data/CMakeLists.txt | 3 +-
dcmjpls/CMakeLists.txt | 2 +-
dcmjpls/apps/CMakeLists.txt | 2 +-
dcmjpls/libcharls/CMakeLists.txt | 2 +-
dcmjpls/libsrc/CMakeLists.txt | 4 +--
dcmjpls/libsrc/djcodecd.cc | 2 +-
dcmjpls/libsrc/djcodece.cc | 2 +-
dcmjpls/libsrc/djerror.h | 2 +-
dcmnet/libsrc/dul.cc | 2 +-
dcmnet/libsrc/dulfsm.cc | 2 +-
dcmqrdb/docs/dcmqrcnf.txt | 4 +--
dcmqrdb/etc/dcmqrscp.cfg | 32 ++++++-----------
ofstd/tests/toption.cc | 5 ---
19 files changed, 27 insertions(+), 162 deletions(-)
diff --git a/CMake/dcmtkMacros.cmake b/CMake/dcmtkMacros.cmake
index 1be07e9..a14d1a8 100644
--- a/CMake/dcmtkMacros.cmake
+++ b/CMake/dcmtkMacros.cmake
@@ -55,11 +55,11 @@ MACRO(DCMTK_ADD_EXECUTABLE PROGRAM)
ENDIF(WIN32 AND NOT MINGW)
# Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property
-# SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
+ SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
# declare installation files, also export DCMTKTargets.cmake
INSTALL(TARGETS ${PROGRAM}
-# EXPORT DCMTKTargets
+ EXPORT DCMTKTargets
COMPONENT bin
DESTINATION ${DCMTK_INSTALL_BINDIR})
ENDIF(BUILD_APPS)
diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
index 49233eb..54ebdb5 100644
--- a/CMake/dcmtkPrepare.cmake
+++ b/CMake/dcmtkPrepare.cmake
@@ -56,7 +56,7 @@ SET(DCMTK_PACKAGE_VERSION_SUFFIX "")
#SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
# Shared library version information
-SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi2" SOVERSION "${DCMTK_ABI_VERSION}")
+SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
# General build options and settings
OPTION(BUILD_APPS "Build command line applications and test programs." ON)
diff --git a/CMake/osconfig.h.in b/CMake/osconfig.h.in
index 1b0943a..2b6325d 100644
--- a/CMake/osconfig.h.in
+++ b/CMake/osconfig.h.in
@@ -1132,16 +1132,4 @@ typedef unsigned long ulong;
/* The path on the Android device that should be used for temporary files */
#cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
-/* Define if the compiler supports __alignof__ */
-#cmakedefine HAVE_GNU_ALIGNOF
-
-/* Define if the compiler supports __alignof */
-#cmakedefine HAVE_MS_ALIGNOF
-
-/* Define if the compiler supports __attribute__(aligned) */
-#cmakedefine HAVE_ATTRIBUTE_ALIGNED
-
-/* Define if the compiler supports __declspec(align) */
-#cmakedefine HAVE_DECLSPEC_ALIGN
-
#endif /* !OSCONFIG_H*/
diff --git a/config/aclocal.m4 b/config/aclocal.m4
index 80bffb8..78e457e 100644
--- a/config/aclocal.m4
+++ b/config/aclocal.m4
@@ -1490,47 +1490,6 @@ else
fi
])
-AC_DEFUN([AC_CHECK_ALIGNOF],
-[
- AC_MSG_CHECKING([for __alignof__])
- AC_LINK_IFELSE(
- [
- AC_LANG_SOURCE(
- [
- int main(){char c[__alignof__(int)];return 0;}
- ])
- ],
- [dcmtk_have_alignof=[yes]],
- [dcmtk_have_alignof=[no]]
- )
- if test "$dcmtk_have_alignof" = yes; then
- AC_MSG_RESULT([yes])
- AC_DEFINE($1,[1],[Define if __alignof__ is available])
- else
- AC_MSG_RESULT([no])
- fi
-])
-
-AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED],
-[
- AC_MSG_CHECKING([for __attribute__((aligned))])
- AC_LINK_IFELSE(
- [
- AC_LANG_SOURCE(
- [
- int main(){__attribute__((aligned(4))) char c[16];return 0;}
- ])
- ],
- [dcmtk_have_attribute_aligned=[yes]],
- [dcmtk_have_attribute_aligned=[no]]
- )
- if test "$dcmtk_have_attribute_aligned" = yes; then
- AC_MSG_RESULT([yes])
- AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available])
- else
- AC_MSG_RESULT([no])
- fi
-])
dnl
dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
diff --git a/config/configure b/config/configure
index c897040..a5d0bd5 100755
--- a/config/configure
+++ b/config/configure
@@ -15001,66 +15001,6 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
-$as_echo_n "checking for __alignof__... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
- int main(){char c__alignof__(int);return 0;}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- dcmtk_have_alignof=yes
-else
- dcmtk_have_alignof=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test "$dcmtk_have_alignof" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_GNU_ALIGNOF 1" >>confdefs.h
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((aligned))" >&5
-$as_echo_n "checking for __attribute__((aligned))... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
- int main(){__attribute__((aligned(4))) char c16;return 0;}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- dcmtk_have_attribute_aligned=yes
-else
- dcmtk_have_attribute_aligned=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test "$dcmtk_have_attribute_aligned" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
-
-
CFLAGS="$DEBUGCFLAGS $CFLAGS"
CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS"
diff --git a/config/include/dcmtk/config/osconfig.h.in b/config/include/dcmtk/config/osconfig.h.in
index 80e9884..0b7399b 100644
--- a/config/include/dcmtk/config/osconfig.h.in
+++ b/config/include/dcmtk/config/osconfig.h.in
@@ -91,9 +91,6 @@
/* Define if __attribute__((aligned)) is available */
#undef HAVE_ATTRIBUTE_ALIGNED
-/* Define if __attribute__((aligned)) is available */
-#undef HAVE_ATTRIBUTE_ALIGNED
-
/* Define to 1 if you have the `bcmp' function. */
#undef HAVE_BCMP
@@ -289,9 +286,6 @@
/* Define if __alignof__ is available */
#undef HAVE_GNU_ALIGNOF
-/* Define if __alignof__ is available */
-#undef HAVE_GNU_ALIGNOF
-
/* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_GRP_H
diff --git a/dcmdata/data/CMakeLists.txt b/dcmdata/data/CMakeLists.txt
index e3361ae..976506b 100644
--- a/dcmdata/data/CMakeLists.txt
+++ b/dcmdata/data/CMakeLists.txt
@@ -1,3 +1,2 @@
# declare installation files
-INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
diff --git a/dcmjpls/CMakeLists.txt b/dcmjpls/CMakeLists.txt
index c92ac5b..e114663 100644
--- a/dcmjpls/CMakeLists.txt
+++ b/dcmjpls/CMakeLists.txt
@@ -2,6 +2,6 @@
PROJECT(dcmjpls)
# recurse into subdirectories
-FOREACH(SUBDIR libsrc apps include)
+FOREACH(SUBDIR libsrc libcharls apps include)
ADD_SUBDIRECTORY(${SUBDIR})
ENDFOREACH(SUBDIR)
diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
index 8d7bcc3..2e881d7 100644
--- a/dcmjpls/apps/CMakeLists.txt
+++ b/dcmjpls/apps/CMakeLists.txt
@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
# make sure executables are linked to the corresponding libraries
FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
ENDFOREACH(PROGRAM)
diff --git a/dcmjpls/libcharls/CMakeLists.txt b/dcmjpls/libcharls/CMakeLists.txt
index 1f1ee75..99371f7 100644
--- a/dcmjpls/libcharls/CMakeLists.txt
+++ b/dcmjpls/libcharls/CMakeLists.txt
@@ -1,5 +1,5 @@
# declare additional include directories
-INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)
# create library from source files
DCMTK_ADD_LIBRARY(charls header intrface jpegls)
diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
index 40d4663..8a7b4e8 100644
--- a/dcmjpls/libsrc/CMakeLists.txt
+++ b/dcmjpls/libsrc/CMakeLists.txt
@@ -1,7 +1,7 @@
# declare additional include directories
-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR})
+INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
# create library from source files
DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc
index bea4f61..a6c0c6f 100644
--- a/dcmjpls/libsrc/djcodecd.cc
+++ b/dcmjpls/libsrc/djcodecd.cc
@@ -37,7 +37,7 @@
#include "djerror.h" /* for private class DJLSError */
// JPEG-LS library (CharLS) includes
-#include "CharLS/interface.h"
+#include "intrface.h"
E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
{
diff --git a/dcmjpls/libsrc/djcodece.cc b/dcmjpls/libsrc/djcodece.cc
index 970dd03..261fec8 100644
--- a/dcmjpls/libsrc/djcodece.cc
+++ b/dcmjpls/libsrc/djcodece.cc
@@ -55,7 +55,7 @@
#include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */
// JPEG-LS library (CharLS) includes
-#include "CharLS/interface.h"
+#include "intrface.h"
BEGIN_EXTERN_C
#ifdef HAVE_FCNTL_H
diff --git a/dcmjpls/libsrc/djerror.h b/dcmjpls/libsrc/djerror.h
index 4f5c670..d625c48 100644
--- a/dcmjpls/libsrc/djerror.h
+++ b/dcmjpls/libsrc/djerror.h
@@ -24,7 +24,7 @@
#include "dcmtk/config/osconfig.h"
#include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
-#include "CharLS/interface.h" /* CharLS include */
+#include "intrface.h" /* CharLS include */
/** Helper class for converting between dcmjpls and CharLS error codes
*/
diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc
index 91ee726..434681a 100644
--- a/dcmnet/libsrc/dul.cc
+++ b/dcmnet/libsrc/dul.cc
@@ -1833,7 +1833,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
}
#endif
- //setTCPBufferLength(sock);
+ setTCPBufferLength(sock);
#ifndef DONT_DISABLE_NAGLE_ALGORITHM
/*
diff --git a/dcmnet/libsrc/dulfsm.cc b/dcmnet/libsrc/dulfsm.cc
index 5d97197..edf7f30 100644
--- a/dcmnet/libsrc/dulfsm.cc
+++ b/dcmnet/libsrc/dulfsm.cc
@@ -2421,7 +2421,7 @@ requestAssociationTCP(PRIVATE_NETWORKKEY ** network,
return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
}
#endif
- //setTCPBufferLength(s);
+ setTCPBufferLength(s);
#ifndef DONT_DISABLE_NAGLE_ALGORITHM
/*
diff --git a/dcmqrdb/docs/dcmqrcnf.txt b/dcmqrdb/docs/dcmqrcnf.txt
index 9f579d3..0ff2dae 100644
--- a/dcmqrdb/docs/dcmqrcnf.txt
+++ b/dcmqrdb/docs/dcmqrcnf.txt
@@ -44,8 +44,8 @@ Example:
NetworkTCPPort = 104
MaxPDUSize = 8192
MaxAssociations = 20
-UserName = "dcmtk"
-GroupName = "dcmtk"
+UserName = (do not change user)
+GroupName = (do not change group)
NOTE: You must have root privileges to bind port 104 for DICOM association
requests on Unix/Linux/Posix platforms as this is a privileged port number
diff --git a/dcmqrdb/etc/dcmqrscp.cfg b/dcmqrdb/etc/dcmqrscp.cfg
index de9fb4d..9b9b94c 100644
--- a/dcmqrdb/etc/dcmqrscp.cfg
+++ b/dcmqrdb/etc/dcmqrscp.cfg
@@ -10,9 +10,6 @@
NetworkTCPPort = 104
MaxPDUSize = 16384
MaxAssociations = 16
-UserName = "dcmtk"
-GroupName = "dcmtk"
-
#
# UserName = <not used>
# GroupName = <not used>
@@ -31,13 +28,12 @@ HostTable BEGIN
# NOTE: in the current implementation you cannot substitute an IP address
# for a hostname.
#
-# Example:
-#acme1 = (ACME1, acmehost1, 5678)
-#acme2 = (ACME2, acmehost2, 5678)
-#acmeCTcompany = acme1, acme2
-#united1 = (UNITED1, unitedhost1, 104)
-#united2 = (UNITED2, unitedhost2, 104)
-#unitedMRcompany = united1, united2
+acme1 = (ACME1, acmehost1, 5678)
+acme2 = (ACME2, acmehost2, 5678)
+acmeCTcompany = acme1, acme2
+united1 = (UNITED1, unitedhost1, 104)
+united2 = (UNITED2, unitedhost2, 104)
+unitedMRcompany = united1, united2
#
HostTable END
@@ -55,9 +51,8 @@ VendorTable BEGIN
# VendorName = SymbolicName
# The symbolic name should be defined in the HostTable.
#
-# Example:
-#"Acme CT Company" = acmeCTcompany
-#"United MR Company" = unitedMRcompany
+"Acme CT Company" = acmeCTcompany
+"United MR Company" = unitedMRcompany
#
VendorTable END
@@ -75,13 +70,8 @@ AETable BEGIN
# Entry in HostTable |
# ANY
#
-# Example:
-#
-#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
-#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
-#
-# Uncomment and adjust the following lines for a common r/rw storage area:
-#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
-#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
+COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
+ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
+UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
#
AETable END
diff --git a/ofstd/tests/toption.cc b/ofstd/tests/toption.cc
index bc96a57..3a22fb7 100644
--- a/ofstd/tests/toption.cc
+++ b/ofstd/tests/toption.cc
@@ -17,11 +17,6 @@ OFTEST(ofstd_optional)
OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
- COUT << OFalignof(OFoptional<char>) << ' ' << sizeof(OFoptional<char>) << OFendl;
- COUT << OFalignof(OFoptional<short>) << ' ' << sizeof(OFoptional<short>) << OFendl;
- COUT << OFalignof(OFoptional<float>) << ' ' << sizeof(OFoptional<float>) << OFendl;
- COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional<long>) << ' ' << sizeof(OFoptional<long>) << OFendl;
-
OFCHECK( o0 && *o0 == 3 );
OFCHECK( !o1 && !o2 );
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git
More information about the debian-med-commit
mailing list