diff -Nru xmedcon-0.22.0-gtk3+dfsg/configure.ac xmedcon-0.23.0-gtk3+dfsg/configure.ac --- xmedcon-0.22.0-gtk3+dfsg/configure.ac 2022-03-04 21:35:13.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/configure.ac 2023-01-05 15:40:41.000000000 +0000 @@ -10,7 +10,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Copyright (C) 1997-2022 by Erik Nolf +# Copyright (C) 1997-2023 by Erik Nolf # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,17 +29,17 @@ dnl Autoconf prerequisite and initialization AC_PREREQ([2.71]) -AC_INIT([XMedCon],[0.22.0],[enlf-at-users.sf.net],[xmedcon],[http://xmedcon.sf.net/]) +AC_INIT([XMedCon],[0.23.0],[enlf-at-users.sf.net],[xmedcon],[http://xmedcon.sf.net/]) AC_CONFIG_SRCDIR([source/medcon.c]) AC_CONFIG_HEADERS([config.h]) AX_PREFIX_CONFIG_H([source/m-depend.h],[LIBMDC],[config.h]) XMEDCON_MAJOR="0" -XMEDCON_MINOR="22" +XMEDCON_MINOR="23" XMEDCON_PATCH="0" XMEDCON_PRGR="(X)MedCon" -XMEDCON_DATE="04-mar-2022" +XMEDCON_DATE="04-jan-2023" XMEDCON_VERSION="${XMEDCON_MAJOR}.${XMEDCON_MINOR}.${XMEDCON_PATCH}" XMEDCON_LIBVERS="${XMEDCON_PRGR} ${XMEDCON_VERSION} by Erik Nolf" diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/changelog xmedcon-0.23.0-gtk3+dfsg/debian/changelog --- xmedcon-0.22.0-gtk3+dfsg/debian/changelog 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/changelog 2023-02-05 18:35:32.000000000 +0000 @@ -1,3 +1,11 @@ +xmedcon (0.23.0-gtk3+dfsg-1) unstable; urgency=medium + + * New upstream version + * Standards-Version: 4.6.2 (routine-update) + * Use secure URI in Homepage field. + + -- Andreas Tille Sun, 05 Feb 2023 19:35:32 +0100 + xmedcon (0.22.0-gtk3+dfsg-1) unstable; urgency=medium * New upstream version diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/control xmedcon-0.23.0-gtk3+dfsg/debian/control --- xmedcon-0.22.0-gtk3+dfsg/debian/control 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/control 2023-02-05 18:35:32.000000000 +0000 @@ -11,10 +11,10 @@ zlib1g-dev, libpng-dev, libnifti2-dev -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/med-team/xmedcon Vcs-Git: https://salsa.debian.org/med-team/xmedcon.git -Homepage: http://xmedcon.sourceforge.net/ +Homepage: https://xmedcon.sourceforge.net/ Rules-Requires-Root: no Package: libmdc3 diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/patches/add_gtk_libraries_to_linker.patch xmedcon-0.23.0-gtk3+dfsg/debian/patches/add_gtk_libraries_to_linker.patch --- xmedcon-0.22.0-gtk3+dfsg/debian/patches/add_gtk_libraries_to_linker.patch 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/patches/add_gtk_libraries_to_linker.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Author: Andreas Moog -LastChanged: Sun, 18 Aug 2013 10:27:50 +0200 -Description: Make sure gtk libraries are added to linker call - ---- a/source/Makefile.am -+++ b/source/Makefile.am -@@ -91,7 +91,7 @@ $(APPICON_OBJ): $(APPICON_OBJ:.o=.rc) - xmedcon_LDADD = $(APPICON_OBJ) libmdc.la - xmedcon_LDFLAGS = -mwindows $(GDK_PIXBUF_LIBS) -lm - else --xmedcon_LDADD = libmdc.la -+xmedcon_LDADD = libmdc.la $(XMEDCON_GTK_LIBS) - xmedcon_LDFLAGS = $(XMEDCON_GTK_LIBS) -lm - endif - diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/patches/avoid_linking_to_unneeded_libs.patch xmedcon-0.23.0-gtk3+dfsg/debian/patches/avoid_linking_to_unneeded_libs.patch --- xmedcon-0.22.0-gtk3+dfsg/debian/patches/avoid_linking_to_unneeded_libs.patch 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/patches/avoid_linking_to_unneeded_libs.patch 2023-02-05 18:35:32.000000000 +0000 @@ -6,22 +6,12 @@ --- a/source/Makefile.am +++ b/source/Makefile.am -@@ -22,7 +22,6 @@ bin_PROGRAMS = medcon $(XMEDCON) +@@ -204,7 +204,7 @@ libmdc_la_SOURCES = $(ENABLED_FRMTS_SRCS - medcon_SOURCES = medcon.c - medcon_LDADD = libmdc.la --medcon_LDFLAGS = $(XMEDCON_GLIB_LIBS) $(XMEDCON_GTK_LIBS) -lm - - xmedcon_SOURCES = \ - xcolmap.c \ -@@ -212,8 +211,8 @@ libmdc_la_SOURCES = \ libmdc_la_LDFLAGS = $(no_undefined) -version-info $(LIBVERSION) -lm - libmdc_la_LIBADD = $(ENABLED_FRMTS_OBJS) \ - $(DICM_LIB) $(LJPG_LIB) \ -- $(ZLIB_LIB) $(PNG_LIB) $(NIFTI_LIB) \ -- $(TPC_LIB) $(XMEDCON_GLIB_LIBS) $(XMEDCON_GTK_LIBS) -+ $(PNG_LIB) $(NIFTI_LIB) \ -+ $(TPC_LIB) $(XMEDCON_GLIB_LIBS) - libmdc_la_DEPENDENCIES = $(ENABLED_FRMTS_OBJS) - EXTRA_libmdc_la_SOURCES = $(ALL_FRMTS_SOURCES) - + libmdc_la_LIBADD = $(DICM_LIB) $(LJPG_LIB) \ +- $(ZLIB_LIB) $(PNG_LIB) \ ++ $(PNG_LIB) \ + $(NIFTI_LIB) \ + $(TPC_LIB) \ + $(XMEDCON_GLIB_LIBS) diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/patches/cross.patch xmedcon-0.23.0-gtk3+dfsg/debian/patches/cross.patch --- xmedcon-0.22.0-gtk3+dfsg/debian/patches/cross.patch 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/patches/cross.patch 2023-02-05 18:35:32.000000000 +0000 @@ -11,9 +11,9 @@ Fixing that likely involves using AX_CC_FOR_BUILD and possibly rewriting parse.c to avoid relying on dicom.h. ---- xmedcon.orig/configure.ac -+++ xmedcon/configure.ac -@@ -507,9 +507,9 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -505,9 +505,9 @@ if test x"$nifti_prefix" != x; then ZNZ_LDFLAGS="-L$nifti_prefix/lib -lznz" NIFTI_LDFLAGS="-L$nifti_prefix/lib -lniftiio $ZNZ_LDFLAGS" NIFTI_CFLAGS="" diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/patches/series xmedcon-0.23.0-gtk3+dfsg/debian/patches/series --- xmedcon-0.22.0-gtk3+dfsg/debian/patches/series 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/patches/series 2023-02-05 18:35:32.000000000 +0000 @@ -1,5 +1,4 @@ avoid_linking_to_unneeded_libs.patch -add_gtk_libraries_to_linker.patch use_debian_packaged_niftilib.patch cross.patch typos.patch diff -Nru xmedcon-0.22.0-gtk3+dfsg/debian/patches/use_debian_packaged_niftilib.patch xmedcon-0.23.0-gtk3+dfsg/debian/patches/use_debian_packaged_niftilib.patch --- xmedcon-0.22.0-gtk3+dfsg/debian/patches/use_debian_packaged_niftilib.patch 2022-07-16 07:58:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/debian/patches/use_debian_packaged_niftilib.patch 2023-02-05 18:35:32.000000000 +0000 @@ -2,9 +2,9 @@ Last-Update: Sat, 16 Jun 2018 14:27:43 +0200 Description: Do not create Makefile for removed niftilib ---- xmedcon.orig/configure.ac -+++ xmedcon/configure.ac -@@ -724,7 +724,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -722,7 +722,6 @@ AC_CONFIG_FILES([ libs/Makefile libs/ljpg/Makefile libs/dicom/Makefile @@ -12,9 +12,9 @@ libs/tpc/Makefile macros/Makefile source/Makefile ---- xmedcon.orig/libs/Makefile.am -+++ xmedcon/libs/Makefile.am -@@ -30,6 +30,6 @@ +--- a/libs/Makefile.am ++++ b/libs/Makefile.am +@@ -30,6 +30,6 @@ DIR_TPC = tpc endif endif diff -Nru xmedcon-0.22.0-gtk3+dfsg/etc/xmedcon.iss.in xmedcon-0.23.0-gtk3+dfsg/etc/xmedcon.iss.in --- xmedcon-0.22.0-gtk3+dfsg/etc/xmedcon.iss.in 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/etc/xmedcon.iss.in 2023-01-05 15:40:10.000000000 +0000 @@ -13,7 +13,7 @@ [Setup] AppName=@PACKAGE_NAME@ AppVerName=@PACKAGE_STRING@ -AppCopyright=Copyright © 1997-2022 by Erik Nolf +AppCopyright=Copyright © 1997-2023 by Erik Nolf AppPublisher=Erik Nolf AppPublisherURL=http://sourceforge.net/users/enlf AppSupportURL=http://xmedcon.sourceforge.net/ diff -Nru xmedcon-0.22.0-gtk3+dfsg/etc/xmedcon.rb.in xmedcon-0.23.0-gtk3+dfsg/etc/xmedcon.rb.in --- xmedcon-0.22.0-gtk3+dfsg/etc/xmedcon.rb.in 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/etc/xmedcon.rb.in 2023-01-05 15:40:10.000000000 +0000 @@ -33,6 +33,7 @@ depends_on 'gdk-pixbuf' depends_on 'pkg-config' depends_on 'libpng' + depends_on 'adwaita-icon-theme' depends_on 'autoconf' => :build depends_on 'automake' => :build diff -Nru xmedcon-0.22.0-gtk3+dfsg/etc/xmedcon.spec xmedcon-0.23.0-gtk3+dfsg/etc/xmedcon.spec --- xmedcon-0.22.0-gtk3+dfsg/etc/xmedcon.spec 2022-03-05 22:16:48.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/etc/xmedcon.spec 2023-01-06 14:05:31.000000000 +0000 @@ -11,7 +11,7 @@ # # Name: xmedcon -Version: 0.22.0 +Version: 0.23.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-root diff -Nru xmedcon-0.22.0-gtk3+dfsg/macros/libtool.m4 xmedcon-0.23.0-gtk3+dfsg/macros/libtool.m4 --- xmedcon-0.22.0-gtk3+dfsg/macros/libtool.m4 2022-03-04 21:19:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/macros/libtool.m4 2023-01-05 15:41:08.000000000 +0000 @@ -1,7 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021 Free Software Foundation, -# Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -1069,7 +1069,7 @@ darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) - case ${MACOSX_DEPLOYMENT_TARGET},$host in + case $MACOSX_DEPLOYMENT_TARGET,$host in 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; *) diff -Nru xmedcon-0.22.0-gtk3+dfsg/macros/lt~obsolete.m4 xmedcon-0.23.0-gtk3+dfsg/macros/lt~obsolete.m4 --- xmedcon-0.22.0-gtk3+dfsg/macros/lt~obsolete.m4 2022-03-04 21:19:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/macros/lt~obsolete.m4 2023-01-05 15:41:08.000000000 +0000 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff -Nru xmedcon-0.22.0-gtk3+dfsg/macros/ltoptions.m4 xmedcon-0.23.0-gtk3+dfsg/macros/ltoptions.m4 --- xmedcon-0.22.0-gtk3+dfsg/macros/ltoptions.m4 2022-03-04 21:19:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/macros/ltoptions.m4 2023-01-05 15:41:08.000000000 +0000 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff -Nru xmedcon-0.22.0-gtk3+dfsg/macros/ltsugar.m4 xmedcon-0.23.0-gtk3+dfsg/macros/ltsugar.m4 --- xmedcon-0.22.0-gtk3+dfsg/macros/ltsugar.m4 2022-03-04 21:19:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/macros/ltsugar.m4 2023-01-05 15:41:08.000000000 +0000 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff -Nru xmedcon-0.22.0-gtk3+dfsg/macros/ltversion.m4 xmedcon-0.23.0-gtk3+dfsg/macros/ltversion.m4 --- xmedcon-0.22.0-gtk3+dfsg/macros/ltversion.m4 2022-03-04 21:19:09.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/macros/ltversion.m4 2023-01-05 15:41:08.000000000 +0000 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4238 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6.59-b55b-dirty]) -m4_define([LT_PACKAGE_REVISION], [2.4.6.59]) +m4_define([LT_PACKAGE_VERSION], [2.4.7-dirty]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6.59-b55b-dirty' -macro_revision='2.4.6.59' +[macro_version='2.4.7-dirty' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru xmedcon-0.22.0-gtk3+dfsg/README xmedcon-0.23.0-gtk3+dfsg/README --- xmedcon-0.22.0-gtk3+dfsg/README 2021-05-12 22:54:50.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/README 2023-01-05 15:40:10.000000000 +0000 @@ -133,13 +133,17 @@ machine OS: Unix/Linux (MingW/Cygwin on MS Windows) compiler : gcc (GNU C Compiler !!) utilities : make (GNU make !!) -packages : just for the graphical front-end : Glib/Gdk-Pixbuf/Gtk+2 +packages : just for the graphical front-end : Glib/Gdk-Pixbuf/Gtk What to do first: ---------------- When you need GUI support: - - Check Glib/Gtk packages are installed and shared libs can be found + - Check Glib/Gdk-Pixbuf/Gtk packages are installed and shared libs can be found + + type: 'pkg-config gtk+-3.0 --modversion' + type: 'pkg-config glib-2.0 --modversion' + type: 'pkg-config gdk-pixbuf-2.0 --modversion' Configure (X)MedCon project: --------------------------- diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-acr.c xmedcon-0.23.0-gtk3+dfsg/source/m-acr.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-acr.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-acr.c 2023-01-04 23:52:41.000000000 +0000 @@ -32,7 +32,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-acr.h xmedcon-0.23.0-gtk3+dfsg/source/m-acr.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-acr.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-acr.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/Makefile.am xmedcon-0.23.0-gtk3+dfsg/source/Makefile.am --- xmedcon-0.22.0-gtk3+dfsg/source/Makefile.am 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/Makefile.am 2023-01-05 15:40:10.000000000 +0000 @@ -22,7 +22,10 @@ medcon_SOURCES = medcon.c medcon_LDADD = libmdc.la -medcon_LDFLAGS = $(XMEDCON_GLIB_LIBS) $(XMEDCON_GTK_LIBS) -lm +medcon_LDFLAGS = $(XMEDCON_GLIB_LIBS) -lm +medcon_CPPFLAGS = $(DICM_INC) $(PNG_INC) $(NIFTI_INC) $(TPC_INC) \ + $(ZLIB_FLAGS) \ + $(XMEDCON_GLIB_CFLAGS) xmedcon_SOURCES = \ xcolmap.c \ @@ -90,62 +93,52 @@ windres -i $(APPICON_OBJ:.o=.rc) -o $(APPICON_OBJ) xmedcon_LDADD = $(APPICON_OBJ) libmdc.la -xmedcon_LDFLAGS = -mwindows $(GDK_PIXBUF_LIBS) -lm +xmedcon_LDFLAGS = -mwindows $(XMEDCON_GTK_LIBS) $(GDK_PIXBUF_LIBS) -lm else xmedcon_LDADD = libmdc.la -xmedcon_LDFLAGS = $(XMEDCON_GTK_LIBS) -lm +xmedcon_LDFLAGS = $(XMEDCON_GTK_LIBS) $(GDK_PIXBUF_LIBS) -lm endif - -ALL_FRMTS_SOURCES = \ - m-acr.c \ - m-gif.c \ - m-inw.c \ - m-anlz.c \ - m-conc.c \ - m-matrix.c \ - m-ecat64.c \ - m-ecat72.c \ - m-intf.c \ - m-dicm.c \ - m-png.c \ - m-nifti.c +xmedcon_CPPFLAGS = $(DICM_INC) $(PNG_INC) $(NIFTI_INC) $(TPC_INC) \ + $(ZLIB_CLFAGS) \ + $(XMEDCON_GLIB_CFLAGS) \ + $(XMEDCON_GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS) ZLIB_LIB = @ZLIB_LDFLAGS@ if DO_ACR -ACR_OBJ = m-acr.lo +ACR_SRC = m-acr.c endif if DO_GIF -GIF_OBJ = m-gif.lo +GIF_SRC = m-gif.c endif if DO_INW -INW_OBJ = m-inw.lo +INW_SRC = m-inw.c endif if DO_ANLZ -ANLZ_OBJ = m-anlz.lo +ANLZ_SRC = m-anlz.c endif if DO_CONC -CONC_OBJ = m-conc.lo +CONC_SRC = m-conc.c endif if DO_ECAT -ECAT_OBJ = m-matrix.lo m-ecat64.lo m-ecat72.lo +ECAT_SRC = m-matrix.c m-ecat64.c m-ecat72.c endif if DO_INTF -INTF_OBJ = m-intf.lo +INTF_SRC = m-intf.c endif if DO_DICM -DICM_OBJ = m-dicm.lo +DICM_SRC = m-dicm.c DICM_DIR = ../libs/dicom DICM_INC = -I$(DICM_DIR) DICM_LIB = $(DICM_DIR)/libdicom.la endif if DO_PNG -PNG_OBJ = m-png.lo +PNG_SRC = m-png.c PNG_LIB = @PNG_LDFLAGS@ PNG_INC = @PNG_CFLAGS@ endif if DO_NIFTI -NIFTI_OBJ = m-nifti.lo +NIFTI_SRC = m-nifti.c NIFTI_LIB = @NIFTI_LDFLAGS@ NIFTI_INC = @NIFTI_CFLAGS@ endif @@ -158,17 +151,17 @@ LJPG_LIB = $(LJPG_DIR)/libljpg.la endif -ENABLED_FRMTS_OBJS = \ - $(ACR_OBJ) \ - $(GIF_OBJ) \ - $(INW_OBJ) \ - $(ANLZ_OBJ) \ - $(CONC_OBJ) \ - $(ECAT_OBJ) \ - $(INTF_OBJ) \ - $(DICM_OBJ) \ - $(PNG_OBJ) \ - $(NIFTI_OBJ) +ENABLED_FRMTS_SRCS = \ + $(ACR_SRC) \ + $(GIF_SRC) \ + $(INW_SRC) \ + $(ANLZ_SRC) \ + $(CONC_SRC) \ + $(ECAT_SRC) \ + $(INTF_SRC) \ + $(DICM_SRC) \ + $(PNG_SRC) \ + $(NIFTI_SRC) lib_LTLIBRARIES = libmdc.la @@ -187,7 +180,7 @@ endif -libmdc_la_SOURCES = \ +libmdc_la_SOURCES = $(ENABLED_FRMTS_SRCS) \ m-init.c \ m-vifi.c \ m-color.c \ @@ -210,12 +203,14 @@ m-raw.c libmdc_la_LDFLAGS = $(no_undefined) -version-info $(LIBVERSION) -lm -libmdc_la_LIBADD = $(ENABLED_FRMTS_OBJS) \ - $(DICM_LIB) $(LJPG_LIB) \ - $(ZLIB_LIB) $(PNG_LIB) $(NIFTI_LIB) \ - $(TPC_LIB) $(XMEDCON_GLIB_LIBS) $(XMEDCON_GTK_LIBS) -libmdc_la_DEPENDENCIES = $(ENABLED_FRMTS_OBJS) -EXTRA_libmdc_la_SOURCES = $(ALL_FRMTS_SOURCES) +libmdc_la_LIBADD = $(DICM_LIB) $(LJPG_LIB) \ + $(ZLIB_LIB) $(PNG_LIB) \ + $(NIFTI_LIB) \ + $(TPC_LIB) \ + $(XMEDCON_GLIB_LIBS) +libmdc_la_CPPFLAGS = $(DICM_INC) $(PNG_INC) $(NIFTI_INC) $(TPC_INC) \ + $(ZLIB_FLAGS) \ + $(XMEDCON_GLIB_CFLAGS) include_HEADERS = \ medcon.h \ @@ -256,10 +251,7 @@ configheadersdir = $(prefix)/include configheaders_DATA = m-depend.h m-config.h -AM_CPPFLAGS = $(DICM_INC) $(PNG_INC) $(NIFTI_INC) $(TPC_INC) \ - $(GDK_PIXBUF_CFLAGS) $(XMEDCON_GLIB_CFLAGS) \ - $(XMEDCON_GTK_CFLAGS) $(ZLIB_CFLAGS) -AM_CFLAGS = -Wno-deprecated-declarations +# AM_CFLAGS = -Wno-deprecated-declarations EXTRA_DIST = appicon.rc diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-algori.c xmedcon-0.23.0-gtk3+dfsg/source/m-algori.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-algori.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-algori.c 2023-01-04 23:52:42.000000000 +0000 @@ -45,7 +45,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-algori.h xmedcon-0.23.0-gtk3+dfsg/source/m-algori.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-algori.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-algori.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-anlz.c xmedcon-0.23.0-gtk3+dfsg/source/m-anlz.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-anlz.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-anlz.c 2023-01-04 23:52:42.000000000 +0000 @@ -21,7 +21,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-anlz.h xmedcon-0.23.0-gtk3+dfsg/source/m-anlz.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-anlz.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-anlz.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-color.c xmedcon-0.23.0-gtk3+dfsg/source/m-color.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-color.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-color.c 2023-01-04 23:52:42.000000000 +0000 @@ -21,7 +21,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-color.h xmedcon-0.23.0-gtk3+dfsg/source/m-color.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-color.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-color.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-conc.c xmedcon-0.23.0-gtk3+dfsg/source/m-conc.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-conc.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-conc.c 2023-01-04 23:52:42.000000000 +0000 @@ -27,7 +27,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-conc.h xmedcon-0.23.0-gtk3+dfsg/source/m-conc.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-conc.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-conc.h 2023-01-04 23:52:42.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-config.h.in xmedcon-0.23.0-gtk3+dfsg/source/m-config.h.in --- xmedcon-0.22.0-gtk3+dfsg/source/m-config.h.in 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-config.h.in 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-debug.c xmedcon-0.23.0-gtk3+dfsg/source/m-debug.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-debug.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-debug.c 2023-01-04 23:52:42.000000000 +0000 @@ -15,7 +15,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-debug.h xmedcon-0.23.0-gtk3+dfsg/source/m-debug.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-debug.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-debug.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-defs.h xmedcon-0.23.0-gtk3+dfsg/source/m-defs.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-defs.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-defs.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-dicm.c xmedcon-0.23.0-gtk3+dfsg/source/m-dicm.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-dicm.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-dicm.c 2023-01-04 23:52:42.000000000 +0000 @@ -22,7 +22,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-dicm.h xmedcon-0.23.0-gtk3+dfsg/source/m-dicm.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-dicm.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-dicm.h 2023-01-04 23:52:41.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-ecat64.c xmedcon-0.23.0-gtk3+dfsg/source/m-ecat64.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-ecat64.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-ecat64.c 2023-01-04 23:52:42.000000000 +0000 @@ -28,7 +28,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-ecat64.h xmedcon-0.23.0-gtk3+dfsg/source/m-ecat64.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-ecat64.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-ecat64.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-ecat72.c xmedcon-0.23.0-gtk3+dfsg/source/m-ecat72.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-ecat72.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-ecat72.c 2023-01-04 23:52:43.000000000 +0000 @@ -21,7 +21,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -1062,12 +1062,16 @@ h->decay_corr_fctr = 0.0f; /* int <- ??? */ h->processing_code = 0; - if (fi->gdata) { + if (fi->gatednr > 0 && fi->gdata != NULL) { /* int <- float (ms) */ - h->gate_duration = fi->gdata->image_duration; + h->gate_duration = fi->gdata[0].image_duration; /* int <- float (ms) */ - h->r_wave_offset = fi->gdata->window_low; - h->num_accepted_beats = fi->gdata->cycles_acquired; + h->r_wave_offset = fi->gdata[0].window_low; + h->num_accepted_beats = fi->gdata[0].cycles_acquired; + }else{ + h->gate_duration = 0; + h->r_wave_offset = 0; + h->num_accepted_beats = 0; } /* float <- ??? */ h->filter_cutoff_frequency = 0.0f; diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-ecat72.h xmedcon-0.23.0-gtk3+dfsg/source/m-ecat72.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-ecat72.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-ecat72.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/medcon.c xmedcon-0.23.0-gtk3+dfsg/source/medcon.c --- xmedcon-0.22.0-gtk3+dfsg/source/medcon.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/medcon.c 2023-01-04 23:52:43.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/medcon.h xmedcon-0.23.0-gtk3+dfsg/source/medcon.h --- xmedcon-0.22.0-gtk3+dfsg/source/medcon.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/medcon.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-error.c xmedcon-0.23.0-gtk3+dfsg/source/m-error.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-error.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-error.c 2023-01-04 23:52:42.000000000 +0000 @@ -18,7 +18,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-error.h xmedcon-0.23.0-gtk3+dfsg/source/m-error.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-error.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-error.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-fancy.c xmedcon-0.23.0-gtk3+dfsg/source/m-fancy.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-fancy.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-fancy.c 2023-01-04 23:52:43.000000000 +0000 @@ -64,7 +64,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -233,13 +233,13 @@ case BIT64_S: { Int64 *val = (Int64 *) pvalue; - fprintf(fp,"%ld",val[0]); + fprintf(fp,"%lld",val[0]); } break; case BIT64_U: { Uint64 *val = (Uint64 *) pvalue; - fprintf(fp,"%lu",val[0]); + fprintf(fp,"%llu",val[0]); } break; case FLT32: diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-fancy.h xmedcon-0.23.0-gtk3+dfsg/source/m-fancy.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-fancy.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-fancy.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-files.c xmedcon-0.23.0-gtk3+dfsg/source/m-files.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-files.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-files.c 2023-01-04 23:52:43.000000000 +0000 @@ -50,7 +50,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-files.h xmedcon-0.23.0-gtk3+dfsg/source/m-files.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-files.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-files.h 2023-01-04 23:52:41.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-getopt.c xmedcon-0.23.0-gtk3+dfsg/source/m-getopt.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-getopt.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-getopt.c 2023-01-04 23:52:42.000000000 +0000 @@ -19,7 +19,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -329,7 +329,7 @@ } MdcPrntScrn(" Medical Image Conversion Utility\n"); MdcPrntScrn("(X)MedCon %s\n",MdcGetLibShortVersion()); - MdcPrntScrn("Copyright (C) 1997-2022 by Erik Nolf\n\n"); + MdcPrntScrn("Copyright (C) 1997-2023 by Erik Nolf\n\n"); if (XMDC_GUI == MDC_YES) { MdcPrntScrn("Try \'xmedcon --help\' for more information.\n\n"); diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-getopt.h xmedcon-0.23.0-gtk3+dfsg/source/m-getopt.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-getopt.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-getopt.h 2023-01-04 23:52:41.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-gif.c xmedcon-0.23.0-gtk3+dfsg/source/m-gif.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-gif.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-gif.c 2023-01-04 23:52:42.000000000 +0000 @@ -45,7 +45,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-gif.h xmedcon-0.23.0-gtk3+dfsg/source/m-gif.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-gif.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-gif.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-global.c xmedcon-0.23.0-gtk3+dfsg/source/m-global.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-global.c 2022-03-03 20:54:34.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-global.c 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-global.h xmedcon-0.23.0-gtk3+dfsg/source/m-global.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-global.h 2022-03-03 20:54:34.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-global.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-init.c xmedcon-0.23.0-gtk3+dfsg/source/m-init.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-init.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-init.c 2023-01-04 23:52:43.000000000 +0000 @@ -22,7 +22,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-init.h xmedcon-0.23.0-gtk3+dfsg/source/m-init.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-init.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-init.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-intf.c xmedcon-0.23.0-gtk3+dfsg/source/m-intf.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-intf.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-intf.c 2023-01-04 23:52:43.000000000 +0000 @@ -58,7 +58,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-intf.h xmedcon-0.23.0-gtk3+dfsg/source/m-intf.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-intf.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-intf.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-inw.c xmedcon-0.23.0-gtk3+dfsg/source/m-inw.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-inw.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-inw.c 2023-01-04 23:52:42.000000000 +0000 @@ -20,7 +20,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-inw.h xmedcon-0.23.0-gtk3+dfsg/source/m-inw.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-inw.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-inw.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-matrix.c xmedcon-0.23.0-gtk3+dfsg/source/m-matrix.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-matrix.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-matrix.c 2023-01-04 23:52:42.000000000 +0000 @@ -28,7 +28,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-matrix.h xmedcon-0.23.0-gtk3+dfsg/source/m-matrix.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-matrix.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-matrix.h 2023-01-04 23:52:43.000000000 +0000 @@ -20,7 +20,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-nifti.c xmedcon-0.23.0-gtk3+dfsg/source/m-nifti.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-nifti.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-nifti.c 2023-01-04 23:52:43.000000000 +0000 @@ -16,7 +16,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-nifti.h xmedcon-0.23.0-gtk3+dfsg/source/m-nifti.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-nifti.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-nifti.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-pixels.c xmedcon-0.23.0-gtk3+dfsg/source/m-pixels.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-pixels.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-pixels.c 2023-01-04 23:52:42.000000000 +0000 @@ -18,7 +18,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-pixels.h xmedcon-0.23.0-gtk3+dfsg/source/m-pixels.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-pixels.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-pixels.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-png.c xmedcon-0.23.0-gtk3+dfsg/source/m-png.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-png.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-png.c 2023-01-04 23:52:43.000000000 +0000 @@ -20,7 +20,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-png.h xmedcon-0.23.0-gtk3+dfsg/source/m-png.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-png.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-png.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-progress.c xmedcon-0.23.0-gtk3+dfsg/source/m-progress.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-progress.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-progress.c 2023-01-04 23:52:43.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-progress.h xmedcon-0.23.0-gtk3+dfsg/source/m-progress.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-progress.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-progress.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-qmedian.c xmedcon-0.23.0-gtk3+dfsg/source/m-qmedian.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-qmedian.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-qmedian.c 2023-01-04 23:52:43.000000000 +0000 @@ -32,7 +32,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-qmedian.h xmedcon-0.23.0-gtk3+dfsg/source/m-qmedian.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-qmedian.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-qmedian.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-raw.c xmedcon-0.23.0-gtk3+dfsg/source/m-raw.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-raw.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-raw.c 2023-01-04 23:52:42.000000000 +0000 @@ -24,7 +24,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-raw.h xmedcon-0.23.0-gtk3+dfsg/source/m-raw.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-raw.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-raw.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-rslice.c xmedcon-0.23.0-gtk3+dfsg/source/m-rslice.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-rslice.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-rslice.c 2023-01-04 23:52:42.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-rslice.h xmedcon-0.23.0-gtk3+dfsg/source/m-rslice.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-rslice.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-rslice.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-split.c xmedcon-0.23.0-gtk3+dfsg/source/m-split.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-split.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-split.c 2023-01-04 23:52:42.000000000 +0000 @@ -21,7 +21,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-split.h xmedcon-0.23.0-gtk3+dfsg/source/m-split.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-split.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-split.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-stack.c xmedcon-0.23.0-gtk3+dfsg/source/m-stack.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-stack.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-stack.c 2023-01-04 23:59:32.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-stack.h xmedcon-0.23.0-gtk3+dfsg/source/m-stack.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-stack.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-stack.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-structs.c xmedcon-0.23.0-gtk3+dfsg/source/m-structs.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-structs.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-structs.c 2023-01-04 23:52:43.000000000 +0000 @@ -41,7 +41,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-structs.h xmedcon-0.23.0-gtk3+dfsg/source/m-structs.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-structs.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-structs.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-transf.c xmedcon-0.23.0-gtk3+dfsg/source/m-transf.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-transf.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-transf.c 2023-01-04 23:52:41.000000000 +0000 @@ -25,7 +25,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -457,6 +457,7 @@ double wc, ww, rs, ri; double xval, yval; double ymax, ymin; + double upper, lower; Uint8 *pix; Uint32 i, p, n; Int16 *newbuf, newtype=BIT16_S, pix16; @@ -473,8 +474,12 @@ ww = (double)fi->window_width; } + /* prevent pixel corruption */ if (ww == 0.) return(NULL); + upper = wc + (ww / 2.); + lower = wc - (ww / 2.); + for (i=0; i < fi->number; i++) { id = &fi->image[i]; @@ -487,16 +492,12 @@ rs = (double)id->quant_scale; ri = (double)id->intercept; - /* prevent division by zero */ + /* prevent bad values */ if (rs == 0.) rs = 1.; - /* rescale window towards pixel values */ - wc = (wc - ri) / rs; - ww = (ww / rs); - /* prepare range value: [0 -> +max] */ ymin = 0.; - ymax = (float)MDC_MAX_BIT16_S; + ymax = (double)MDC_MAX_BIT16_S; n = id->width * id->height; for (pix=id->buf, p=0; p < n; p++, pix+=MdcType2Bytes(id->type)) { @@ -504,13 +505,17 @@ /* get pixel value */ xval = MdcGetDoublePixel(pix,id->type); - /* apply window centre/width */ - if ( xval <= wc - 0.5 - ((ww-1.)/2.)) { - yval = ymin; - }else if ( xval > wc - 0.5 + ((ww-1.)/2.)) { + /* apply rescale slope & intercept */ + xval = xval * rs + ri; + + /* apply window centre/width towards new range */ + /* xval=upper -> ymax & xval=lower -> ymin */ + yval = (ymax * (xval - lower)) / (upper - lower); + + if (yval > ymax) { yval = ymax; - }else{ - yval = ((((xval-(wc-0.5))/(ww-1.))+0.5) * (ymax-ymin)) + ymin; + }else if (yval < ymin) { + yval = ymin; } /* save in new type */ @@ -547,7 +552,7 @@ id->fmax = id->qfmax = max; id->fmin = id->qfmin = min; id->rescale_slope = 1.; - id->rescale_intercept = 1.; + id->rescale_intercept = 0.; id->quant_scale = 1.; id->calibr_fctr = 1.; id->intercept = 0.; diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-transf.h xmedcon-0.23.0-gtk3+dfsg/source/m-transf.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-transf.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-transf.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-vifi.c xmedcon-0.23.0-gtk3+dfsg/source/m-vifi.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-vifi.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-vifi.c 2023-01-04 23:52:43.000000000 +0000 @@ -16,7 +16,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-vifi.h xmedcon-0.23.0-gtk3+dfsg/source/m-vifi.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-vifi.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-vifi.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-xtract.c xmedcon-0.23.0-gtk3+dfsg/source/m-xtract.c --- xmedcon-0.22.0-gtk3+dfsg/source/m-xtract.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-xtract.c 2023-01-04 23:52:42.000000000 +0000 @@ -15,7 +15,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/m-xtract.h xmedcon-0.23.0-gtk3+dfsg/source/m-xtract.h --- xmedcon-0.22.0-gtk3+dfsg/source/m-xtract.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/m-xtract.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xcolgbc.c xmedcon-0.23.0-gtk3+dfsg/source/xcolgbc.c --- xmedcon-0.22.0-gtk3+dfsg/source/xcolgbc.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xcolgbc.c 2023-01-05 15:40:10.000000000 +0000 @@ -24,7 +24,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xcolgbc.h xmedcon-0.23.0-gtk3+dfsg/source/xcolgbc.h --- xmedcon-0.22.0-gtk3+dfsg/source/xcolgbc.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xcolgbc.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -34,7 +34,7 @@ /**************************************************************************** F U N C T I O N S ****************************************************************************/ -gboolean XMdcColGbcCorrectExpose(GtkWidget *widget +gboolean XMdcColGbcCorrectDraw(GtkWidget *widget ,GdkEventExpose *event, gpointer data); void XMdcColGbcCorrectUpdate(void); void XMdcColGbcCorrectMakeIcons(void); diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xcolmap.c xmedcon-0.23.0-gtk3+dfsg/source/xcolmap.c --- xmedcon-0.22.0-gtk3+dfsg/source/xcolmap.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xcolmap.c 2023-01-05 15:40:10.000000000 +0000 @@ -27,7 +27,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xcolmap.h xmedcon-0.23.0-gtk3+dfsg/source/xcolmap.h --- xmedcon-0.22.0-gtk3+dfsg/source/xcolmap.h 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xcolmap.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xdefs.c xmedcon-0.23.0-gtk3+dfsg/source/xdefs.c --- xmedcon-0.22.0-gtk3+dfsg/source/xdefs.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xdefs.c 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -50,11 +50,6 @@ _TTB = Top-to-Bottom _BTT = Bottom-to-Top */ -GdkColor Red; -GdkColor Green; -GdkColor Blue; -GdkColor Yellow; - GdkCursor *handcursor; GdkCursor *zoomcursor; diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xdefs.h xmedcon-0.23.0-gtk3+dfsg/source/xdefs.h --- xmedcon-0.22.0-gtk3+dfsg/source/xdefs.h 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xdefs.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -313,11 +313,6 @@ extern Uint8 XMDC_DOBAR; -extern GdkColor Red; -extern GdkColor Green; -extern GdkColor Blue; -extern GdkColor Yellow; - extern GdkCursor *handcursor; extern GdkCursor *zoomcursor; diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xerror.c xmedcon-0.23.0-gtk3+dfsg/source/xerror.c --- xmedcon-0.22.0-gtk3+dfsg/source/xerror.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xerror.c 2023-01-05 15:40:10.000000000 +0000 @@ -25,7 +25,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xerror.h xmedcon-0.23.0-gtk3+dfsg/source/xerror.h --- xmedcon-0.22.0-gtk3+dfsg/source/xerror.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xerror.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xextract.c xmedcon-0.23.0-gtk3+dfsg/source/xextract.c --- xmedcon-0.22.0-gtk3+dfsg/source/xextract.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xextract.c 2023-01-05 15:40:10.000000000 +0000 @@ -21,7 +21,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xextract.h xmedcon-0.23.0-gtk3+dfsg/source/xextract.h --- xmedcon-0.22.0-gtk3+dfsg/source/xextract.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xextract.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xfancy.c xmedcon-0.23.0-gtk3+dfsg/source/xfancy.c --- xmedcon-0.22.0-gtk3+dfsg/source/xfancy.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xfancy.c 2023-01-05 15:40:10.000000000 +0000 @@ -16,7 +16,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xfancy.h xmedcon-0.23.0-gtk3+dfsg/source/xfancy.h --- xmedcon-0.22.0-gtk3+dfsg/source/xfancy.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xfancy.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xfiles.c xmedcon-0.23.0-gtk3+dfsg/source/xfiles.c --- xmedcon-0.22.0-gtk3+dfsg/source/xfiles.c 2022-03-01 10:16:10.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xfiles.c 2023-01-04 23:52:43.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xfilesel.c xmedcon-0.23.0-gtk3+dfsg/source/xfilesel.c --- xmedcon-0.22.0-gtk3+dfsg/source/xfilesel.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xfilesel.c 2023-01-05 15:40:10.000000000 +0000 @@ -33,7 +33,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -300,8 +300,6 @@ if (LOOK) XMdcDisplayFatalErr(MDC_BAD_CODE,"Unexpected format to save"); - XMdcFileSelSaveSetDefaultName(fs); - gtk_combo_box_set_active(GTK_COMBO_BOX(formatmenu), selected); g_signal_connect(formatmenu, "changed" , G_CALLBACK(XMdcFileSelSaveCallbackFormatMenu) @@ -457,6 +455,8 @@ if (MDC_ALIAS_NAME == MDC_YES) gtk_widget_hide(default_name); else gtk_widget_show(default_name); + XMdcFileSelSaveSetDefaultName(sfilew); + response = gtk_dialog_run(GTK_DIALOG(sfilew)); gtk_widget_hide(sfilew); diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xfilesel.h xmedcon-0.23.0-gtk3+dfsg/source/xfilesel.h --- xmedcon-0.22.0-gtk3+dfsg/source/xfilesel.h 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xfilesel.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xfiles.h xmedcon-0.23.0-gtk3+dfsg/source/xfiles.h --- xmedcon-0.22.0-gtk3+dfsg/source/xfiles.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xfiles.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xhelp.c xmedcon-0.23.0-gtk3+dfsg/source/xhelp.c --- xmedcon-0.22.0-gtk3+dfsg/source/xhelp.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xhelp.c 2023-01-05 15:40:10.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xhelp.h xmedcon-0.23.0-gtk3+dfsg/source/xhelp.h --- xmedcon-0.22.0-gtk3+dfsg/source/xhelp.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xhelp.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xicons.h xmedcon-0.23.0-gtk3+dfsg/source/xicons.h --- xmedcon-0.22.0-gtk3+dfsg/source/xicons.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xicons.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/ximages.c xmedcon-0.23.0-gtk3+dfsg/source/ximages.c --- xmedcon-0.22.0-gtk3+dfsg/source/ximages.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/ximages.c 2023-01-05 15:40:10.000000000 +0000 @@ -20,7 +20,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/ximages.h xmedcon-0.23.0-gtk3+dfsg/source/ximages.h --- xmedcon-0.22.0-gtk3+dfsg/source/ximages.h 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/ximages.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xinfo.c xmedcon-0.23.0-gtk3+dfsg/source/xinfo.c --- xmedcon-0.22.0-gtk3+dfsg/source/xinfo.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xinfo.c 2023-01-05 15:40:10.000000000 +0000 @@ -15,7 +15,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xinfo.h xmedcon-0.23.0-gtk3+dfsg/source/xinfo.h --- xmedcon-0.22.0-gtk3+dfsg/source/xinfo.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xinfo.h 2023-01-05 00:21:36.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xlabels.c xmedcon-0.23.0-gtk3+dfsg/source/xlabels.c --- xmedcon-0.22.0-gtk3+dfsg/source/xlabels.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xlabels.c 2023-01-05 15:40:10.000000000 +0000 @@ -22,7 +22,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xlabels.h xmedcon-0.23.0-gtk3+dfsg/source/xlabels.h --- xmedcon-0.22.0-gtk3+dfsg/source/xlabels.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xlabels.h 2023-01-05 00:21:36.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xmedcon.c xmedcon-0.23.0-gtk3+dfsg/source/xmedcon.c --- xmedcon-0.22.0-gtk3+dfsg/source/xmedcon.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xmedcon.c 2023-01-05 15:40:10.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xmedcon.h xmedcon-0.23.0-gtk3+dfsg/source/xmedcon.h --- xmedcon-0.22.0-gtk3+dfsg/source/xmedcon.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xmedcon.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xmnuftry.c xmedcon-0.23.0-gtk3+dfsg/source/xmnuftry.c --- xmedcon-0.22.0-gtk3+dfsg/source/xmnuftry.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xmnuftry.c 2023-01-05 15:40:10.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xmnuftry.h xmedcon-0.23.0-gtk3+dfsg/source/xmnuftry.h --- xmedcon-0.22.0-gtk3+dfsg/source/xmnuftry.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xmnuftry.h 2023-01-05 00:21:36.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xoptions.c xmedcon-0.23.0-gtk3+dfsg/source/xoptions.c --- xmedcon-0.22.0-gtk3+dfsg/source/xoptions.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xoptions.c 2023-01-05 15:40:10.000000000 +0000 @@ -32,7 +32,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xoptions.h xmedcon-0.23.0-gtk3+dfsg/source/xoptions.h --- xmedcon-0.22.0-gtk3+dfsg/source/xoptions.h 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xoptions.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xpages.c xmedcon-0.23.0-gtk3+dfsg/source/xpages.c --- xmedcon-0.22.0-gtk3+dfsg/source/xpages.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xpages.c 2023-01-05 15:40:10.000000000 +0000 @@ -21,7 +21,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xpages.h xmedcon-0.23.0-gtk3+dfsg/source/xpages.h --- xmedcon-0.22.0-gtk3+dfsg/source/xpages.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xpages.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xprogbar.c xmedcon-0.23.0-gtk3+dfsg/source/xprogbar.c --- xmedcon-0.22.0-gtk3+dfsg/source/xprogbar.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xprogbar.c 2023-01-05 15:40:10.000000000 +0000 @@ -24,7 +24,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xprogbar.h xmedcon-0.23.0-gtk3+dfsg/source/xprogbar.h --- xmedcon-0.22.0-gtk3+dfsg/source/xprogbar.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xprogbar.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xreader.c xmedcon-0.23.0-gtk3+dfsg/source/xreader.c --- xmedcon-0.22.0-gtk3+dfsg/source/xreader.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xreader.c 2023-01-05 15:40:10.000000000 +0000 @@ -12,9 +12,9 @@ * XMdcRawReadInteractive() - Interactive raw read * * XMdcRawReadPredef() - Read predefined raw * * XMdcRawReadCancel() - Raw read break up * + * XMdcRawReadCallbackCancel() - General Cancel callback* * XMdcGetImageInfoPixelType() - Get specified pixeltype* * XMdcGetImageInfoCallbackApply() - Img Info Apply callback* - * XMdcGetImageInfoCallbackCancel()- Img Info Cancel * * XMdcGetImageInfo() - Ask Img Info * * XMdcGetHeaderInfoCallbackApply()- Hdr Info Cont callback * * XMdcGetHeaderInfo() - Ask Hdr Info * @@ -24,7 +24,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -219,6 +219,14 @@ MdcCleanUpFI(my.fi); if (otype == XMDC_RAW) gtk_widget_destroy(sRawReadSelection.HdrInfoWindow); + + XMdcMainWidgetsResensitive(); + +} + +void XMdcRawReadCallbackCancel(void) +{ + XMdcRawReadCancel(XMDC_RAW); } Int16 XMdcGetImageInfoPixelType(void) @@ -324,11 +332,6 @@ } -void XMdcGetImageInfoCallbackCancel(void) -{ - XMdcRawReadCancel(XMDC_RAW); -} - void XMdcGetImageInfo(void) { GtkWidget *window=NULL; @@ -588,7 +591,7 @@ button = gtk_button_new_with_label("Cancel"); gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 2); g_signal_connect(button, "clicked", - G_CALLBACK(XMdcGetImageInfoCallbackCancel), NULL); + G_CALLBACK(XMdcRawReadCallbackCancel), NULL); g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy), window); @@ -676,7 +679,7 @@ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); g_signal_connect(window,"destroy", - G_CALLBACK(XMdcWidgetCallbackDestroy),NULL); + G_CALLBACK(gtk_widget_destroy),NULL); gtk_window_set_title(GTK_WINDOW(window),"Input Header Info"); raw->HdrInfoWindow = window; @@ -798,9 +801,8 @@ button = gtk_button_new_with_label("Cancel"); gtk_box_pack_start(GTK_BOX(box2),button,TRUE,TRUE,2); - g_signal_connect_swapped(button, "clicked", - G_CALLBACK(gtk_widget_destroy), - window); + g_signal_connect(button, "clicked", + G_CALLBACK(XMdcRawReadCallbackCancel), NULL); gtk_widget_show(button); XMdcShowWidget(window); diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xreader.h xmedcon-0.23.0-gtk3+dfsg/source/xreader.h --- xmedcon-0.22.0-gtk3+dfsg/source/xreader.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xreader.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -40,9 +40,9 @@ void XMdcRawReadInteractive(char *fname); void XMdcRawReadPredef(char *fname); void XMdcRawReadCancel(guint otype); +void XMdcRawReadCallbackCancel(void); Int16 XMdcGetImageInfoPixelType(void); void XMdcGetImageInfoCallbackApply(void); -void XMdcGetImageInfoCallbackCancel(void); void XMdcGetImageInfo(void); void XMdcGetHeaderInfoCallbackApply(void); void XMdcGetHeaderInfo(void); diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xrender.c xmedcon-0.23.0-gtk3+dfsg/source/xrender.c --- xmedcon-0.22.0-gtk3+dfsg/source/xrender.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xrender.c 2023-01-05 15:40:10.000000000 +0000 @@ -16,7 +16,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xrender.h xmedcon-0.23.0-gtk3+dfsg/source/xrender.h --- xmedcon-0.22.0-gtk3+dfsg/source/xrender.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xrender.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xreset.c xmedcon-0.23.0-gtk3+dfsg/source/xreset.c --- xmedcon-0.22.0-gtk3+dfsg/source/xreset.c 2022-03-01 10:16:10.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xreset.c 2023-01-05 00:21:36.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xreset.h xmedcon-0.23.0-gtk3+dfsg/source/xreset.h --- xmedcon-0.22.0-gtk3+dfsg/source/xreset.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xreset.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xresize.c xmedcon-0.23.0-gtk3+dfsg/source/xresize.c --- xmedcon-0.22.0-gtk3+dfsg/source/xresize.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xresize.c 2023-01-05 15:40:10.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xresize.h xmedcon-0.23.0-gtk3+dfsg/source/xresize.h --- xmedcon-0.22.0-gtk3+dfsg/source/xresize.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xresize.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xreslice.c xmedcon-0.23.0-gtk3+dfsg/source/xreslice.c --- xmedcon-0.22.0-gtk3+dfsg/source/xreslice.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xreslice.c 2023-01-04 23:52:43.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xreslice.h xmedcon-0.23.0-gtk3+dfsg/source/xreslice.h --- xmedcon-0.22.0-gtk3+dfsg/source/xreslice.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xreslice.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xtransf.c xmedcon-0.23.0-gtk3+dfsg/source/xtransf.c --- xmedcon-0.22.0-gtk3+dfsg/source/xtransf.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xtransf.c 2023-01-04 23:52:43.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xtransf.h xmedcon-0.23.0-gtk3+dfsg/source/xtransf.h --- xmedcon-0.22.0-gtk3+dfsg/source/xtransf.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xtransf.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xutils.c xmedcon-0.23.0-gtk3+dfsg/source/xutils.c --- xmedcon-0.22.0-gtk3+dfsg/source/xutils.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xutils.c 2023-01-05 15:40:10.000000000 +0000 @@ -10,12 +10,10 @@ * Functions : XMdcMedconQuit() - Quit XMedCon main program * * XMdcMainWidgetsInsensitive()- Make them insensitive * * XMdcMainWidgetsResensitive()- Make them sensitive * - * XMdcWidgetCallbackDestroy() - General Destroy callback * * XMdcConfigureByCss() - Parse CSS style file * * XMdcAskYesNo() - Ask a Yes/No question * * XMdcRunDialog() - Run modal dialog * * XMdcShowWidget() - Our show the widget routine* - * XMdcWidgetDestroy() - Destroy widget = NULL * * XMdcSetGbcCorrection() - Set GBC corrected values * * XMdcBuildRgbImage() - Build an RGB image * * XMdcBuildGdkPixbuf() - Build GdkPixbuf out img8 * @@ -38,7 +36,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -101,12 +99,6 @@ } -void XMdcWidgetCallbackDestroy(GtkWidget *window) -{ - gtk_widget_destroy(window); window = NULL; - XMdcMainWidgetsResensitive(); -} - void XMdcConfigureByCss(void) { GtkCssProvider *provider; @@ -253,14 +245,6 @@ gtk_widget_show(widget); } -void XMdcWidgetDestroy(GtkWidget *widget, gpointer data) -{ - MdcDebugPrint("XMdcDestroyWidget()"); - if (data != NULL) { - gtk_widget_destroy(GTK_WIDGET(data)); data = NULL; - } -} - void XMdcSetGbcCorrection(ColorModifier *mod) { double g, b, c, ii, v; diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xutils.h xmedcon-0.23.0-gtk3+dfsg/source/xutils.h --- xmedcon-0.22.0-gtk3+dfsg/source/xutils.h 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xutils.h 2023-01-05 15:40:10.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -38,12 +38,10 @@ void XMdcMedconQuit(GtkWidget *widget, gpointer data); void XMdcMainWidgetsInsensitive(void); void XMdcMainWidgetsResensitive(void); -void XMdcWidgetCallbackDestroy(GtkWidget *window); void XMdcConfigureByCss(void); void XMdcAskYesNo(GCallback YesFunc, GCallback NoFunc, char *question); void XMdcRunDialog(GtkWidget *dialog); void XMdcShowWidget(GtkWidget *widget); -void XMdcWidgetDestroy(GtkWidget *widget, gpointer data); void XMdcSetGbcCorrection(ColorModifier *mod); Uint8 *XMdcBuildRgbImage(Uint8 *img8, Int16 type, Uint32 pixels, Uint8 *vgbc); GdkPixbuf *XMdcBuildGdkPixbuf(Uint8 *img8, Uint32 w, Uint32 h, Int16 type, Uint8 *vgbc); diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xviewer.c xmedcon-0.23.0-gtk3+dfsg/source/xviewer.c --- xmedcon-0.22.0-gtk3+dfsg/source/xviewer.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xviewer.c 2023-01-05 15:40:10.000000000 +0000 @@ -20,7 +20,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xviewer.h xmedcon-0.23.0-gtk3+dfsg/source/xviewer.h --- xmedcon-0.22.0-gtk3+dfsg/source/xviewer.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xviewer.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xvifi.c xmedcon-0.23.0-gtk3+dfsg/source/xvifi.c --- xmedcon-0.22.0-gtk3+dfsg/source/xvifi.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xvifi.c 2023-01-05 15:40:10.000000000 +0000 @@ -15,7 +15,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xvifi.h xmedcon-0.23.0-gtk3+dfsg/source/xvifi.h --- xmedcon-0.22.0-gtk3+dfsg/source/xvifi.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xvifi.h 2023-01-04 23:52:43.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xwriter.c xmedcon-0.23.0-gtk3+dfsg/source/xwriter.c --- xmedcon-0.22.0-gtk3+dfsg/source/xwriter.c 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xwriter.c 2023-01-04 23:52:42.000000000 +0000 @@ -14,7 +14,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xwriter.h xmedcon-0.23.0-gtk3+dfsg/source/xwriter.h --- xmedcon-0.22.0-gtk3+dfsg/source/xwriter.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xwriter.h 2023-01-04 23:52:42.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xzoom.c xmedcon-0.23.0-gtk3+dfsg/source/xzoom.c --- xmedcon-0.22.0-gtk3+dfsg/source/xzoom.c 2022-03-04 21:18:11.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xzoom.c 2023-01-05 15:40:10.000000000 +0000 @@ -17,7 +17,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru xmedcon-0.22.0-gtk3+dfsg/source/xzoom.h xmedcon-0.23.0-gtk3+dfsg/source/xzoom.h --- xmedcon-0.22.0-gtk3+dfsg/source/xzoom.h 2022-02-28 21:22:29.000000000 +0000 +++ xmedcon-0.23.0-gtk3+dfsg/source/xzoom.h 2023-01-05 00:21:36.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - Copyright (C) 1997-2022 by Erik Nolf + Copyright (C) 1997-2023 by Erik Nolf This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the