diff -Nru starlink-ast-9.2.8+dfsg/configure starlink-ast-9.2.9+dfsg/configure --- starlink-ast-9.2.8+dfsg/configure 2022-05-06 10:41:03.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/configure 2022-06-06 10:54:04.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by Starlink Autoconf 2.69 for ast 9.2.8. +# Generated by Starlink Autoconf 2.69 for ast 9.2.9. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='ast' PACKAGE_TARNAME='ast' -PACKAGE_VERSION='9.2.8' -PACKAGE_STRING='ast 9.2.8' +PACKAGE_VERSION='9.2.9' +PACKAGE_STRING='ast 9.2.9' PACKAGE_BUGREPORT='starlink@jiscmail.ac.uk' PACKAGE_URL='' @@ -1385,7 +1385,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ast 9.2.8 to adapt to many kinds of systems. +\`configure' configures ast 9.2.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ast 9.2.8:";; + short | recursive ) echo "Configuration of ast 9.2.9:";; esac cat <<\_ACEOF @@ -1578,7 +1578,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ast configure 9.2.8 +ast configure 9.2.9 generated by Starlink Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2314,7 +2314,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ast $as_me 9.2.8, which was +It was created by ast $as_me 9.2.9, which was generated by Starlink Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2695,7 +2695,7 @@ -version_info="11:8:2" +version_info="11:9:2" @@ -3185,7 +3185,7 @@ # Define the identity of the package. PACKAGE='ast' - VERSION='9.2.8' + VERSION='9.2.9' cat >>confdefs.h <<_ACEOF @@ -18066,7 +18066,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ast $as_me 9.2.8, which was +This file was extended by ast $as_me 9.2.9, which was generated by Starlink Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18132,7 +18132,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ast config.status 9.2.8 +ast config.status 9.2.9 configured by $0, generated by Starlink Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru starlink-ast-9.2.8+dfsg/configure.ac starlink-ast-9.2.9+dfsg/configure.ac --- starlink-ast-9.2.8+dfsg/configure.ac 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/configure.ac 2022-06-06 10:53:53.000000000 +0000 @@ -9,7 +9,7 @@ dnl Initialisation: package name and version number m4_define([v_maj], [9]) m4_define([v_min], [2]) -m4_define([v_mic], [8]) +m4_define([v_mic], [9]) m4_define([project_version], [v_maj.v_min.v_mic]) AC_INIT([ast],[project_version],[starlink@jiscmail.ac.uk]) AC_CONFIG_AUX_DIR([build-aux]) diff -Nru starlink-ast-9.2.8+dfsg/debian/changelog starlink-ast-9.2.9+dfsg/debian/changelog --- starlink-ast-9.2.8+dfsg/debian/changelog 2022-05-10 07:37:07.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/debian/changelog 2022-06-13 19:37:42.000000000 +0000 @@ -1,3 +1,11 @@ +starlink-ast (9.2.9+dfsg-1) unstable; urgency=medium + + * New upstream version 9.2.9+dfsg + * Rediff patches + * Adjust starlink.csl for changes in Debian's LaTeX distribution + + -- Ole Streicher Mon, 13 Jun 2022 21:37:42 +0200 + starlink-ast (9.2.8+dfsg-1) unstable; urgency=medium * New upstream version 9.2.8+dfsg diff -Nru starlink-ast-9.2.8+dfsg/debian/patches/Adjust-starlink.csl-for-changes-in-Debian-s-LaTeX-distrib.patch starlink-ast-9.2.9+dfsg/debian/patches/Adjust-starlink.csl-for-changes-in-Debian-s-LaTeX-distrib.patch --- starlink-ast-9.2.8+dfsg/debian/patches/Adjust-starlink.csl-for-changes-in-Debian-s-LaTeX-distrib.patch 1970-01-01 00:00:00.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/debian/patches/Adjust-starlink.csl-for-changes-in-Debian-s-LaTeX-distrib.patch 2022-06-13 19:37:42.000000000 +0000 @@ -0,0 +1,46 @@ +From: Ole Streicher +Date: Mon, 13 Jun 2022 21:26:24 +0200 +Subject: Adjust starlink.csl for changes in Debian's LaTeX distribution + +--- + starlink.cls | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/starlink.cls b/starlink.cls +index 5907136..8a4bbdc 100644 +--- a/starlink.cls ++++ b/starlink.cls +@@ -336,6 +336,7 @@ + \phantomsection\normalfont\normalsize\bfseries\refstepcounter{enumdescci}\theenumdescci~} + } + ++\usepackage{html} + + + %% A description list which has the labels in a box on the left with +@@ -387,13 +388,13 @@ + % just the cross reference number or letter in the hyperlink. + \newcommand{\slhyperref}[4]{\hyperref[#4]{#2\ref*{#4}#3}} + +-\newcommand{\latexhtml}[2]{#1} ++\renewcommand{\latexhtml}[2]{#1} + + % %.. Empty environment latex only. +-\newenvironment{latexonly}{}{} ++\renewenvironment{latexonly}{}{} + + %%%% Command that doesn't do anything in latex +-\newcommand{\html}[1]{} ++\renewcommand{\html}[1]{} + + %.. environments that don't do anything + \def\makeinnocent#1{\catcode`#1=12 } +@@ -422,7 +423,7 @@ + + \excludecomment{htmlonly} + +-\newcommand{\latex}[1]{#1} ++\renewcommand{\latex}[1]{#1} + + %------------------------------------------------------------------------ + %.. Define additional colours. diff -Nru starlink-ast-9.2.8+dfsg/debian/patches/series starlink-ast-9.2.9+dfsg/debian/patches/series --- starlink-ast-9.2.8+dfsg/debian/patches/series 2022-05-10 06:59:10.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/debian/patches/series 2022-06-13 19:37:42.000000000 +0000 @@ -5,3 +5,4 @@ Disable-tests.patch Check-the-values-returned-by-the-test.patch reproducible.patch +Adjust-starlink.csl-for-changes-in-Debian-s-LaTeX-distrib.patch diff -Nru starlink-ast-9.2.8+dfsg/debian/patches/The-external-PAL-library-in-Debian-is-called-starlink-pal.patch starlink-ast-9.2.9+dfsg/debian/patches/The-external-PAL-library-in-Debian-is-called-starlink-pal.patch --- starlink-ast-9.2.8+dfsg/debian/patches/The-external-PAL-library-in-Debian-is-called-starlink-pal.patch 2022-05-10 06:59:10.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/debian/patches/The-external-PAL-library-in-Debian-is-called-starlink-pal.patch 2022-06-13 19:37:42.000000000 +0000 @@ -48,7 +48,7 @@ # Otherwise, use the internal PAL & ERFA libraries. *) args="${args} -last_pal";; diff --git a/configure.ac b/configure.ac -index 2f38877..2cc4dc3 100644 +index 8e5e560..6fce1d7 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ AC_ARG_WITH([external_pal], diff -Nru starlink-ast-9.2.8+dfsg/debian/patches/use_std_automake.patch starlink-ast-9.2.9+dfsg/debian/patches/use_std_automake.patch --- starlink-ast-9.2.8+dfsg/debian/patches/use_std_automake.patch 2022-05-10 06:59:10.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/debian/patches/use_std_automake.patch 2022-06-13 19:37:42.000000000 +0000 @@ -102,7 +102,7 @@ + + diff --git a/configure.ac b/configure.ac -index 436d8fd..2f38877 100644 +index b73a82c..8e5e560 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,10 @@ AC_SUBST([version_info]) diff -Nru starlink-ast-9.2.8+dfsg/src/f77.h starlink-ast-9.2.9+dfsg/src/f77.h --- starlink-ast-9.2.8+dfsg/src/f77.h 2022-05-06 10:41:08.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/f77.h 2022-06-06 10:54:09.000000000 +0000 @@ -215,6 +215,11 @@ * Initialise pointers. * 11-MAY-2011 (DSB): * Added F77_LOCK +* 10-MAY-2022 (DSB): +* Added version of F77_EXPORT_CHARACTER that uses AST for memory +* management instead of CNF. This was driven by the change of +* TRAIL_TYPE from int to size_t in gfortran v8. Some AST source +* files were assuming int (e.g. fplot.c). * {enter_further_changes_here} * @@ -469,7 +474,7 @@ #define DECLARE_POINTER(X) F77_POINTER_TYPE X #define DECLARE_CHARACTER(X,L) F77_CHARACTER_TYPE X[L]; \ - const size_t X##_length = L + size_t X##_length = L /* --- Declare arrays --- */ @@ -556,7 +561,6 @@ /* --- IMPORT and EXPORT of values --- */ /* Export C variables to Fortran variables */ -#define F77_EXPORT_CHARACTER(C,F,L) cnfExprt(C,F,L) #define F77_EXPORT_DOUBLE(C,F) F=C #define F77_EXPORT_INTEGER(C,F) F=C #define F77_EXPORT_LOGICAL(C,F) F=C?F77_TRUE:F77_FALSE @@ -568,6 +572,19 @@ #define F77_EXPORT_POINTER(C,F) F=cnfFptr(C) #define F77_EXPORT_LOCATOR(C,F) cnfExpch(C,F,DAT__SZLOC) +/* CNF functions are not available within AST, so re-define a + F77_EXPORT_CHARACTER macro that exports a character string + from C to Fortran using functions in the AST memory.c module. */ +/* #define F77_EXPORT_CHARACTER(C,F,L) cnfExprt(C,F,L) */ +#define F77_EXPORT_CHARACTERL(C,F,L) \ + if( F##_length > L ) F##_length = L; \ + astStringExport( C, F, F##_length ); \ + +#define F77_EXPORT_CHARACTER(C,F) { \ + size_t clen = strlen(C); \ + F77_EXPORT_CHARACTERL(C,F,clen); \ +} + /* Allow for character strings to be NULL, protects strlen. Note this * does not allow lengths to differ. */ #define F77_CREATE_EXPORT_CHARACTER(C,F) \ diff -Nru starlink-ast-9.2.8+dfsg/src/f77.h.in starlink-ast-9.2.9+dfsg/src/f77.h.in --- starlink-ast-9.2.8+dfsg/src/f77.h.in 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/f77.h.in 2022-06-06 10:53:53.000000000 +0000 @@ -215,6 +215,11 @@ * Initialise pointers. * 11-MAY-2011 (DSB): * Added F77_LOCK +* 10-MAY-2022 (DSB): +* Added version of F77_EXPORT_CHARACTER that uses AST for memory +* management instead of CNF. This was driven by the change of +* TRAIL_TYPE from int to size_t in gfortran v8. Some AST source +* files were assuming int (e.g. fplot.c). * {enter_further_changes_here} * @@ -469,7 +474,7 @@ #define DECLARE_POINTER(X) F77_POINTER_TYPE X #define DECLARE_CHARACTER(X,L) F77_CHARACTER_TYPE X[L]; \ - const @TRAIL_TYPE@ X##_length = L + @TRAIL_TYPE@ X##_length = L /* --- Declare arrays --- */ @@ -556,7 +561,6 @@ /* --- IMPORT and EXPORT of values --- */ /* Export C variables to Fortran variables */ -#define F77_EXPORT_CHARACTER(C,F,L) cnfExprt(C,F,L) #define F77_EXPORT_DOUBLE(C,F) F=C #define F77_EXPORT_INTEGER(C,F) F=C #define F77_EXPORT_LOGICAL(C,F) F=C?F77_TRUE:F77_FALSE @@ -568,6 +572,19 @@ #define F77_EXPORT_POINTER(C,F) F=cnfFptr(C) #define F77_EXPORT_LOCATOR(C,F) cnfExpch(C,F,DAT__SZLOC) +/* CNF functions are not available within AST, so re-define a + F77_EXPORT_CHARACTER macro that exports a character string + from C to Fortran using functions in the AST memory.c module. */ +/* #define F77_EXPORT_CHARACTER(C,F,L) cnfExprt(C,F,L) */ +#define F77_EXPORT_CHARACTERL(C,F,L) \ + if( F##_length > L ) F##_length = L; \ + astStringExport( C, F, F##_length ); \ + +#define F77_EXPORT_CHARACTER(C,F) { \ + @TRAIL_TYPE@ clen = strlen(C); \ + F77_EXPORT_CHARACTERL(C,F,clen); \ +} + /* Allow for character strings to be NULL, protects strlen. Note this * does not allow lengths to differ. */ #define F77_CREATE_EXPORT_CHARACTER(C,F) \ diff -Nru starlink-ast-9.2.8+dfsg/src/ferror.c starlink-ast-9.2.9+dfsg/src/ferror.c --- starlink-ast-9.2.8+dfsg/src/ferror.c 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/ferror.c 2022-06-06 10:53:53.000000000 +0000 @@ -103,16 +103,12 @@ static void FPutErrWrapper( AstPutErrFun fun, int status_value, const char *message ){ DECLARE_CHARACTER(LMESSAGE,MXSTRLEN); - int fmessage_length; - - fmessage_length = strlen( message ); - if( fmessage_length > LMESSAGE_length ) fmessage_length = LMESSAGE_length; - astStringExport( message, LMESSAGE, fmessage_length ); + F77_EXPORT_CHARACTER(message, LMESSAGE); ( *(void (*)( INTEGER(status_value), CHARACTER(LMESSAGE) - TRAIL(fmessage) ) ) fun)(INTEGER_ARG(&status_value), + TRAIL(LMESSAGE) ) ) fun)(INTEGER_ARG(&status_value), CHARACTER_ARG(LMESSAGE) - TRAIL_ARG(fmessage)); + TRAIL_ARG(LMESSAGE)); } diff -Nru starlink-ast-9.2.8+dfsg/src/fitschan.c starlink-ast-9.2.9+dfsg/src/fitschan.c --- starlink-ast-9.2.8+dfsg/src/fitschan.c 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/fitschan.c 2022-06-06 10:53:53.000000000 +0000 @@ -1263,6 +1263,8 @@ * 6-JAN-2022 (DSB): * - Added attribute FitsRounding and re-wrote RoundFString. * - Increase some buffer sizes to avoid compilation warnings. +* 6-JUN-2022 (DSB): +* Avoid copying overlapping strings in RoundFString. *class-- */ @@ -25637,8 +25639,10 @@ char *seq9; int bu; int first; + int i; int len0; int len; + int lexp; int nls; int nsig; int seqlen; @@ -25658,8 +25662,10 @@ *ltext = ' '; strcpy( ltext + 1, text ); -/* Locate the start of any exponent string in the local copy. */ +/* Locate the start of any exponent string in the local copy. ALso get + its length. */ exp = strpbrk( ltext, "dDeE" ); + lexp = exp ? strlen(exp) : 0; /* Get a pointer to the terminator (either the exponent or the null at the end of the string). */ @@ -25872,12 +25878,13 @@ /* Loop backwards over any trailing spaces or zeros. */ while( c >= ltext && ( *c == ' ' || *c == '0' ) ) c--; -/* Ensure one space is left after a decimal point. */ - if( *c == '.' ) *(++c) = '0'; +/* Ensure one space is left after a decimal point, if there is room for it. */ + if( *c == '.' && c < end - 1 ) *(++c) = '0'; -/* Move the terminator to the following character. */ +/* Move the terminator to the following character. We are sure not to + overrun the text buffer since "c" is always less than "exp". */ if( exp ) { - strcpy( c + 1, exp ); + for( i = 0; i <= lexp; i++ ) c[ i + 1 ] = exp[ i ]; } else { c[ 1 ] = 0; } diff -Nru starlink-ast-9.2.8+dfsg/src/fplot.c starlink-ast-9.2.9+dfsg/src/fplot.c --- starlink-ast-9.2.8+dfsg/src/fplot.c 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/fplot.c 2022-06-06 10:53:53.000000000 +0000 @@ -529,25 +529,18 @@ DECLARE_CHARACTER(LTEXT,MXSTRLEN); DECLARE_CHARACTER(LJUST,MXSTRLEN); - int ftext_length; - int fjust_length; F77_INTEGER_TYPE(GRFCON); int *status = astGetStatusPtr; if ( !astOK ) return 0; GRFCON = astP2I( astGrfConID( this ) ); - ftext_length = strlen( text ); - if( ftext_length > LTEXT_length ) ftext_length = LTEXT_length; - astStringExport( text, LTEXT, ftext_length ); - - fjust_length = strlen( just ); - if( fjust_length > LJUST_length ) fjust_length = LJUST_length; - astStringExport( just, LJUST, fjust_length ); + F77_EXPORT_CHARACTER(text,LTEXT); + F77_EXPORT_CHARACTER(just,LJUST); return ( *(int (*)( INTEGER(grfcon), CHARACTER(LTEXT), REAL(x), REAL(y), CHARACTER(LJUST), REAL(upx), REAL(upy) - TRAIL(ftext) TRAIL(fjust) ) ) + TRAIL(LTEXT) TRAIL(LJUST) ) ) this->grffun[ AST__GTEXT ])( INTEGER_ARG(&GRFCON), CHARACTER_ARG(LTEXT), @@ -556,8 +549,8 @@ CHARACTER_ARG(LJUST), REAL_ARG(&upx), REAL_ARG(&upy) - TRAIL_ARG(ftext) - TRAIL_ARG(fjust) ); + TRAIL_ARG(LTEXT) + TRAIL_ARG(LJUST) ); } static int FGCapWrapper( AstPlot *this, int cap, int value ) { @@ -577,26 +570,19 @@ float *yb ) { DECLARE_CHARACTER(LTEXT,MXSTRLEN); DECLARE_CHARACTER(LJUST,MXSTRLEN); - int ftext_length; - int fjust_length; F77_INTEGER_TYPE(GRFCON); int *status = astGetStatusPtr; if ( !astOK ) return 0; GRFCON = astP2I( astGrfConID( this ) ); - ftext_length = strlen( text ); - if( ftext_length > LTEXT_length ) ftext_length = LTEXT_length; - astStringExport( text, LTEXT, ftext_length ); - - fjust_length = strlen( just ); - if( fjust_length > LJUST_length ) fjust_length = LJUST_length; - astStringExport( just, LJUST, fjust_length ); + F77_EXPORT_CHARACTER(text,LTEXT); + F77_EXPORT_CHARACTER(just,LJUST); return ( *(int (*)( INTEGER(grfcon), CHARACTER(LTEXT), REAL(x), REAL(y), CHARACTER(LJUST), REAL(upx), REAL(upy), - REAL_ARRAY(xb), REAL_ARRAY(yb) TRAIL(ftext) - TRAIL(fjust) ) ) + REAL_ARRAY(xb), REAL_ARRAY(yb) TRAIL(LTEXT) + TRAIL(LJUST) ) ) this->grffun[ AST__GTXEXT ])( INTEGER_ARG(&GRFCON), CHARACTER_ARG(LTEXT), @@ -607,8 +593,8 @@ REAL_ARG(&upy), REAL_ARRAY_ARG(xb), REAL_ARRAY_ARG(yb) - TRAIL_ARG(ftext) - TRAIL_ARG(fjust) ); + TRAIL_ARG(LTEXT) + TRAIL_ARG(LJUST) ); } static int FGQchWrapper( AstPlot *this, float *chv, float *chh ) { @@ -649,7 +635,7 @@ GENPTR_CHARACTER(TEXT) char *text; const char *result; - int i; + size_t i; astAt( "AST_STRIPESCAPES", NULL, 0 ); astWatchSTATUS( @@ -657,11 +643,11 @@ result = astStripEscapes( text ); i = 0; if ( astOK ) { /* Copy result */ - for ( ; result[ i ] && i < RESULT_length; i++ ) { + for ( ; result[ i ] && i < (size_t) RESULT_length; i++ ) { RESULT[ i ] = result[ i ]; } } - while ( i < RESULT_length ) RESULT[ i++ ] = ' '; /* Pad with blanks */ + while ( i < (size_t) RESULT_length ) RESULT[ i++ ] = ' '; /* Pad with blanks */ astFree( text ); ) } diff -Nru starlink-ast-9.2.8+dfsg/src/grf3d_pgplot.c starlink-ast-9.2.9+dfsg/src/grf3d_pgplot.c --- starlink-ast-9.2.8+dfsg/src/grf3d_pgplot.c 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/grf3d_pgplot.c 2022-06-06 10:53:53.000000000 +0000 @@ -3102,14 +3102,11 @@ F77_INTEGER_TYPE NLIST; DECLARE_CHARACTER(LTEXT,MXSTRLEN); F77_INTEGER_TYPE FONT; - int ftext_length; - int i; + size_t i; - ftext_length = tlen; - if( ftext_length > LTEXT_length ) ftext_length = LTEXT_length; - astStringExport( text, LTEXT, ftext_length ); + F77_EXPORT_CHARACTERL(text,LTEXT,tlen); - LIST = (F77_INTEGER_TYPE *) astMalloc( sizeof( F77_INTEGER_TYPE )*(size_t) ftext_length ); + LIST = (F77_INTEGER_TYPE *) astMalloc( sizeof( F77_INTEGER_TYPE )*(size_t) LTEXT_length ); if( astOK ){ @@ -3117,10 +3114,10 @@ F77_CALL(grsyds)( INTEGER_ARRAY_ARG(LIST), INTEGER_ARG(&NLIST), CHARACTER_ARG(LTEXT), INTEGER_ARG(&FONT) - TRAIL_ARG(ftext) ); + TRAIL_ARG(LTEXT) ); *nlist = (int) NLIST; - for( i = 0; i < ftext_length; i++ ){ + for( i = 0; i < LTEXT_length; i++ ){ list[ i ] = (int) LIST[ i ]; } diff -Nru starlink-ast-9.2.8+dfsg/src/grf_pgplot.c starlink-ast-9.2.9+dfsg/src/grf_pgplot.c --- starlink-ast-9.2.8+dfsg/src/grf_pgplot.c 2022-05-06 10:40:34.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/grf_pgplot.c 2022-06-06 10:53:53.000000000 +0000 @@ -23,12 +23,12 @@ * License as published by the Free Software Foundation, either * version 3 of the License, or (at your option) any later * version. -* +* * This program 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. See the * GNU Lesser General Public License for more details. -* +* * You should have received a copy of the GNU Lesser General * License along with this program. If not, see * . @@ -1076,7 +1076,7 @@ * Synopsis: * #include "grf.h" -* int int astGAttr( int attr, double value, double *old_value, int prim ) +* int astGAttr( int attr, double value, double *old_value, int prim ) * Description: * This function returns the current value of a specified graphics @@ -1281,20 +1281,16 @@ F77_REAL_TYPE ANGLE; F77_REAL_TYPE FJUST; DECLARE_CHARACTER(LTEXT,MXSTRLEN); - int ftext_length; X = (F77_REAL_TYPE) x; Y = (F77_REAL_TYPE) y; ANGLE = (F77_REAL_TYPE) angle; FJUST = (F77_REAL_TYPE) fjust; - - ftext_length = strlen( text ); - if( ftext_length > LTEXT_length ) ftext_length = LTEXT_length; - astStringExport( text, LTEXT, ftext_length ); + F77_EXPORT_CHARACTER(text,LTEXT); F77_CALL(pgptxt)( REAL_ARG(&X), REAL_ARG(&Y), REAL_ARG(&ANGLE), REAL_ARG(&FJUST), CHARACTER_ARG(LTEXT) - TRAIL_ARG(ftext) ); + TRAIL_ARG(LTEXT) ); } static void ccpgqtxt(float x, float y, float angle, float fjust, char *text, @@ -1307,21 +1303,18 @@ F77_REAL_TYPE XBOX[ 4 ]; F77_REAL_TYPE YBOX[ 4 ]; int i; - int ftext_length; X = (F77_REAL_TYPE) x; Y = (F77_REAL_TYPE) y; ANGLE = (F77_REAL_TYPE) angle; FJUST = (F77_REAL_TYPE) fjust; - ftext_length = strlen( text ); - if( ftext_length > LTEXT_length ) ftext_length = LTEXT_length; - astStringExport( text, LTEXT, ftext_length ); + F77_EXPORT_CHARACTER(text,LTEXT); F77_CALL(pgqtxt)( REAL_ARG(&X), REAL_ARG(&Y), REAL_ARG(&ANGLE), REAL_ARG(&FJUST), CHARACTER_ARG(LTEXT), REAL_ARRAY_ARG(XBOX), REAL_ARRAY_ARG(YBOX) - TRAIL_ARG(ftext) ); + TRAIL_ARG(LTEXT) ); for( i = 0; i < 4; i++ ){ xbox[ i ] = (float) XBOX[ i ]; @@ -1359,17 +1352,12 @@ F77_REAL_TYPE XL; F77_REAL_TYPE YL; DECLARE_CHARACTER(LTEXT,MXSTRLEN); - int ftext_length; UNITS = (F77_INTEGER_TYPE) units; - - - ftext_length = strlen( text ); - if( ftext_length > LTEXT_length ) ftext_length = LTEXT_length; - astStringExport( text, LTEXT, ftext_length ); + F77_EXPORT_CHARACTER(text,LTEXT); F77_CALL(pglen)( INTEGER_ARG(&UNITS), CHARACTER_ARG(LTEXT), - REAL_ARG(&XL), REAL_ARG(&YL) TRAIL_ARG(ftext) ); + REAL_ARG(&XL), REAL_ARG(&YL) TRAIL_ARG(LTEXT) ); *xl = (float) XL; *yl = (float) YL; diff -Nru starlink-ast-9.2.8+dfsg/src/version.h starlink-ast-9.2.9+dfsg/src/version.h --- starlink-ast-9.2.8+dfsg/src/version.h 2022-05-06 10:43:17.000000000 +0000 +++ starlink-ast-9.2.9+dfsg/src/version.h 2022-06-06 10:56:31.000000000 +0000 @@ -60,14 +60,14 @@ *- */ -/* The current version of AST is 9.2.8 */ +/* The current version of AST is 9.2.9 */ #define AST__VMAJOR 9 #define AST__VMINOR 2 -#define AST__RELEASE 8 +#define AST__RELEASE 9 /* Deprecated macros */ #define AST_MAJOR_VERS 9 #define AST_MINOR_VERS 2 -#define AST_RELEASE 8 +#define AST_RELEASE 9 #endif /* #if ! defined(VERSION_INCLUDED) */