Removed redundant code in astrom_pos(). (3b59ee2e) · Commits · csst-pipeline / msc / sextractor

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.63 for sextractor 2.8.8.
		# Generated by GNU Autoconf 2.63 for sextractor 2.8.9.
		#
		# Report bugs to <bertin@iap.fr>.
		#
		@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
		# Identity of this package.
		PACKAGE_NAME='sextractor'
		PACKAGE_TARNAME='sextractor'
		PACKAGE_VERSION='2.8.8'
		PACKAGE_STRING='sextractor 2.8.8'
		PACKAGE_VERSION='2.8.9'
		PACKAGE_STRING='sextractor 2.8.9'
		PACKAGE_BUGREPORT='bertin@iap.fr'

		ac_unique_file="src/makeit.c"
		@@ -1500,7 +1500,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.8.8 to adapt to many kinds of systems.
		\`configure' configures sextractor 2.8.9 to adapt to many kinds of systems.

		Usage: $0 [OPTION]... [VAR=VALUE]...

		@@ -1570,7 +1570,7 @@ fi

		if test -n "$ac_init_help"; then
		case $ac_init_help in
		short \| recursive ) echo "Configuration of sextractor 2.8.8:";;
		short \| recursive ) echo "Configuration of sextractor 2.8.9:";;
		esac
		cat <<\_ACEOF

		@@ -1697,7 +1697,7 @@ fi
		test -n "$ac_init_help" && exit $ac_status
		if $ac_init_version; then
		cat <<\_ACEOF
		sextractor configure 2.8.8
		sextractor configure 2.8.9
		generated by GNU Autoconf 2.63

		Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
		@@ -1711,7 +1711,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.8.8, which was
		It was created by sextractor $as_me 2.8.9, which was
		generated by GNU Autoconf 2.63. Invocation command line was

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

		# Define the identity of the package.
		PACKAGE='sextractor'
		VERSION='2.8.8'
		VERSION='2.8.9'


		cat >>confdefs.h <<_ACEOF
		@@ -28127,7 +28127,7 @@ exec 6>&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.8.8, which was
		This file was extended by sextractor $as_me 2.8.9, which was
		generated by GNU Autoconf 2.63. Invocation command line was

		CONFIG_FILES = $CONFIG_FILES
		@@ -28190,7 +28190,7 @@ Report bugs to <bug-autoconf@gnu.org>."
		_ACEOF
		cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
		ac_cs_version="\\
		sextractor config.status 2.8.8
		sextractor config.status 2.8.9
		configured by $0, generated by GNU Autoconf 2.63,
		with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

configure.ac

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
		define([AC_CACHE_SAVE],)

		# This is your standard Bertin source code...
		AC_INIT(sextractor, 2.8.8, [bertin@iap.fr])
		AC_INIT(sextractor, 2.8.9, [bertin@iap.fr])
		AC_CONFIG_SRCDIR(src/makeit.c)
		AC_CONFIG_AUX_DIR(autoconf)
		AM_CONFIG_HEADER(config.h)

man/sex.1

+1 −1

Original line number	Diff line number	Diff line
		.TH SEXTRACTOR "1" "July 2009" "SWarp 2.8.8" "User Commands"
		.TH SEXTRACTOR "1" "August 2009" "SWarp 2.8.9" "User Commands"
		.SH NAME
		sex \- extract a source catalog from an astronomical FITS image
		.SH SYNOPSIS

src/analyse.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		*
		* Contents: analyse(), endobject()...: measurements on detections.
		*
		* Last modify: 20/07/2009
		* Last modify: 27/08/2009
		*
		*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		*/
		@@ -474,6 +474,7 @@ void endobject(picstruct field, picstruct dfield, picstruct *wfield,
		if (FLAG(obj2.mxf) \|\| FLAG(obj2.mxw))
		astrom_pos(field, obj);

		pixscale2 = 0.0; /* To avoid gcc -Wall warnings */
		if (FLAG(obj2.mx2w)
		\|\| FLAG(obj2.win_mx2w)
		\|\| FLAG(obj2.poserr_mx2w)

src/astrom.c

+2 −17

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		*
		* Contents: Astrometrical computations.
		*
		* Last modify: 20/07/2009
		* Last modify: 27/08/2009
		*
		*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		*/
		@@ -88,7 +88,7 @@ void astrom_pos(picstruct field, objstruct obj)
		{
		wcsstruct *wcs;
		double rawpos[NAXIS], wcspos[NAXIS],
		pixscale2, da,dd;
		da,dd;
		int lng,lat;

		wcs = field->wcs;
		@@ -164,21 +164,6 @@ void astrom_pos(picstruct field, objstruct obj)
		obj2->mamaposy = wcspos[0]*(MAMA_CORFLEX+1.0);
		}

		if (FLAG(obj2.mx2w)
		\|\| FLAG(obj2.win_mx2w)
		\|\| FLAG(obj2.poserr_mx2w)
		\|\| FLAG(obj2.winposerr_mx2w)
		\|\| FLAG(obj2.poserrmx2w_prof)
		\|\| FLAG(obj2.prof_flagw)
		\|\| ((!prefs.pixel_scale) && (FLAG(obj2.npixw)
		\|\| FLAG(obj2.fdnpixw)
		\|\| FLAG(obj2.fwhmw))))
		{
		rawpos[0] = obj2->posx;
		rawpos[1] = obj2->posy;
		pixscale2 = wcs_jacobian(wcs, rawpos, obj2->jacob);
		}

		return;
		}