Commit cee8ce88 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed missing image name in sex.xml VOTable output in double image mode when... 

Fixed missing image name in sex.xml VOTable output in double image mode when input filenames are separated by a comma instead of a space.
Pushed version number to 2.18.12
parent 1d2f29bc

configure

+10 −10
Original line number Diff line number Diff line 
#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.

# Generated by GNU Autoconf 2.69 for sextractor 2.18.11.

# Generated by GNU Autoconf 2.69 for sextractor 2.18.12.

#

# Report bugs to <bertin@iap.fr>.

#
@@ -590,8 +590,8 @@ MAKEFLAGS= 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.18.11'

PACKAGE_STRING='sextractor 2.18.11'

PACKAGE_VERSION='2.18.12'

PACKAGE_STRING='sextractor 2.18.12'

PACKAGE_BUGREPORT='bertin@iap.fr'

PACKAGE_URL=''
@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then 
  # 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 sextractor 2.18.11 to adapt to many kinds of systems.

\`configure' configures sextractor 2.18.12 to adapt to many kinds of systems.



Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1415,7 +1415,7 @@ fi 


if test -n "$ac_init_help"; then

  case $ac_init_help in

     short | recursive ) echo "Configuration of sextractor 2.18.11:";;

     short | recursive ) echo "Configuration of sextractor 2.18.12:";;

   esac

  cat <<\_ACEOF
@@ -1549,7 +1549,7 @@ fi 
test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

  cat <<\_ACEOF

sextractor configure 2.18.11

sextractor configure 2.18.12

generated by GNU Autoconf 2.69



Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1972,7 +1972,7 @@ cat >config.log <<_ACEOF 
This file contains any messages produced by compilers while

running configure, to aid debugging if configure makes a mistake.



It was created by sextractor $as_me 2.18.11, which was

It was created by sextractor $as_me 2.18.12, which was

generated by GNU Autoconf 2.69.  Invocation command line was



  $ $0 $@
@@ -2786,7 +2786,7 @@ fi 


# Define the identity of the package.

 PACKAGE='sextractor'

 VERSION='2.18.11'

 VERSION='2.18.12'





cat >>confdefs.h <<_ACEOF
@@ -15714,7 +15714,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 
# report actual input values of CONFIG_FILES etc. instead of their

# values after options handling.

ac_log="

This file was extended by sextractor $as_me 2.18.11, which was

This file was extended by sextractor $as_me 2.18.12, which was

generated by GNU Autoconf 2.69.  Invocation command line was



  CONFIG_FILES    = $CONFIG_FILES
@@ -15780,7 +15780,7 @@ _ACEOF 
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

ac_cs_version="\\

sextractor config.status 2.18.11

sextractor config.status 2.18.12

configured by $0, generated by GNU Autoconf 2.69,

  with options \\"\$ac_cs_config\\"

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#	You should have received a copy of the GNU General Public License

#	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

#

#	Last modified:		25/04/2013

#	Last modified:		06/06/2013

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) 
define([AC_CACHE_SAVE],)



# This is your standard Bertin source code...

AC_INIT(sextractor, 2.18.11, [bertin@iap.fr])

AC_INIT(sextractor, 2.18.12, [bertin@iap.fr])

AC_CONFIG_SRCDIR(src/makeit.c)

AC_CONFIG_AUX_DIR(autoconf)

AC_CONFIG_HEADERS(config.h)

man/sex.1

+1 −1
Original line number Diff line number Diff line 
.TH SEXTRACTOR "1" "April 2013" "SExtractor 2.18.11" "User Commands"

.TH SEXTRACTOR "1" "June 2013" "SExtractor 2.18.12" "User Commands"

.SH NAME

sex \- extract a source catalogue from an astronomical FITS image

.SH SYNOPSIS

src/main.c

+11 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
*

*	This file part of:	SExtractor

*

*	Copyright:		(C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC

*	Copyright:		(C) 1993-2013 Emmanuel Bertin -- IAP/CNRS/UPMC

*

*	License:		GNU General Public License

*
@@ -22,7 +22,7 @@ 
*	You should have received a copy of the GNU General Public License

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*

*	Last modified:		11/10/2010

*	Last modified:		04/06/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -54,7 +54,9 @@ int main(int argc, char *argv[]) 
  {

   double	tdiff, lines, dets;

   int		a, narg, nim, opt, opt2;

   char		**argkey, **argval, *str;

   char		str[MAXCHARL],

		**argkey, **argval,

		*pstr;



setlinebuf(stdout);

 if (argc<2)
@@ -126,11 +128,14 @@ setlinebuf(stdout); 
      {

/*---- The input image filename(s) */

      for(; (a<argc) && (*argv[a]!='-'); a++)

        for (str=NULL;(str=strtok(str?NULL:argv[a], notokstr)); nim++)

        {

        strncpy(str, argv[a], MAXCHARL-1);

        for (pstr=NULL;(pstr=strtok(pstr?NULL:str, notokstr)); nim++)

          if (nim<MAXIMAGE)

            prefs.image_name[nim] = str;

            prefs.image_name[nim] = pstr;

          else

            error(EXIT_FAILURE, "*Error*: Too many input images: ", str);

            error(EXIT_FAILURE, "*Error*: Too many input images: ", pstr);

        }

      prefs.nimage_name = nim;

      a--;

      }