From 4b49778f44b9149451ba36e5f1bd7830c74c8fee Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 21 Mar 2018 01:17:31 -0600 Subject: [PATCH] Merge changes from Debian Med packaging of 5.2.0-4 --- debian/.gitignore | 4 -- debian/README.Debian | 4 -- debian/changelog | 59 +++++++++++++++++-- debian/compat | 3 +- debian/control | 32 +++++++--- debian/copyright | 31 +++++----- debian/ctsim-doc.docs | 2 + debian/ctsim-doc.examples | 3 + debian/ctsim-doc.links | 2 + debian/ctsim-help.install | 1 + debian/ctsim.install | 3 + debian/ctsim.manpages | 1 + debian/ctsim.menu | 4 -- debian/cvsbp-prepare.sh | 12 ---- debian/make-upstream.sh | 5 -- debian/postinst | 46 --------------- debian/rules | 119 ++++---------------------------------- debian/upload.sh | 4 -- debian/watch | 5 +- libctgraphics/sgp.cpp | 4 +- src/ctsim.cpp | 12 ++-- src/ctsim.h | 7 +++ src/dlgezplot.cpp | 4 +- src/views.cpp | 2 +- tools/Makefile.am | 24 ++++---- tools/phm2helix.cpp | 2 +- 26 files changed, 150 insertions(+), 245 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/README.Debian create mode 100644 debian/ctsim-doc.docs create mode 100644 debian/ctsim-doc.examples create mode 100644 debian/ctsim-doc.links create mode 100644 debian/ctsim-help.install create mode 100644 debian/ctsim.install create mode 100644 debian/ctsim.manpages delete mode 100644 debian/ctsim.menu delete mode 100755 debian/cvsbp-prepare.sh delete mode 100755 debian/make-upstream.sh delete mode 100755 debian/postinst delete mode 100644 debian/upload.sh diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 1f0ebdb..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -ctsim -files -ctsim.prerm.debhelper -ctsim.postinst.debhelper diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 9407671..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,4 +0,0 @@ -This is the CTSim system packaged for Debian by -Kevin M. Rosenberg , April 2002. - -The home site for CTSim is http://ctsim.org/ diff --git a/debian/changelog b/debian/changelog index 7dc489e..93afb97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,64 @@ +ctsim (6.0.0-2) unstable; urgency=low + + * Merge patches and packaging changes kindly make by Debian Med Team + + -- Kevin M. Rosenberg Wed, 21 Mar 2018 00:55:11 -0600 + ctsim (6.0.0-1) unstable; urgency=low - * New upstream, supports wxgtk3.0 + * New upstream, supports OpenMP parallelism and migrated to wxgtk3.0 and libpng1.6 * debian/control: Update for wxgtk3 -- Kevin M. Rosenberg Tue, 20 Mar 2018 22:40:50 -0600 -ctsim (5.2.1-1) unstable; urgency=low +ctsim (5.2.0-4) unstable; urgency=medium - * New upstream - * debian/control: Change Build-Depends to libpng-dev from libpng12-dev - (closes:662293) + * Fix watch file + * Remove redundant README.Debian + * hardening=+all + * debhelper 10 + * Remove empty postinst script + + -- Andreas Tille Tue, 06 Dec 2016 10:17:38 +0100 - -- Kevin M. Rosenberg Fri, 21 Dec 2012 14:31:30 -0700 +ctsim (5.2.0-3) unstable; urgency=medium + + * cme fix dpkg-control + * DEP3 header for libpng16 patch + * Fix d/rules (thanks to Chris Lamb for the patch) + Closes: 834574 + * Remove menu file + * hardening=+all,-pie + + -- Andreas Tille Wed, 17 Aug 2016 13:36:53 +0200 + +ctsim (5.2.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with libpng16" (Closes: #809897) + + -- Tobias Frost Sun, 24 Jan 2016 12:58:10 +0100 + +ctsim (5.2.0-2) unstable; urgency=medium + + [ Olly Betts ] + * Update to use wxWidgets 3.0 (new patch: wx3.0-compat.patch) + Closes: #751552 + + [ Andreas Tille ] + * Take over the package into Debian Med team + * debian/control: + - debhelper 9 + - Priority: optional + - cme fix dpkg-control + * Build-Depends on libpng-dev, change from libpng12-dev + Closes: #662293 + * debian/copyright: DEP5 + * debian/rules: Use dh in d/rules + * fix upstream Makefile issues (finally by using dh-autoreconf) + * spelling fix + + -- Andreas Tille Mon, 11 Aug 2014 10:05:01 +0200 ctsim (5.2.0-1.1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 9f1d48e..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1,2 +1 @@ -11 - +10 diff --git a/debian/control b/debian/control index 05047ed..2f0602f 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,31 @@ Source: ctsim +Maintainer: Debian Med Packaging Team +Uploaders: Kevin M. Rosenberg , + Andreas Tille Section: science Priority: optional -Maintainer: Kevin M. Rosenberg -Build-Depends: debhelper (>= 11.0), wx3.0-headers, libfftw3-dev, libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk3.0-dev, ctn-dev, libpng-dev -Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 10), + libfftw3-dev, + libreadline-dev, + libgl1-mesa-dev, + libglu1-mesa-dev, + libwxgtk3.0-dev, + ctn-dev, + libpng-dev, + libglib2.0-dev, + libgtk2.0-dev, + autotools-dev, + dh-autoreconf +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ctsim.git +Vcs-Git: https://anonscm.debian.org/git/debian-med/ctsim.git Homepage: http://www.ctsim.org -Vcs-Git: git://git.kpe.io/ctsim.git -Vcs-Browser: http://git.kpe.io/?p=ctsim.git - + Package: ctsim Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ctsim-help +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ctsim-help Recommends: ctsim-doc Conflicts: ctsim Description: Computed tomography simulator @@ -34,8 +49,8 @@ Description: Online help file for CTSim in the binary ctsim package for every architecture. Package: ctsim-doc -Section: doc Architecture: all +Section: doc Depends: ${misc:Depends} Recommends: ctsim Description: Documentation for ctsim package @@ -44,4 +59,3 @@ Description: Documentation for ctsim package This documentation file is included in a separate package so it will not have to be include in the binary ctsim package for every architecture. - diff --git a/debian/copyright b/debian/copyright index 08ff01d..04c8d67 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,17 +1,22 @@ -Debian Copyright Section -======================== +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: CTSim +Upstream-Contact: Kevin M. Rosenberg +Source: http://www.ctsim.org/download -Upstream Source URL: http://files.kpe.io/ctsim -Upstream Author: Kevin M. Rosenberg -Debian Maintainer: (Same as upstream) +Files: * +Copyright: 1983-2010 Kevin M. Rosenberg +License: GPL -Upstream Copyright Statement -============================ -CTSim is Copyright (C) 1983-2002 by Kevin M. Rosenberg, M.D. +License: GPL + CTSim is governed by the GNU GPL License which is located on + the Debian file system in /usr/share/common-licenses/GPL. + . + CTSim is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CTSim is governed by the GNU GPL License which is located on -the Debian file system in /usr/share/common-licenses/GPL. +Files: debian/* +Copyright: 2002-2010 Kevin M. Rosenberg + 2014 Andreas Tille +License: GPL -CTSim is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/debian/ctsim-doc.docs b/debian/ctsim-doc.docs new file mode 100644 index 0000000..719925b --- /dev/null +++ b/debian/ctsim-doc.docs @@ -0,0 +1,2 @@ +docs/html +docs/ctsim.pdf* diff --git a/debian/ctsim-doc.examples b/debian/ctsim-doc.examples new file mode 100644 index 0000000..255e586 --- /dev/null +++ b/debian/ctsim-doc.examples @@ -0,0 +1,3 @@ +html/simulate.html +tools/sample-ctsim.sh +helical/sample-helical.sh diff --git a/debian/ctsim-doc.links b/debian/ctsim-doc.links new file mode 100644 index 0000000..6e53aa6 --- /dev/null +++ b/debian/ctsim-doc.links @@ -0,0 +1,2 @@ +usr/share/doc/ctsim-doc/html/ctsim_contents.html usr/share/doc/ctsim-doc/html/index.html + diff --git a/debian/ctsim-help.install b/debian/ctsim-help.install new file mode 100644 index 0000000..72673f6 --- /dev/null +++ b/debian/ctsim-help.install @@ -0,0 +1 @@ +docs/ctsim.htb usr/share/ctsim diff --git a/debian/ctsim.install b/debian/ctsim.install new file mode 100644 index 0000000..1a20c94 --- /dev/null +++ b/debian/ctsim.install @@ -0,0 +1,3 @@ +usr/bin +debian/ctsim.xpm usr/share/pixmaps +debian/ctsim.desktop usr/share/applications diff --git a/debian/ctsim.manpages b/debian/ctsim.manpages new file mode 100644 index 0000000..bf519d7 --- /dev/null +++ b/debian/ctsim.manpages @@ -0,0 +1 @@ +man/*.1 diff --git a/debian/ctsim.menu b/debian/ctsim.menu deleted file mode 100644 index 9e92b10..0000000 --- a/debian/ctsim.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(ctsim):needs="X11" section="Applications/Science/Medicine" \ - title="CTSim" icon="/usr/share/pixmaps/ctsim.xpm" \ - command="/usr/bin/ctsim" \ - hints="Computed Tomograpy Simulator" diff --git a/debian/cvsbp-prepare.sh b/debian/cvsbp-prepare.sh deleted file mode 100755 index 143c4d7..0000000 --- a/debian/cvsbp-prepare.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e # abort on error - -# Clean checked out CVS directory -rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh -rm -f do-autoconf -rm -f `find . -type f -name .cvsignore` -rm -rf images doc stamp-h.in build-stamp configure-stamp -rm -f debian/cvsbp-prepare.sh - - diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh deleted file mode 100755 index be11139..0000000 --- a/debian/make-upstream.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -bups ctsim -d"-name doc -or -name images" - -exit 0 diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index e5c1c93..0000000 --- a/debian/postinst +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -# postinst script for ctsim -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/rules b/debian/rules index 4d3bbf7..77aa33f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,117 +1,20 @@ #!/usr/bin/make -f -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -host_arch := $(shell dpkg-architecture -qDEB_HOST_ARCH) +%: + dh $@ --with autotools-dev --with autoreconf -pkg := ctsim -pkg-help := ctsim-help -pkg-doc := ctsim-doc +override_dh_auto_clean: + dh_auto_clean + rm -f helical/sample-helical.sh tools/sample-ctsim.sh -ctsim-shared := usr/share/ctsim +override_dh_auto_configure: + dh_auto_configure -- --with-ctn -with-x --without-lam -prefix := debian/$(pkg) -prefix-help := debian/$(pkg-help) -prefix-doc := debian/$(pkg-doc) - -DESTDIR := `pwd`/$(prefix) -HELPDIR := `pwd`/$(prefix-help)/$(ctsim-shared) -doc-dir := usr/share/doc/$(pkg-doc) -pixmap-dir := usr/share/pixmaps -desktop-dir := usr/share/applications - -configure: configure-stamp -configure-stamp: - dh_testdir - ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x --without-lam - touch configure-stamp - - -build-arch: configure-stamp build-arch-stamp -build-arch-stamp: - dh_testdir - $(MAKE) all - touch build-arch-stamp - -build-indep: configure-stamp build-indep-stamp -build-indep-stamp: - dh_testdir +override_dh_installdocs-indep: (cd docs; tar xzf html.tar.gz) - touch build-indep-stamp - -build: build-arch build-indep - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp configure-stamp - if [ -f Makefile -a -f config.status ]; then $(MAKE) clean; fi - find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \; - rm -f debian/ctsim.postinst.* debian/ctsim.prerm.* - -rm -f configure-stamp build-indep-stamp build-arch-stamp - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - dh_installdirs -p $(pkg-help) $(ctsim-shared) - ${MAKE} install - rm $(DESTDIR)/usr/share/doc/$(pkg)/simulate.html - dh_installdirs -p $(pkg) $(pixmap-dir) - dh_installdirs -p $(pkg) $(desktop-dir) - dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir) - dh_install -p $(pkg) debian/ctsim.desktop $(desktop-dir) - dh_install -p $(pkg-help) docs/ctsim.htb $(ctsim-shared) - dh_install -p $(pkg-doc) docs/html $(doc-dir) - dh_install -p $(pkg-doc) html/simulate.html $(doc-dir)/examples - dh_link -p $(pkg-doc) $(doc-dir)/html/$(pkg)_contents.html $(doc-dir)/html/index.html - gzip -9 docs/ctsim.pdf - dh_install -p $(pkg-doc) docs/ctsim.pdf.gz $(doc-dir) - gunzip docs/ctsim.pdf.gz - chmod +x helical/*.sh tools/*.sh - -binary-indep: build install - dh_testdir -i - dh_testroot -i dh_installdocs -i - dh_installexamples -i - dh_installmenu -i - dh_installcron -i - dh_installinfo -i - dh_installchangelogs ChangeLog -i - dh_installexamples -p $(pkg-doc) tools/sample-ctsim.sh helical/sample-helical.sh -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -Xsimulate.html -a - dh_installchangelogs ChangeLog -a - dh_strip -a - dh_link -a - dh_compress -a - dh_fixperms -a - dh_installmenu -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_installchangelogs: + dh_installchangelogs ChangeLog diff --git a/debian/upload.sh b/debian/upload.sh deleted file mode 100644 index efa12fc..0000000 --- a/debian/upload.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e - -dup ctsim -Uwww.kpe.io -D/home/ftp/ctsim -C"(umask 022; cd /srv/www/html/ctsim; make install)" -su $* - diff --git a/debian/watch b/debian/watch index e5e139f..5c41757 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ -version=3 - -http://files.kpe.io/ctsim/ctsim-([\d\.]*)\.tar\.gz debian uupdate +version=4 +http://ctsim.org/download.html .*/ctsim/ctsim-([\d\.]*)\.tar\.gz diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index 21aa0a6..feedcbb 100644 --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp @@ -359,7 +359,7 @@ SGP::setRasterOp (int ro) { #if HAVE_WXWINDOWS if (m_driver.isWX()) { - wxRasterOperationMode wxFxn = wxSET; + wxRasterOperationMode wxFxn; switch (ro) { case RO_AND: wxFxn = wxAND; @@ -409,6 +409,8 @@ SGP::setRasterOp (int ro) case RO_XOR: wxFxn = wxXOR; break; + default: + return; } m_driver.idWX()->SetLogicalFunction (wxFxn); } diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 7097857..e2e3f27 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -247,14 +247,13 @@ CTSimApp::OnInit() m_docManager->OnFileClose (nullEvent); } } -#ifdef KMR_FIXME - // Move to wx3.0 event processing + if (m_bPrintCmdLineImages) { wxCommandEvent closeEvent; closeEvent.SetInt (MAINMENU_FILE_EXIT); - m_pFrame->AddPendingEvent(closeEvent); + m_pFrame->GetEventHandler()->ProcessEvent(closeEvent); } -#endif + if (getStartupTips()) ShowTips(); @@ -391,10 +390,7 @@ EVT_MENU(MAINMENU_FILE_CREATE_PHANTOM, MainFrame::OnCreatePhantom) EVT_MENU(MAINMENU_FILE_CREATE_FILTER, MainFrame::OnCreateFilter) EVT_MENU(MAINMENU_FILE_EXIT, MainFrame::OnExit) -// Unsure how to fix, OnMRUFile procedure not found in packge -#ifdef KMR_FIXME EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, MainFrame::OnMRUFile) -#endif EVT_MENU(MAINMENU_WINDOW_BASE, MainFrame::OnWindowMenu0) EVT_MENU(MAINMENU_WINDOW_BASE+1, MainFrame::OnWindowMenu1) @@ -898,7 +894,7 @@ public: }; BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle) - : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle,*wxConvCurrent), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) + : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle,*wxConvCurrent)) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); diff --git a/src/ctsim.h b/src/ctsim.h index 3188b1f..2352c7e 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -124,6 +124,13 @@ public: MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); virtual ~MainFrame(); +#if wxCHECK_VERSION(2,9,0) + // Needed for wx3.0 + void OnMRUFile(wxCommandEvent& event) { + if (m_docManager) m_docManager->OnMRUFile(event); + } +#endif + void OnSize (wxSizeEvent& event); #if CTSIM_WINHELP diff --git a/src/dlgezplot.cpp b/src/dlgezplot.cpp index 1be642e..17fe68f 100644 --- a/src/dlgezplot.cpp +++ b/src/dlgezplot.cpp @@ -102,8 +102,8 @@ EZPlotControl::OnPaint (wxPaintEvent& event) wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton) -: wxDialog((parent ? parent : theApp->getMainFrame()), -1, _T("EZPlot"), wxDefaultPosition, wxDefaultSize), - m_parentTop(0) + : wxDialog((parent ? parent : theApp->getMainFrame()), -1, _T("EZPlot")), + m_parentTop(0) { if (! parent) parent = theApp->getMainFrame(); diff --git a/src/views.cpp b/src/views.cpp index 3411a45..ea03d88 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -1312,7 +1312,7 @@ ImageFileView::OnExport (wxCommandEvent& event) const wxString& strFilename = wxFileSelector (_T("Export Filename"), _T(""), _T(""), strExt, strWildcard, wxFD_OVERWRITE_PROMPT | wxFD_SAVE); - if (strFilename.Length() > 0) { + if (! strFilename.empty()) { rIF.exportImage (strFormatName.mb_str(wxConvUTF8), strFilename.mb_str(wxConvUTF8), 1, 1, m_dMinPixel, m_dMaxPixel); *theApp->getLog() << _T("Exported file ") << strFilename << _T("\n"); } diff --git a/tools/Makefile.am b/tools/Makefile.am index e6b0041..ae0ffe6 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,18 +9,18 @@ SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsuppor endif install-exec-hook: - ln -sf ctsimtext $(bindir)/if1 - ln -sf ctsimtext $(bindir)/if2 - ln -sf ctsimtext $(bindir)/ifexport - ln -sf ctsimtext $(bindir)/ifinfo - ln -sf ctsimtext $(bindir)/phm2if - ln -sf ctsimtext $(bindir)/phm2pj - ln -sf ctsimtext $(bindir)/phm2helix - ln -sf ctsimtext $(bindir)/pj2if - ln -sf ctsimtext $(bindir)/pjinfo - ln -sf ctsimtext $(bindir)/pjrec - ln -sf ctsimtext $(bindir)/pjHinterp - ln -sf ctsimtext $(bindir)/linogram + ln -sf ctsimtext $(DESTDIR)$(bindir)/if1 + ln -sf ctsimtext $(DESTDIR)$(bindir)/if2 + ln -sf ctsimtext $(DESTDIR)$(bindir)/ifexport + ln -sf ctsimtext $(DESTDIR)$(bindir)/ifinfo + ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2if + ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2pj + ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2helix + ln -sf ctsimtext $(DESTDIR)$(bindir)/pj2if + ln -sf ctsimtext $(DESTDIR)$(bindir)/pjinfo + ln -sf ctsimtext $(DESTDIR)$(bindir)/pjrec + ln -sf ctsimtext $(DESTDIR)$(bindir)/pjHinterp + ln -sf ctsimtext $(DESTDIR)$(bindir)/linogram ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp ctsimtext_LDADD=@ctlibs@ diff --git a/tools/phm2helix.cpp b/tools/phm2helix.cpp index 6ef902e..93a8390 100644 --- a/tools/phm2helix.cpp +++ b/tools/phm2helix.cpp @@ -78,7 +78,7 @@ phm2helix_usage (const char *program) std::cout << " (default = 1)\n"; std::cout << " --scan-ratio Length to scan (scan diameter to view diameter)\n"; std::cout << " (default = 1)\n"; - std::cout << " --offsetview Initial gantry offset in 'views' (default = 0)\n"; + std::cout << " --offsetview Initial gantry offset in 'views' (default = 0)\n"; std::cout << " --trace Trace level to use\n"; std::cout << " none No tracing (default)\n"; std::cout << " console Trace text level\n"; -- 2.34.1