Commit 825ea324 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed compilation issue with finitef() function in profit.c on OSX 10.8.

Pushed version number to 2.19.1.
parent ee4507e9
...@@ -68,8 +68,11 @@ ...@@ -68,8 +68,11 @@
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Second isnan check */ /* Define to 1 if you have the `isinf' function. */
#undef HAVE_ISNAN2 #undef HAVE_ISINF
/* Define to 1 if you have the `isnan' function. */
#undef HAVE_ISNAN
/* Define if you have the LAPACK libraries. */ /* Define if you have the LAPACK libraries. */
#undef HAVE_LAPACK #undef HAVE_LAPACK
......
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for sextractor 2.19.0. # Generated by GNU Autoconf 2.69 for sextractor 2.19.1.
# #
# Report bugs to <bertin@iap.fr>. # Report bugs to <bertin@iap.fr>.
# #
...@@ -590,8 +590,8 @@ MAKEFLAGS= ...@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='sextractor' PACKAGE_NAME='sextractor'
PACKAGE_TARNAME='sextractor' PACKAGE_TARNAME='sextractor'
PACKAGE_VERSION='2.19.0' PACKAGE_VERSION='2.19.1'
PACKAGE_STRING='sextractor 2.19.0' PACKAGE_STRING='sextractor 2.19.1'
PACKAGE_BUGREPORT='bertin@iap.fr' PACKAGE_BUGREPORT='bertin@iap.fr'
PACKAGE_URL='' PACKAGE_URL=''
...@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures sextractor 2.19.0 to adapt to many kinds of systems. \`configure' configures sextractor 2.19.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1415,7 +1415,7 @@ fi ...@@ -1415,7 +1415,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of sextractor 2.19.0:";; short | recursive ) echo "Configuration of sextractor 2.19.1:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1549,7 +1549,7 @@ fi ...@@ -1549,7 +1549,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
sextractor configure 2.19.0 sextractor configure 2.19.1
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -1972,7 +1972,7 @@ cat >config.log <<_ACEOF ...@@ -1972,7 +1972,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by sextractor $as_me 2.19.0, which was It was created by sextractor $as_me 2.19.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -2786,7 +2786,7 @@ fi ...@@ -2786,7 +2786,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='sextractor' PACKAGE='sextractor'
VERSION='2.19.0' VERSION='2.19.1'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -12582,8 +12582,8 @@ fi ...@@ -12582,8 +12582,8 @@ fi
fi fi
done done
for ac_func in atexit logf getenv gettimeofday memcpy memmove memset mkdir \ for ac_func in atexit getenv gettimeofday isinf isnan logf memcpy memmove \
munmap posix_memalign setlinebuf sincosf strstr sysconf memset mkdir munmap posix_memalign setlinebuf sincosf strstr sysconf
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
...@@ -12595,15 +12595,6 @@ _ACEOF ...@@ -12595,15 +12595,6 @@ _ACEOF
fi fi
done done
ac_fn_c_check_func "$LINENO" "isnan" "ac_cv_func_isnan"
if test "x$ac_cv_func_isnan" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ISNAN2 1
_ACEOF
fi
# Check support for large files # Check support for large files
# Check whether --enable-largefile was given. # Check whether --enable-largefile was given.
...@@ -15714,7 +15705,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -15714,7 +15705,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by sextractor $as_me 2.19.0, which was This file was extended by sextractor $as_me 2.19.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -15780,7 +15771,7 @@ _ACEOF ...@@ -15780,7 +15771,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
sextractor config.status 2.19.0 sextractor config.status 2.19.1
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>. # along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
# #
# Last modified: 05/07/2013 # Last modified: 17/07/2013
# #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) ...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],) define([AC_CACHE_SAVE],)
# This is your standard Bertin source code... # This is your standard Bertin source code...
AC_INIT(sextractor, 2.19.0, [bertin@iap.fr]) AC_INIT(sextractor, 2.19.1, [bertin@iap.fr])
AC_CONFIG_SRCDIR(src/makeit.c) AC_CONFIG_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
...@@ -124,10 +124,8 @@ AC_FUNC_MMAP ...@@ -124,10 +124,8 @@ AC_FUNC_MMAP
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_FUNC_STAT AC_FUNC_STAT
AC_FUNC_STRFTIME AC_FUNC_STRFTIME
AC_CHECK_FUNCS([atexit logf getenv gettimeofday memcpy memmove memset mkdir \ AC_CHECK_FUNCS([atexit getenv gettimeofday isinf isnan logf memcpy memmove \
munmap posix_memalign setlinebuf sincosf strstr sysconf]) memset mkdir munmap posix_memalign setlinebuf sincosf strstr sysconf])
AC_CHECK_FUNC([isnan], AC_DEFINE_UNQUOTED([HAVE_ISNAN2], 1,
[Second isnan check]))
# Check support for large files # Check support for large files
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
......
.TH SEXTRACTOR "1" "July 2013" "SExtractor 2.19.0" "User Commands" .TH SEXTRACTOR "1" "July 2013" "SExtractor 2.19.1" "User Commands"
.SH NAME .SH NAME
sex \- extract a source catalogue from an astronomical FITS image sex \- extract a source catalogue from an astronomical FITS image
.SH SYNOPSIS .SH SYNOPSIS
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 05/07/2013 * Last modified: 17/07/2013
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -1985,7 +1985,7 @@ INPUT Profile-fitting structure, ...@@ -1985,7 +1985,7 @@ INPUT Profile-fitting structure,
OUTPUT RETURN_ERROR if the rasters don't overlap, RETURN_OK otherwise. OUTPUT RETURN_ERROR if the rasters don't overlap, RETURN_OK otherwise.
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 24/04/2013 VERSION 17/07/2013
***/ ***/
int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
float factor) float factor)
...@@ -2010,7 +2010,11 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, ...@@ -2010,7 +2010,11 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
xsin = xcin - xcout*invpixstep; /* Input start x-coord*/ xsin = xcin - xcout*invpixstep; /* Input start x-coord*/
if ((int)xsin >= profit->modnaxisn[0] || !finitef(xsin)) if ((int)xsin >= profit->modnaxisn[0]
#if defined(HAVE_ISNAN) && defined(HAVE_ISINF)
|| isnan(xsin) || isinf(xsin)
#endif
)
return RETURN_ERROR; return RETURN_ERROR;
ixsout = 0; /* Int. part of output start x-coord */ ixsout = 0; /* Int. part of output start x-coord */
if (xsin<0.0) if (xsin<0.0)
...@@ -2036,7 +2040,11 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, ...@@ -2036,7 +2040,11 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
ycout += *dy/profit->subsamp; ycout += *dy/profit->subsamp;
ysin = ycin - ycout*invpixstep; /* Input start y-coord*/ ysin = ycin - ycout*invpixstep; /* Input start y-coord*/
if ((int)ysin >= profit->modnaxisn[1] || !finitef(ysin)) if ((int)ysin >= profit->modnaxisn[1]
#if defined(HAVE_ISNAN) && defined(HAVE_ISINF)
|| isnan(ysin) || isinf(ysin)
#endif
)
return RETURN_ERROR; return RETURN_ERROR;
iysout = 0; /* Int. part of output start y-coord */ iysout = 0; /* Int. part of output start y-coord */
if (ysin<0.0) if (ysin<0.0)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment