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

Fixed issue with --with-fftw-libdir configure option (thanks to John P. Marriner). 

Fixed minor issue with the reading of TNX and TPV WCS coefficients.
parent 42c34f54

configure

+4 −4
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ enable_libtool_lock 
enable_largefile

with_atlas_libdir

with_atlas_incdir

with_fftw

with_fftw_libdir

with_fftw_incdir

with_xsl_url

enable_model_fitting
@@ -12796,9 +12796,9 @@ fi 


# Provide special options for FFTW



# Check whether --with-fftw was given.

if test "${with_fftw+set}" = set; then :

  withval=$with_fftw;

# Check whether --with-fftw-libdir was given.

if test "${with_fftw_libdir+set}" = set; then :

  withval=$with_fftw_libdir;

fi

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:		11/07/2012

#	Last modified:		17/07/2012

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -142,7 +142,7 @@ AC_ARG_WITH(atlas-incdir, 
        [Provide an alternative path to the ATLAS include directory])])



# Provide special options for FFTW

AC_ARG_WITH(fftw,

AC_ARG_WITH(fftw-libdir,

        [AS_HELP_STRING([--with-fftw-libdir=<FFTW library path>],

        [Provide an alternative path to the FFTW library])])

AC_ARG_WITH(fftw-incdir,

src/fitswcs.c

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
*	along with AstrOmatic software.

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

*

*	Last modified:		18/06/2012

*	Last modified:		13/07/2012

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -773,7 +773,7 @@ INPUT WCS structure. 
OUTPUT	-.

NOTES	.

AUTHOR	E. Bertin (IAP)

VERSION	14/06/2012

VERSION	13/07/2012

 ***/

void	invert_wcs(wcsstruct *wcs)
@@ -792,7 +792,7 @@ void invert_wcs(wcsstruct *wcs) 
  lat = wcs->wcsprm->lat;

  if (!strcmp(wcs->wcsprm->pcode, "TNX"))

    tnxflag = 1;

  else if ((strcmp(wcs->wcsprm->pcode, "TAN")

  else if ((!strcmp(wcs->wcsprm->pcode, "TAN")

	|| !strcmp(wcs->wcsprm->pcode, "TPV"))

		&& (wcs->projp[1+lng*100] || wcs->projp[1+lat*100]))

    tnxflag = 0;