debian/0000755000000000000000000000000012236450231007164 5ustar debian/rules0000755000000000000000000000371312236447262010262 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export JAVA_HOME=/usr/lib/jvm/default-java CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE:STRING="" \ -DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)/jni %: dh $@ --buildsystem=cmake --parallel --with javahelper override_dh_auto_configure-arch: dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) override_dh_install-arch: # fix exe bit before install chmod 755 debian/tmp/usr/share/dicomscope/tcl/dcmpsdmp.tcl chmod 755 debian/tmp/usr/share/dicomscope/tcl/dcmpschk.tcl dh_install override_dh_clean-arch: dh_clean find DICOMscope -name *.class -delete override_dh_installman-arch: dh_installman debian/dicomscope.1 override_dh_compress-indep: dh_compress -X.pdf VER_MAJOR = 3 VER_MINOR = 6 VER_PATCH = 0 VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) VER_FULL_UPSTREAM = $(VER_MAJOR)$(VER_MINOR)$(VER_PATCH) UPSTREAM_SRC = dsgui$(VER_FULL_UPSTREAM) DEBIAN_SRC_DIR = dicomscope-$(VER_FULL) DEBIAN_SRC_TAR = dicomscope_$(VER_FULL).orig.tar.gz $(UPSTREAM_SRC).zip: wget -c ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope$(VER_FULL_UPSTREAM)/$@ get-orig-source: $(UPSTREAM_SRC).zip rm -rf $(DEBIAN_SRC_DIR) unzip -q $(UPSTREAM_SRC).zip -d $(DEBIAN_SRC_DIR) # Need tofrodos in order to prepare the patch, since quilt # does not support mixture of dos/unix EOL find $(DEBIAN_SRC_DIR) -name *.java -exec dos2unix {} \; find $(DEBIAN_SRC_DIR) -name *.html -exec dos2unix {} \; find $(DEBIAN_SRC_DIR) -name *.h -exec dos2unix {} \; find $(DEBIAN_SRC_DIR) -name *.cpp -exec dos2unix {} \; find $(DEBIAN_SRC_DIR) -name *.txt -exec dos2unix {} \; find $(DEBIAN_SRC_DIR) -name *.MF -exec dos2unix {} \; GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR) rm -rf $(DEBIAN_SRC_DIR) rm $(UPSTREAM_SRC).zip # # put orig.tar in ../tarballs (-> default location for svn-buildpackage) mkdir -p ../tarballs mv *.orig.tar.gz ../tarballs debian/dicomscope.install0000644000000000000000000000010212236450222012672 0ustar usr/share/dicomscope/ usr/lib/*/jni/*.so etc/dcmtk/DICOMscope.cfg debian/dicomscope-doc.doc-base.dscs0000644000000000000000000000207412236446026014420 0ustar Document: dicomscope Title: DICOM Conformance Statement Author: M. Eichelberg, K. Kleber, J. Riesmeier, A. Schröter, A. Thiel Abstract: The OFFIS DICOM Viewer DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting. Section: Science/Medicine Format: PDF Files: /usr/share/doc/dicomscope-doc/dscs360.pdf debian/watch0000644000000000000000000000016511135322177010223 0ustar version=3 opts="passive" \ ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope([\d]+)/dsgui(\d)(\d)(\d)\.zip debian/changelog0000644000000000000000000000615612236447222011054 0ustar dicomscope (3.6.0-11) unstable; urgency=low * Remove SONAME from java glue lib. Closes: #676622 * Install jni/glue lib to multi-arch jni path * Remove patch, not needed anymore: - d/p/fixbug694846.patch * Bump Std-Vers to 3.9.4, no changes needed * Remove obsolete DMUA flag * Split package in two (add -doc package). -- Mathieu Malaterre Wed, 06 Nov 2013 15:13:27 +0100 dicomscope (3.6.0-10) unstable; urgency=low * Fix underlinked java module. Closes: #694846 -- Mathieu Malaterre Sun, 09 Dec 2012 19:15:26 +0100 dicomscope (3.6.0-9) unstable; urgency=low [ Thorsten Alteholz ] * debian/rules get-orig-source: put orig.tar.gz in ../tarballs to allow automatic build with svn-buildpackage [ Mathieu Malaterre ] * Use my @d.o alias * Bump Std-Vers to 3.9.3, no changes needed * Use jarwrapper for simplification * Use javahelper to track deps * Use DEP3 for patches * Use format-1.0 for d/copyright * Remove warnings during java compilation by specifying encoding -- Mathieu Malaterre Thu, 31 May 2012 15:41:34 +0200 dicomscope (3.6.0-8) unstable; urgency=low * Fix FTBFS with OpenJDK7. Closes: #651404 -- Mathieu Malaterre Fri, 09 Dec 2011 14:29:15 +0100 dicomscope (3.6.0-7) unstable; urgency=low [ Andreas Tille ] * debian/source/format: 3.0 (quilt) [ Mathieu Malaterre ] * Standards-Version: 3.9.2. No changes needed. * Fix VCS URLs * Redo the d/rules file for simplification -- Mathieu Malaterre Wed, 23 Nov 2011 12:55:20 +0100 dicomscope (3.6.0-6.1) unstable; urgency=low * Non-maintainer upload. * Fix shlibdeps. Closes: #632460. * Replace java depends with default-jre. -- Mark Hymers Sat, 02 Jul 2011 13:28:34 +0000 dicomscope (3.6.0-6) unstable; urgency=low * Remove dep to tk8.3, tk8.4 and replace with wish * Fix javac compilation. Closes: #627223 -- Mathieu Malaterre Tue, 26 Apr 2011 20:36:47 +0200 dicomscope (3.6.0-5) unstable; urgency=low * Fix compilation with gcj/java -- Mathieu Malaterre Tue, 26 Apr 2011 16:43:13 +0200 dicomscope (3.6.0-4) unstable; urgency=low * Upload to unstable. Closes: #623143 -- Mathieu Malaterre Wed, 20 Apr 2011 18:30:32 +0200 dicomscope (3.6.0-3) experimental; urgency=low * Fix compilation of dicomscope against dcmtk 3.6.0 release and new API * Convert iso german to utf-8 to prevent warning during java compilation * Update debian Standard Version to 3.9.1 no change needed * Switch to dpkg-source 3.0 (quilt) format -- Mathieu Malaterre Wed, 09 Feb 2011 11:04:47 +0100 dicomscope (3.6.0-2) unstable; urgency=low * Remove tofrodos and unzip from Build-Deps. Fixes hurd-386 compilation. -- Mathieu Malaterre Mon, 21 Dec 2009 15:46:02 +0100 dicomscope (3.6.0-1) unstable; urgency=low * Initial release (Closes: #508990) -- Mathieu Malaterre Mon, 16 Nov 2009 17:58:43 +0100 debian/dicomscope.jlibs0000644000000000000000000000005112236445145012342 0ustar debian/tmp/usr/share/java/DICOMscope.jar debian/README.Debian0000644000000000000000000000041311761672014011232 0ustar DICOMScope for Debian ===================== An helper script is provided to start the main jar archive: /usr/bin/dicomscope which simply starts: java -jar /usr/share/dicomscope/DICOMscope.jar -- Mathieu Malaterre Wed Jan 21 14:51:47 CET 2009 debian/control0000644000000000000000000000502212236446026010575 0ustar Source: dicomscope Section: graphics Maintainer: Debian Med Packaging Team Uploaders: Mathieu Malaterre Priority: extra Build-Depends: debhelper (>= 9), cmake (>= 2.8.2), libdcmtk2-dev (>= 3.6.0), default-jdk, javahelper Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dicomscope/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dicomscope/trunk/ Homepage: http://dicom.offis.de/dscope.php.en Package: dicomscope Architecture: any Depends: ${java:Depends}, ${shlibs:Depends}, ${misc:Depends}, tk8.6 | tk8.5 | tk8.4 | wish, default-jre, jarwrapper Description: OFFIS DICOM Viewer DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. . DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. . The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. . The current release has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting. Package: dicomscope-doc Architecture: all Section: doc Depends: ${misc:Depends}, doc-base Description: OFFIS DICOM Viewer - documentation DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. . DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. . The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. . The current release has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting. . This is the documentation package for DICOMscope debian/dicomscope.10000644000000000000000000000434611761672014011411 0ustar .TH DICOMSCOPE 1 "20 Aug 2009" "Version 3.6.0" "OFFIS DCMTK" .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME dicomscope \- DICOM Viewer .SH SYNOPSIS .B dicomscope .I DICOMFile.dcm .SH "DESCRIPTION" This manual page documents briefly the .B dicomscope command. .PP DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting. DICOMscope is not meant as a competition for commercial DICOM viewers. The application is rather a feasibility study for DICOM presentation states. The program is not appropriate to be used in a clinical environment, e.g. for reporting. .SH "DISCLAIMER" This software is made available, as is, and OFFIS, the Institute for Microtherapy / VISUS-TT and OTech make no warranty regarding the software, its performance, its merchantability or fitness for any particular use, freedom from any computer diseases or its conformity to any specification. The entire risk as to quality and performance of the software is with the user. This software is intended for investigational use only. It has not been tested or approved for clinical application or production environments. .SH SEE ALSO See the project homepage .B http://dicom.offis.de/dscope.php.en for more information. .SH "COPYRIGHT" Copyright (C) 1994-2005 by Kuratorium OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system (but may be used by others). debian/dicomscope.links0000644000000000000000000000006111761672014012357 0ustar usr/share/java/DICOMscope.jar usr/bin/dicomscope debian/copyright0000644000000000000000000000316311761672014011131 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: DICOMScope Upstream-Source: http://dicom.offis.de/dscope.php.en Files: * Copyright: (C) 1999-2009, OFFIS and Institute for MicroTherapy License: This software and supporting documentation were developed by . OFFIS e.V. Escherweg 2 26121 Oldenburg Germany and University of Witten/Herdecke Department of Radiology and MicroTherapy Institute for MicroTherapy Medical computer science Universitaetsstrasse 142 44799 Bochum Germany . THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS AND THE INSTITUTE FOR MICROTHERAPY MAKE NO WARRANTY REGARDING THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES OR ITS CONFORMITY TO ANY SPECIFI- CATION. THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE IS WITH THE USER. . Copyright of the software and supporting documentation is, unless otherwise stated, owned by OFFIS and the Institute of MicroTherapy, and free access is hereby granted as a license to use this software, copy this software and prepare derivative works based upon this software. However, any distribution of this software source code or supporting documentation or derivative works (source code and support- ing documentation) must include the three paragraphs of this copyright notice. Files: debian/* Copyright: 2009, Mathieu Malaterre License: GPL-2+ The Debian packaging is licensed under the GPL-2 or any later version, see `/usr/share/common-licenses/GPL-2' debian/dicomscope-doc.docs0000644000000000000000000000002212236446473012735 0ustar DICOMscope/docs/* debian/upstream0000644000000000000000000000013611711137235010752 0ustar Donation: http://dicom.offis.de/donation.php.en Homepage: http://dicom.offis.de/dscope.php.en debian/source/0000755000000000000000000000000012236450231010464 5ustar debian/source/format0000644000000000000000000000001411604146066011700 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000211761672014010371 0ustar 9 debian/dicomscope-doc.doc-base.dsum0000644000000000000000000000207512236446026014435 0ustar Document: dicomscope Title: DICOMscope 3.6.0 User Manual Author: M. Eichelberg, K. Kleber, J. Riesmeier, A. Schröter, A. Thiel Abstract: The OFFIS DICOM Viewer DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting. Section: Science/Medicine Format: PDF Files: /usr/share/doc/dicomscope-doc/dsum360.pdf debian/patches/0000755000000000000000000000000012236450231010613 5ustar debian/patches/DSRDocument.cpp.patch0000644000000000000000000000151311761672014014553 0ustar Description: This is undefined in the source (fix compilation) Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp =================================================================== --- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp 2011-06-15 01:16:09.000000000 +0200 +++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp 2011-06-15 01:17:52.000000000 +0200 @@ -106,7 +106,7 @@ /* create local string stream */ OFOStringStream oss; - OFCondition res = doc->renderHTML(oss, flags | DSRTypes::HF_version32Compatibility | DSRTypes::HF_renderFullData); + OFCondition res = doc->renderHTML(oss, flags /*| DSRTypes::HF_version32Compatibility */| DSRTypes::HF_renderFullData); OFSTRINGSTREAM_GETSTR(oss, tmpString) if (res == EC_Normal) debian/patches/dicomscope.cfg.patch0000644000000000000000000000516111761672014014531 0ustar Description: Fix the default path to those as defined in debian packaging of dcmtk Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/DICOMscope/DICOMscope.cfg =================================================================== --- dicomscope-3.6.0.orig/DICOMscope/DICOMscope.cfg 2011-06-15 01:16:10.000000000 +0200 +++ dicomscope-3.6.0/DICOMscope/DICOMscope.cfg 2011-06-15 01:17:29.000000000 +0200 @@ -157,15 +157,15 @@ # ---------------------------------------------------------------------------- # directory in which DICOM images and index.dat reside -Directory = database +Directory = /var/lib/dcmtk/db/READWRITE # Path to the dump tool used to display the contents of DICOM files located # in the database -Dump = c:\program files\tcl\bin\wish83 dcmpsdmp.tcl +Dump = /usr/bin/wish /usr/share/dicomscope/tcl/dcmpsdmp.tcl # Path to the check tool used to evaluate the contents of DICOM files located # in the database -Check = c:\program files\tcl\bin\wish83 dcmpschk.tcl +Check = /usr/bin/wish /usr/share/dicomscope/tcl/dcmpschk.tcl # ---------------------------------------------------------------------------- # General Presentation LUT settings in this section. @@ -173,7 +173,7 @@ # ---------------------------------------------------------------------------- # directory in which LUT files reside -Directory = lut +Directory = /usr/share/dicomscope/lut # ---------------------------------------------------------------------------- # General Structured Reporting (SR) settings in this section. @@ -181,7 +181,7 @@ # ---------------------------------------------------------------------------- # directory in which SR "template" files reside -Directory = reports +Directory = /usr/share/dicomscope/reports # ---------------------------------------------------------------------------- # This section contains the settings for network communication. @@ -254,7 +254,7 @@ # Path to the DICOM query/retrieve server (Q/R SCP) to be used. # The configuration filename is created from this entry by adding the file # extension ".cfg". -Server = imagectn +Server = dcmqrscp # IP Port number on which the server listens for new connections. # On Unix platforms, the receiver must be started with setuid root @@ -267,8 +267,8 @@ # Default is 16384. MaxPDU = 32768 -# Application entity title imagectn will use to identify itself. -AETitle = IMAGECTN +# Application entity title dcmqrscp will use to identify itself. +AETitle = DCMQRSCP # Maximum number of associations the server can handle at the same time. # This is only applicable on Unix platforms, since Windows does not support debian/patches/dicomscope_defaultpackage.patch0000644000000000000000000000077711761672014017023 0ustar Description: The MANIFEST.MF provides does not work on case sensitive system. Fix it. Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/MANIFEST.MF =================================================================== --- dicomscope-3.6.0.orig/MANIFEST.MF 2011-06-15 01:16:12.000000000 +0200 +++ dicomscope-3.6.0/MANIFEST.MF 2011-06-15 01:17:23.000000000 +0200 @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Main-Class: DICOMscope/DICOMscope +Main-Class: dicomscope/DICOMscope debian/patches/dicom_2009.patch0000644000000000000000000000550011761672014013410 0ustar Description: This patch is due to the following change: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20 Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp =================================================================== --- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp 2011-06-15 01:17:52.000000000 +0200 +++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp 2011-06-15 01:17:54.000000000 +0200 @@ -442,7 +442,7 @@ { DSRDocument *doc = getAddressOfDSRDocument (env, obj); - const char *string = doc->getPatientsName(); + const char *string = doc->getPatientName(); if (string == NULL) return NULL; return env->NewStringUTF (string); @@ -459,7 +459,7 @@ { DSRDocument *doc = getAddressOfDSRDocument (env, obj); - const char *string = doc->getPatientsBirthDate(); + const char *string = doc->getPatientBirthDate(); if (string == NULL) return NULL; return env->NewStringUTF (string); @@ -476,7 +476,7 @@ { DSRDocument *doc = getAddressOfDSRDocument (env, obj); - const char *string = doc->getPatientsSex(); + const char *string = doc->getPatientSex(); if (string == NULL) return NULL; return env->NewStringUTF (string); @@ -493,7 +493,7 @@ { DSRDocument *doc = getAddressOfDSRDocument (env, obj); - const char *string = doc->getReferringPhysiciansName(); + const char *string = doc->getReferringPhysicianName(); if (string == NULL) return NULL; return env->NewStringUTF (string); @@ -812,7 +812,7 @@ { jbyte *string = env->GetByteArrayElements(array, 0); - res = doc->setPatientsName(OFString((char *)string, env->GetArrayLength(array))); + res = doc->setPatientName(OFString((char *)string, env->GetArrayLength(array))); env->ReleaseByteArrayElements(array, string, 0); } @@ -834,7 +834,7 @@ char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL; - OFCondition res = doc->setPatientsBirthDate(str); + OFCondition res = doc->setPatientBirthDate(str); env->ReleaseStringUTFChars (value, str); @@ -854,7 +854,7 @@ char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL; - OFCondition res = doc->setPatientsSex(str); + OFCondition res = doc->setPatientSex(str); env->ReleaseStringUTFChars (value, str); @@ -884,7 +884,7 @@ { jbyte *string = env->GetByteArrayElements(array, 0); - res = doc->setReferringPhysiciansName(OFString((char *)string, env->GetArrayLength(array))); + res = doc->setReferringPhysicianName(OFString((char *)string, env->GetArrayLength(array))); env->ReleaseByteArrayElements(array, string, 0); } debian/patches/maincontext.java.patch0000644000000000000000000000132112236447262015114 0ustar Description: Use full path instead of relative path Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/tkgui/main/MainContext.java =================================================================== --- dicomscope-3.6.0.orig/tkgui/main/MainContext.java 2011-06-15 01:16:10.000000000 +0200 +++ dicomscope-3.6.0/tkgui/main/MainContext.java 2011-06-15 01:17:30.000000000 +0200 @@ -148,7 +148,7 @@ //System.out.println("MainContext.iconPath " +MainContext.iconPath ); //Load deviceColorModell loadDeviceInformation(); - codeList = new SRCodeList("codes.dic"); + codeList = new SRCodeList("/usr/share/dicomscope/codes.dic"); } debian/patches/fixbug694846.patch0000644000000000000000000000116312061152574013633 0ustar Description: As per bug #694846 libraries were underlinked Author: Mathieu Malaterre Bug-Debian: http://bugs.debian.org/694846 Forwarded: not-needed --- dicomscope-3.6.0.orig/interface/libsrc/CMakeLists.txt +++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt @@ -47,6 +47,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBU ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS}) TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg + dcmnet ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog) INSTALL(TARGETS jInterface RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime debian/patches/series0000644000000000000000000000026212236436126012037 0ustar dicomscope_defaultpackage.patch DVPresentationState.patch dicomscope.cfg.patch maincontext.java.patch DSRDocument.cpp.patch dicom_2009.patch log4cplus.patch cmakelists.txt.patch debian/patches/cmakelists.txt.patch0000644000000000000000000001233012236441153014613 0ustar Description: Instead of using the in-src dcmtk build system, provide a replacement one that allow building dicomscope outside of dcmtk Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ dicomscope-3.6.0/CMakeLists.txt 2013-11-06 13:58:16.000000000 +0100 @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 2.8.2) +project(DICOMSCOPE) + +set (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.") +set (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.") +mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) + +if(NOT DICOMSCOPE_INSTALL_BIN_DIR) + set(DICOMSCOPE_INSTALL_BIN_DIR "bin") +endif() + +if(NOT DICOMSCOPE_INSTALL_LIB_DIR) + set(DICOMSCOPE_INSTALL_LIB_DIR "lib") +endif() +if(NOT DICOMSCOPE_INSTALL_SHARE_DIR) + set(DICOMSCOPE_INSTALL_SHARE_DIR "share/dicomscope") +endif() +if(NOT DICOMSCOPE_INSTALL_JAVA_DIR) + set(DICOMSCOPE_INSTALL_JAVA_DIR "share/java") +endif() + +include_directories(interface/include) + +add_subdirectory(interface/libsrc) +add_subdirectory(tkgui) Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt 2013-11-06 14:13:11.000000000 +0100 @@ -0,0 +1,55 @@ +set(dsgui_SRCS + DSRCodeValue.cpp + DSRCompositeValue.cpp + DSRDocument.cpp + DSRDocumentTree.cpp + DSRImageValue.cpp + DSRNumericValue.cpp + DSRSCoordValue.cpp + DSRTCoordValue.cpp + DSRWaveformValue.cpp + DVInterface.cpp + DVPresentationState.cpp + DVPSCurve.cpp + DVPSGraphicObject.cpp + DVPSStoredPrint.cpp + DVPSTextObject.cpp +) +find_package(JNI REQUIRED) +include_directories( + ${JNI_INCLUDE_DIRS} +) + +find_package(DCMTK REQUIRED) +# /usr/include/dcmtk/dcmpstat/dviface.h +find_path( DCMTK_dcmpstat_INCLUDE_DIR dviface.h + ${DCMTK_DIR}/dcmpstat/include + ${DCMTK_DIR}/include/dcmpstat +) +# /usr/include/dcmtk/dcmjpeg/djdecode.h +find_path( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h + ${DCMTK_DIR}/dcmjpeg/include + ${DCMTK_DIR}/include/dcmjpeg +) +# /usr/include/dcmtk/dcmsr/dsrdoc.h +find_path(DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h + ${DCMTK_DIR}/dcmsr/include + ${DCMTK_DIR}/include/dcmsr +) + +include_directories( + ${DCMTK_INCLUDE_DIR} + ${DCMTK_dcmpstat_INCLUDE_DIR} + ${DCMTK_dcmsr_INCLUDE_DIR} ${DCMTK_dcmjpeg_INCLUDE_DIR} +) + +add_definitions(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H) + +add_library(jInterface SHARED ${dsgui_SRCS}) +target_link_libraries(jInterface dcmpstat ofstd dcmdata dcmjpeg dcmsr) +set_property(TARGET jInterface PROPERTY NO_SONAME 1) +install(TARGETS jInterface + RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime + LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime + ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development +) Index: dicomscope-3.6.0/tkgui/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ dicomscope-3.6.0/tkgui/CMakeLists.txt 2013-11-06 13:58:16.000000000 +0100 @@ -0,0 +1,45 @@ +# Java +find_package(Java REQUIRED) # javac, jar + +file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java") +file(GLOB lutfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/lut/*.lut") +file(GLOB reportfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/reports/*.dcm") + +add_custom_command( + OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class + COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${javafiles} + COMMENT "javac *.java" +) + +add_custom_command( + OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar + COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF -C ${DICOMSCOPE_SOURCE_DIR}/DICOMscope . + WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope + DEPENDS ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class + COMMENT "jar cvf -> DICOMscope.jar" +) + +add_custom_target(dummy ALL + DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar + COMMENT "building DICOMscope.jar" +) + +install(FILES ${reportfiles} + DESTINATION ${DICOMSCOPE_INSTALL_SHARE_DIR}/reports COMPONENT Runtime) +install(FILES ${lutfiles} + DESTINATION ${DICOMSCOPE_INSTALL_SHARE_DIR}/lut COMPONENT Runtime) +install(FILES + ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl + ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl + DESTINATION ${DICOMSCOPE_INSTALL_SHARE_DIR}/tcl COMPONENT Runtime +) +install(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg + DESTINATION /etc/dcmtk COMPONENT Runtime) +install(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic + DESTINATION /usr/share/dcmtk COMPONENT Runtime) +install(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic + DESTINATION ${DICOMSCOPE_INSTALL_SHARE_DIR} COMPONENT Runtime) +install(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar + DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime) debian/patches/DVPresentationState.patch0000644000000000000000000000172511761672014015556 0ustar Description: Apparently the original package was compiled on 32bits and thus long and Sint32 could be interchanged Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp =================================================================== --- dicomscope-3.6.0.orig/interface/libsrc/DVPresentationState.cpp 2011-06-15 01:16:11.000000000 +0200 +++ dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp 2011-06-15 01:17:26.000000000 +0200 @@ -979,7 +979,7 @@ { DVPresentationState *ps = getAddressOfDVPresentationState (env, obj); - long tx, ty, bx, by; + Sint32 tx, ty, bx, by; OFCondition res = ps->getStandardDisplayedArea (tx, ty, bx, by); @@ -1014,7 +1014,7 @@ { DVPresentationState *ps = getAddressOfDVPresentationState (env, obj); - long tx, ty, bx, by; + Sint32 tx, ty, bx, by; OFCondition res = ps->getImageRelativeDisplayedArea (tx, ty, bx, by); debian/patches/log4cplus.patch0000644000000000000000000000213211761672014013555 0ustar Description: This patch simply remove the call to the old API for logging until a better fix is to be found Author: Mathieu Malaterre Forwarded: not-needed Index: dicomscope-3.6.0/interface/libsrc/DVInterface.cpp =================================================================== --- dicomscope-3.6.0.orig/interface/libsrc/DVInterface.cpp 2011-06-15 01:16:05.000000000 +0200 +++ dicomscope-3.6.0/interface/libsrc/DVInterface.cpp 2011-06-15 01:17:58.000000000 +0200 @@ -2828,7 +2828,7 @@ { DVInterface *dvi = getAddressOfDVInterface (env, obj); - dvi->setLogFilter ((DVPSLogMessageLevel)level); +// dvi->setLogFilter ((DVPSLogMessageLevel)level); } @@ -2845,7 +2845,7 @@ char *mod = (char*) env->GetStringUTFChars (module, 0); char *msg = (char*) env->GetStringUTFChars (message, 0); - OFCondition res = dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg); + OFCondition res = EC_Normal; //dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg); env->ReleaseStringUTFChars (module, mod); env->ReleaseStringUTFChars (message, msg);