Moved software to trunk

ChangeLog

@@ -9,68 +9,11 @@
 *
 *       Contents:       log of changes made to the SExtractor source
 *
-*       Last modify:    17/01/2007
+*       Last modify:    14/07/2006
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
 
-------------------------------------------------------------------------
-r380 | bertin | 2007-01-17 17:52:49 +0100 (Wed, 17 Jan 2007) | 3 lines
-
-Added options for compiling with icc (Intel compiler).
-Pushed version number to 2.5.1.
-
-------------------------------------------------------------------------
-r365 | bertin | 2006-11-09 18:39:27 +0100 (Thu, 09 Nov 2006) | 2 lines
-
-Undo previous changes (wrong repository!!).
-
-------------------------------------------------------------------------
-r364 | bertin | 2006-11-09 17:58:18 +0100 (Thu, 09 Nov 2006) | 2 lines
-
-Added lmfit routines by Joachim Wuttke in the form of a library.
-
-------------------------------------------------------------------------
-r358 | bertin | 2006-10-29 21:04:25 +0100 (Sun, 29 Oct 2006) | 5 lines
-
-Updated FITS library to the latest version.
-Fixed some UCDs in output parameters.
-Applied patch by Sergio Pascual for configuring the path to the XSL file.
-Updated the BUGS section.
-
-------------------------------------------------------------------------
-r327 | bertin | 2006-08-16 18:06:49 +0200 (Wed, 16 Aug 2006) | 2 lines
-
-Discard NaN pixels in non-weighted background measurements (as in SWarp).
-
-------------------------------------------------------------------------
-r305 | baillard | 2006-07-19 15:28:15 +0200 (Wed, 19 Jul 2006) | 2 lines
-
-Change name
-
-------------------------------------------------------------------------
-r303 | baillard | 2006-07-19 15:05:48 +0200 (Wed, 19 Jul 2006) | 2 lines
-
-Change names
-
-------------------------------------------------------------------------
-r295 | baillard | 2006-07-18 13:54:43 +0200 (Tue, 18 Jul 2006) | 2 lines
-
-Move sextractor to public repository
-
-------------------------------------------------------------------------
-r290 | bertin | 2006-07-17 19:56:12 +0200 (Mon, 17 Jul 2006) | 4 lines
-
-Doc: keyword list updated.
-ChangeLog updated.
-Back-propagated destructive byte-swapping bugfix in FITS library.
-
-------------------------------------------------------------------------
-r289 | bertin | 2006-07-14 20:25:09 +0200 (Fri, 14 Jul 2006) | 3 lines
-
-Removed warnings in psf.c (P.Delorme's edits) using brute-force.
-Switched ChangeLog to SVN format.
-
 ------------------------------------------------------------------------
 r288 | bertin | 2006-07-14 20:13:39 +0200 (Fri, 14 Jul 2006) | 8 lines
 

Makefile.am

 # Main Makefile for SExtractor
-# Copyright (C) 2002-2007 Emmanuel Bertin.
+# Copyright (C) 2002-2005 Emmanuel Bertin.
 AUTOMAKE_OPTIONS	= foreign no-dependencies
 SUBDIRS			= man src
-dist_pkgdata_DATA       = xsl/sextractor.xsl
 EXTRA_DIST		= config doc AUTHORS BUGS ChangeLog COPYING HISTORY \
 			  INSTALL README THANKS \
-			  acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4
-RPM_ROOTDIR		= `rpmbuild --nobuild -E %_topdir`
+			  acx_prog_cc_optim.m4
+RPM_ROOTDIR		= /usr/src/RPM
 RPM_SRCDIR		= $(RPM_ROOTDIR)/SOURCES
 rpm:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
@@ -14,29 +13,15 @@ rpm:	dist
 
 rpm-opteron:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
+	GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
 		-march=opteron" rpmbuild -ba --target=x86_64 \
 		--clean $(PACKAGE_NAME).spec                                                             
 
 rpm-athlon:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \
+	GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \
 		-march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \
 		-ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-rpm-opteron-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="icc" TPXFLAGS="-O3 -g -axWP -ip -unroll" rpmbuild -ba --target=x86_64 \
-		--clean $(PACKAGE_NAME).spec                                                             
-
-rpm-athlon-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPB -ip -unroll" rpmbuild \
-		-ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-icc:
-	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWP -ip -unroll" LIBS="-lm"
-
 athlon:
 	$(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm"
 

Makefile.in

-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -35,18 +34,15 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/sextractor-tpx.spec.in \
-	$(srcdir)/sextractor.spec.in $(top_srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL THANKS autoconf/config.guess \
-	autoconf/config.sub autoconf/depcomp autoconf/install-sh \
-	autoconf/ltmain.sh autoconf/missing autoconf/mkinstalldirs
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/sextractor-tpx.spec.in $(srcdir)/sextractor.spec.in \
+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
+	THANKS autoconf/config.guess autoconf/config.sub \
+	autoconf/depcomp autoconf/install-sh autoconf/ltmain.sh \
+	autoconf/missing autoconf/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acx_urbi_resolve_dir.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_urbi_resolve_dir.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acx_prog_cc_optim.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -65,15 +61,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_pkgdata_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -166,15 +153,14 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # Main Makefile for SExtractor
-# Copyright (C) 2002-2007 Emmanuel Bertin.
+# Copyright (C) 2002-2005 Emmanuel Bertin.
 AUTOMAKE_OPTIONS = foreign no-dependencies
 SUBDIRS = man src
-dist_pkgdata_DATA = xsl/sextractor.xsl
 EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYING HISTORY \
 			  INSTALL README THANKS \
-			  acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4
+			  acx_prog_cc_optim.m4
 
-RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir`
+RPM_ROOTDIR = /usr/src/RPM
 RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -235,23 +221,6 @@ sextractor.spec: $(top_builddir)/config.status $(srcdir)/sextractor.spec.in
 sextractor-tpx.spec: $(top_builddir)/config.status $(srcdir)/sextractor-tpx.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
-	done
-
-uninstall-dist_pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
-	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -260,7 +229,13 @@ uninstall-dist_pkgdataDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -272,7 +247,7 @@ $(RECURSIVE_TARGETS):
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -280,7 +255,13 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -301,7 +282,7 @@ maintainer-clean-recursive:
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -376,7 +357,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/autoconf $(distdir)/man $(distdir)/xsl
+	$(mkdir_p) $(distdir)/. $(distdir)/autoconf $(distdir)/man
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -517,12 +498,9 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA) config.h
+all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -566,7 +544,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-dist_pkgdataDATA
+install-data-am:
 
 install-exec-am:
 
@@ -594,7 +572,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am
+uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
@@ -605,13 +583,12 @@ uninstall-info: uninstall-info-recursive
 	distclean-hdr distclean-recursive distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dist_pkgdataDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dist_pkgdataDATA \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-info-am
 
 rpm:	dist
@@ -620,29 +597,15 @@ rpm:	dist
 
 rpm-opteron:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
+	GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
 		-march=opteron" rpmbuild -ba --target=x86_64 \
 		--clean $(PACKAGE_NAME).spec                                                             
 
 rpm-athlon:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \
+	GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \
 		-march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \
 		-ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-rpm-opteron-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="icc" TPXFLAGS="-O3 -g -axWP -ip -unroll" rpmbuild -ba --target=x86_64 \
-		--clean $(PACKAGE_NAME).spec                                                             
-
-rpm-athlon-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPB -ip -unroll" rpmbuild \
-		-ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-icc:
-	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWP -ip -unroll" LIBS="-lm"
-
 athlon:
 	$(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm"
 

acx_urbi_resolve_dir.m4

-
-
-# URBI_RESOLVE_DIR_PREPARE
-# ------------------------
-# Define urbi_resolve_dir.
-m4_defun([URBI_RESOLVE_DIR_PREPARE],
-[# PATH urbi_resolve_dir(DIR)
-# --------------------------
-# Return the DIR with all inner variables expanded.
-urbi_resolve_dir ()
-{
-  ac_$0_dir=$[]1
-  ac_$0_res=
-  ac_$0_prefix_NONE=
-  ac_$0_exec_prefix_NONE=
-  test "x$prefix" = xNONE &&
-     ac_$0_exec_prefix_NONE=yes &&
-     prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE &&
-     ac_$0_exec_prefix_NONE=yes &&
-     exec_prefix=$prefix
-  while true
-  do
-    eval ac_$0_res="$ac_$0_dir"
-    if test x"$ac_$0_dir" == x"$ac_$0_res"; then
-      break
-    fi
-    ac_$0_dir=$ac_$0_res
-  done
-  test "$ac_$0_prefix_NONE" && prefix=NONE
-  test "$ac_$0_exec_prefix_NONE" && exec_prefix=NONE
-  echo "$ac_$0_res"
-}
-])
-
-
-# PATH URBI_RESOLVE_DIR(DIR)
-# --------------------------
-# Return the DIR with all inner variables expanded.
-AC_DEFUN([URBI_RESOLVE_DIR],
-[AC_REQUIRE([URBI_RESOLVE_DIR_PREPARE])dnl
-urbi_resolve_dir '$1'[]dnl
-])
-
-
-## Local Variables:
-## mode: autoconf
-## End:

config.h.in

@@ -27,6 +27,10 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
@@ -122,9 +126,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* Default URL of the XSLT filter */
-#undef XSL_URL
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
@@ -140,6 +141,9 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
 /* Define to `long' if <sys/types.h> does not define. */
 #undef off_t
 

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sextractor 2.5.4.
+# Generated by GNU Autoconf 2.59 for sextractor 2.5.0.
 #
 # Report bugs to <bertin@iap.fr>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sextractor'
 PACKAGE_TARNAME='sextractor'
-PACKAGE_VERSION='2.5.4'
-PACKAGE_STRING='sextractor 2.5.4'
+PACKAGE_VERSION='2.5.0'
+PACKAGE_STRING='sextractor 2.5.0'
 PACKAGE_BUGREPORT='bertin@iap.fr'
 
 ac_unique_file="src/makeit.c"
@@ -780,7 +780,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.5.4 to adapt to many kinds of systems.
+\`configure' configures sextractor 2.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -842,7 +842,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sextractor 2.5.4:";;
+     short | recursive ) echo "Configuration of sextractor 2.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -858,13 +858,6 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-largefile     omit support for large files
 
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-xsl_url=<default URL for XSLT filter>
-                          Provide an alternative default URL of the XSLT
-                          filter
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -973,7 +966,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-sextractor configure 2.5.4
+sextractor configure 2.5.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -987,7 +980,7 @@ cat >&5 <<_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.5.4, which was
+It was created by sextractor $as_me 2.5.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1617,7 +1610,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sextractor'
- VERSION='2.5.4'
+ VERSION='2.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1765,24 +1758,6 @@ DATE3="$date3"
 # Include macros
 
 
-
-# URBI_RESOLVE_DIR_PREPARE
-# ------------------------
-# Define urbi_resolve_dir.
-
-
-
-# PATH URBI_RESOLVE_DIR(DIR)
-# --------------------------
-# Return the DIR with all inner variables expanded.
-
-
-
-## Local Variables:
-## mode: autoconf
-## End:
-
-
 # Display pakage and version number
 echo "$as_me:$LINENO: result: *********** Configuring:  $PACKAGE $VERSION ($date) **********" >&5
 echo "${ECHO_T}*********** Configuring:  $PACKAGE $VERSION ($date) **********" >&6
@@ -5058,7 +5033,237 @@ esac
 
 fi
 
-#AC_FUNC_MALLOC
+
+for ac_header in stdlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ---------------------------- ##
+## Report this to bertin@iap.fr ##
+## ---------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_malloc_0_nonnull=no
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if STDC_HEADERS || HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
+int
+main ()
+{
+exit (malloc (0) ? 0 : 1);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_malloc_0_nonnull=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_malloc_0_nonnull=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
+echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6
+if test $ac_cv_func_malloc_0_nonnull = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MALLOC 1
+_ACEOF
+
+else
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_MALLOC 0
+_ACEOF
+
+   case $LIBOBJS in
+    "malloc.$ac_objext"   | \
+  *" malloc.$ac_objext"   | \
+    "malloc.$ac_objext "* | \
+  *" malloc.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;;
+esac
+
+
+cat >>confdefs.h <<\_ACEOF
+#define malloc rpl_malloc
+_ACEOF
+
+fi
+
+
+
 
 
 for ac_header in stdlib.h unistd.h
@@ -6529,54 +6734,6 @@ _ACEOF
 fi
 
 
-# Set the data directory to a true absolute path
-datadir2=$(# PATH urbi_resolve_dir(DIR)
-# --------------------------
-# Return the DIR with all inner variables expanded.
-urbi_resolve_dir ()
-{
-  ac_URBI_RESOLVE_DIR_PREPARE_dir=$1
-  ac_URBI_RESOLVE_DIR_PREPARE_res=
-  ac_URBI_RESOLVE_DIR_PREPARE_prefix_NONE=
-  ac_URBI_RESOLVE_DIR_PREPARE_exec_prefix_NONE=
-  test "x$prefix" = xNONE &&
-     ac_URBI_RESOLVE_DIR_PREPARE_exec_prefix_NONE=yes &&
-     prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE &&
-     ac_URBI_RESOLVE_DIR_PREPARE_exec_prefix_NONE=yes &&
-     exec_prefix=$prefix
-  while true
-  do
-    eval ac_URBI_RESOLVE_DIR_PREPARE_res="$ac_URBI_RESOLVE_DIR_PREPARE_dir"
-    if test x"$ac_URBI_RESOLVE_DIR_PREPARE_dir" == x"$ac_URBI_RESOLVE_DIR_PREPARE_res"; then
-      break
-    fi
-    ac_URBI_RESOLVE_DIR_PREPARE_dir=$ac_URBI_RESOLVE_DIR_PREPARE_res
-  done
-  test "$ac_URBI_RESOLVE_DIR_PREPARE_prefix_NONE" && prefix=NONE
-  test "$ac_URBI_RESOLVE_DIR_PREPARE_exec_prefix_NONE" && exec_prefix=NONE
-  echo "$ac_URBI_RESOLVE_DIR_PREPARE_res"
-}
-
-urbi_resolve_dir '$datadir')
-
-# Provide a special option for the default XSLT URL
-
-# Check whether --with-xsl_url or --without-xsl_url was given.
-if test "${with_xsl_url+set}" = set; then
-  withval="$with_xsl_url"
-  xsl_url=$withval
-else
-  xsl_url="file://$datadir2/$PACKAGE_NAME/sextractor.xsl"
-
-fi;
-
-
-cat >>confdefs.h <<_ACEOF
-#define XSL_URL "$xsl_url"
-_ACEOF
-
-
 ########################### No multithreading yet! ###########################
 #AC_DEFINE(USE_THREADS, 1, [Triggers multhreading])
 
@@ -6585,9 +6742,12 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+# href to the XSL style-sheet in preflist.h
+CFLAGS="$CFLAGS -DXSL_URL=\\\"file://$datadir/${PACKAGE_NAME}/${PACKAGE_NAME}.xsl\\\""
+
 # Special optimization options for the INTEL C compiler
 if test $use_icc = "yes" -a $CC = "icc"; then
-  CFLAGS="-O -axWP -ip -unroll"
+  CFLAGS="$CFLAGS -O3 -axiMKW -ipo -ipo_obj -unroll"
 fi
 
 # Link with gprof option
@@ -6950,7 +7110,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by sextractor $as_me 2.5.4, which was
+This file was extended by sextractor $as_me 2.5.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7013,7 +7173,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sextractor config.status 2.5.4
+sextractor config.status 2.5.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

 # configure.in for SExtractor
-# (C) E.Bertin 2002-2007
+# (C) E.Bertin 2002-2006
 # Process this file with autoconf to produce a configure script.
 # First, disable the annoying config.cache
 define([AC_CACHE_LOAD],)
 define([AC_CACHE_SAVE],)
 
 # This is your standard Bertin source code...
-AC_INIT(sextractor, 2.5.4, [bertin@iap.fr])
+AC_INIT(sextractor, 2.5.0, [bertin@iap.fr])
 AC_CONFIG_SRCDIR(src/makeit.c)
 AC_CONFIG_AUX_DIR(autoconf)
 AM_CONFIG_HEADER(config.h)
@@ -21,7 +21,6 @@ AC_SUBST(DATE3, "$date3")
 
 # Include macros
 sinclude(acx_prog_cc_optim.m4)
-sinclude(acx_urbi_resolve_dir.m4)
 
 # Display pakage and version number
 AC_MSG_RESULT([*********** Configuring:  $PACKAGE $VERSION ($date) **********])
@@ -96,7 +95,7 @@ AC_TYPE_UID_T
 
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
-#AC_FUNC_MALLOC
+AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
@@ -107,26 +106,13 @@ AC_CHECK_FUNCS([atexit getenv memcpy memmove memset mkdir munmap strstr])
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
-# Set the data directory to a true absolute path
-datadir2=$(URBI_RESOLVE_DIR([$datadir]))
-
-# Provide a special option for the default XSLT URL
-AC_ARG_WITH(xsl_url,
-        [AC_HELP_STRING([--with-xsl_url=<default URL for XSLT filter>],
-        [Provide an alternative default URL of the XSLT filter])],
-    [xsl_url=$withval],
-    [xsl_url="file://$datadir2/$PACKAGE_NAME/sextractor.xsl"]
-    )
-
-AC_DEFINE_UNQUOTED([XSL_URL], "$xsl_url",[Default URL of the XSLT filter])
-
 ########################### No multithreading yet! ###########################
 #AC_DEFINE(USE_THREADS, 1, [Triggers multhreading])
 AC_DEFINE_UNQUOTED(THREADS_NMAX, 1,[Maximum number of POSIX threads])
 
 # Special optimization options for the INTEL C compiler
 if test $use_icc = "yes" -a $CC = "icc"; then
-  CFLAGS="-O -axWP -ip -unroll"
+  CFLAGS="$CFLAGS -O3 -axiMKW -ipo -ipo_obj -unroll"
 fi
 
 # Link with gprof option

man/Makefile.in

-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,10 +37,7 @@ subdir = man
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/sex.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acx_urbi_resolve_dir.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_urbi_resolve_dir.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acx_prog_cc_optim.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -147,9 +144,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  man/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  man/Makefile
+	  $(AUTOMAKE) --gnu  man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

man/sex.1

-.TH SEXTRACTOR "1" "July 2007" "SWarp 2.5.4" "User Commands"
+.TH SEXTRACTOR "1" "October 2006" "SWarp 2.5.0" "User Commands"
 .SH NAME
 sex \- extract a source catalog from an astronomical FITS image
 .SH SYNOPSIS

sextractor-tpx.spec.in

@@ -20,7 +20,7 @@ SExtractor stands for ``Source Extractor'': a software for making catalog of sou
 %setup -q
 
 %build
-./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --with-xsl_url=file:///usr/local/share/@PACKAGE_NAME@/sextractor.xsl --enable-static
+./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --enable-static
 
 make
 
@@ -35,7 +35,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/local/bin/sex
 /usr/local/man/man1/sex.1
 /usr/local/man/manx/sex.x
-/usr/local/share/@PACKAGE_NAME@
 %doc AUTHORS BUGS ChangeLog COPYING HISTORY INSTALL README THANKS doc/README.DOC doc/sextractor.ps
 
 %changelog

sextractor.spec.in

@@ -20,11 +20,11 @@ SExtractor stands for ``Source Extractor'': a software for making catalog of sou
 %setup -q
 
 %build
-if test "$TPXFLAGS"; then
-./configure --enable-static --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --with-xsl_url=file:///usr/local/share/@PACKAGE_NAME@/sextractor.xsl
-make CC="$TPXCC" CFLAGS="$TPXFLAGS"
+if test "$GCCFLAGS"; then
+./configure --enable-static --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/
+make CFLAGS="$GCCFLAGS"
 else
-./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --with-xsl_url=file:///usr/local/share/@PACKAGE_NAME@/sextractor.xsl
+./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/
 make
 fi
 
@@ -37,10 +37,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 /usr/local/bin/sex
-/usr/local/bin/ldactoasc
 /usr/local/man/man1/sex.1
 /usr/local/man/manx/sex.x
-/usr/local/share/@PACKAGE_NAME@
 %doc AUTHORS BUGS ChangeLog COPYING HISTORY INSTALL README THANKS doc/README.DOC doc/sextractor.pdf
 
 %changelog

src/Makefile.am

 # Program Makefile for SEx
-# Copyright (C) 2004-2007 Emmanuel Bertin.
+# Copyright (C) 2004-2006 Emmanuel Bertin.
 SUBDIRS			= fits wcs
-bin_PROGRAMS		= sex ldactoasc
+bin_PROGRAMS		= sex
 sex_SOURCES		= analyse.c assoc.c astrom.c back.c bpro.c catout.c \
 			  check.c clean.c extract.c field.c filter.c \
 			  flag.c graph.c growth.c image.c interpolate.c \
@@ -15,8 +15,6 @@ sex_SOURCES		= analyse.c assoc.c astrom.c back.c bpro.c catout.c \
 			  neurro.h param.h photom.h plist.h poly.h prefs.h \
 			  preflist.h psf.h retina.h sexhead1.h sexhead.h \
 			  sexheadsc.h som.h types.h weight.h winpos.h xml.h
-ldactoasc_SOURCES	= ldactoasc.c ldactoasc.h
 AM_CPPFLAGS		= -DXSL_URL=\"file://$(pkgdatadir)/${PACKAGE_NAME}.xsl\"
 sex_LDADD		= $(top_builddir)/src/fits/libfits.a $(top_builddir)/src/wcs/libwcs_c.a
-ldactoasc_LDADD		= $(top_builddir)/src/fits/libfits.a
 DATE=`date +"%Y-%m-%d"`

src/Makefile.in

-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = $(ldactoasc_SOURCES) $(sex_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,14 +34,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = sex$(EXEEXT) ldactoasc$(EXEEXT)
+bin_PROGRAMS = sex$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acx_urbi_resolve_dir.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_urbi_resolve_dir.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acx_prog_cc_optim.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -53,9 +48,6 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_ldactoasc_OBJECTS = ldactoasc.$(OBJEXT)
-ldactoasc_OBJECTS = $(am_ldactoasc_OBJECTS)
-ldactoasc_DEPENDENCIES = $(top_builddir)/src/fits/libfits.a
 am_sex_OBJECTS = analyse.$(OBJEXT) assoc.$(OBJEXT) astrom.$(OBJEXT) \
 	back.$(OBJEXT) bpro.$(OBJEXT) catout.$(OBJEXT) check.$(OBJEXT) \
 	clean.$(OBJEXT) extract.$(OBJEXT) field.$(OBJEXT) \
@@ -77,8 +69,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(ldactoasc_SOURCES) $(sex_SOURCES)
-DIST_SOURCES = $(ldactoasc_SOURCES) $(sex_SOURCES)
+SOURCES = $(sex_SOURCES)
+DIST_SOURCES = $(sex_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -167,7 +159,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # Program Makefile for SEx
-# Copyright (C) 2004-2007 Emmanuel Bertin.
+# Copyright (C) 2004-2006 Emmanuel Bertin.
 SUBDIRS = fits wcs
 sex_SOURCES = analyse.c assoc.c astrom.c back.c bpro.c catout.c \
 			  check.c clean.c extract.c field.c filter.c \
@@ -183,10 +175,7 @@ sex_SOURCES = analyse.c assoc.c astrom.c back.c bpro.c catout.c \
 			  preflist.h psf.h retina.h sexhead1.h sexhead.h \
 			  sexheadsc.h som.h types.h weight.h winpos.h xml.h
 
-ldactoasc_SOURCES = ldactoasc.c ldactoasc.h
-AM_CPPFLAGS = -DXSL_URL=\"file://$(pkgdatadir)/${PACKAGE_NAME}.xsl\"
 sex_LDADD = $(top_builddir)/src/fits/libfits.a $(top_builddir)/src/wcs/libwcs_c.a
-ldactoasc_LDADD = $(top_builddir)/src/fits/libfits.a
 DATE = `date +"%Y-%m-%d"`
 all: all-recursive
 
@@ -201,9 +190,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	  $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -244,9 +233,6 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-ldactoasc$(EXEEXT): $(ldactoasc_OBJECTS) $(ldactoasc_DEPENDENCIES) 
-	@rm -f ldactoasc$(EXEEXT)
-	$(LINK) $(ldactoasc_LDFLAGS) $(ldactoasc_OBJECTS) $(ldactoasc_LDADD) $(LIBS)
 sex$(EXEEXT): $(sex_OBJECTS) $(sex_DEPENDENCIES) 
 	@rm -f sex$(EXEEXT)
 	$(LINK) $(sex_LDFLAGS) $(sex_OBJECTS) $(sex_LDADD) $(LIBS)
@@ -273,7 +259,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/growth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpolate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldactoasc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makeit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manobjlist.Po@am__quote@
@@ -316,7 +301,13 @@ uninstall-info-am:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -328,7 +319,7 @@ $(RECURSIVE_TARGETS):
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -336,7 +327,13 @@ $(RECURSIVE_TARGETS):
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -357,7 +354,7 @@ maintainer-clean-recursive:
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \

src/fits/Makefile.in

-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = $(libfits_a_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -39,10 +37,7 @@ POST_UNINSTALL = :
 subdir = src/fits
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acx_urbi_resolve_dir.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_prog_cc_optim.m4 \
-	$(top_srcdir)/acx_urbi_resolve_dir.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acx_prog_cc_optim.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -170,9 +165,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/fits/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/fits/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/fits/Makefile
+	  $(AUTOMAKE) --gnu  src/fits/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

src/fits/fitscat.h

@@ -9,7 +9,7 @@
 *
 *	Contents:	Simplified versin of the LDACTools: main include file
 *
-*	Last modify:	11/06/2007
+*	Last modify:	10/07/2006
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -282,7 +282,6 @@ extern int	about_cat(catstruct *cat, FILE *stream),
 				long pos),
 		remove_key(tabstruct *tab, char *keyname),
 		remove_keys(tabstruct *tab),
-                removekeywordfrom_head(tabstruct *tab, char *keyword),
 		remove_tab(catstruct *cat, char *tabname, int seg),
 		remove_tabs(catstruct *cat),
 		save_head(catstruct *cat, tabstruct *tab),

src/fits/fitshead.c

@@ -9,7 +9,7 @@
 *
 *	Contents:	general functions for handling FITS file headers.
 *
-*	Last modify:	20/06/2007
+*	Last modify:	25/09/2004
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -315,7 +315,7 @@ INPUT	Table structure.
 OUTPUT	RETURN_OK if tab is a binary table, or RETURN_ERROR otherwise.
 NOTES	The headbuf pointer in the tabstruct might be reallocated.
 AUTHOR	E. Bertin (IAP & Leiden observatory)
-VERSION	11/06/2007
+VERSION	25/09/2004
  ***/
 int	update_head(tabstruct *tab)
 
@@ -353,13 +353,13 @@ int	update_head(tabstruct *tab)
     }
 
 /*First, remove all existing TTYPE, TFORM, etc...*/
-  removekeywordfrom_head(tab, "TTYPE???");
-  removekeywordfrom_head(tab, "TFORM???");
-  removekeywordfrom_head(tab, "TUNIT???");
-  removekeywordfrom_head(tab, "TZERO???");
-  removekeywordfrom_head(tab, "TSCAL???");
-  removekeywordfrom_head(tab, "TDIM???");
-  removekeywordfrom_head(tab, "TDISP???");
+  fitsremove(tab->headbuf, "TTYPE???");
+  fitsremove(tab->headbuf, "TFORM???");
+  fitsremove(tab->headbuf, "TUNIT???");
+  fitsremove(tab->headbuf, "TZERO???");
+  fitsremove(tab->headbuf, "TSCAL???");
+  fitsremove(tab->headbuf, "TDIM???");
+  fitsremove(tab->headbuf, "TDISP???");
 
 
 /*Change NAXIS1 in order to take into account changes in width*/
@@ -465,8 +465,8 @@ PURPOSE	Update a FITS header to make it "primary" (not extension)
 INPUT	Table structure.
 OUTPUT	RETURN_OK if tab header was already primary, or RETURN_ERROR otherwise.
 NOTES	-.
-AUTHOR	E. Bertin (IAP & Leiden observatory) C. Marmo (IAP)
-VERSION	11/06/2007
+AUTHOR	E. Bertin (IAP & Leiden observatory)
+VERSION	08/05/2002
  ***/
 int	prim_head(tabstruct *tab)
 
@@ -477,13 +477,8 @@ int	prim_head(tabstruct *tab)
       {
       strncpy(tab->headbuf, "SIMPLE  =                    T  "
 	"/ This is a FITS file                            ", 80);
-/* fitsverify 4.13 (CFITSIO V3.002) return an error
-   if PCOUNT and GCOUNT are in a primary header (23/05/2007)*/
-      removekeywordfrom_head(tab, "PCOUNT");      
-      removekeywordfrom_head(tab, "GCOUNT");      
       return RETURN_ERROR;
       }
-
   return RETURN_OK;
   }
 
@@ -495,8 +490,8 @@ INPUT	Table structure.
 OUTPUT	RETURN_OK if tab header was already extension, or RETURN_ERROR
 	otherwise.
 NOTES	-.
-AUTHOR	E. Bertin (IAP & Leiden observatory) C. Marmo (IAP)
-VERSION	20/06/2007
+AUTHOR	E. Bertin (IAP & Leiden observatory)
+VERSION	08/05/2002
  ***/
 int	ext_head(tabstruct *tab)
 
@@ -507,15 +502,6 @@ int	ext_head(tabstruct *tab)
       {
       strncpy(tab->headbuf, "XTENSION= 'IMAGE   '           "
 		"/ Image extension                                ", 80);
-/* fitsverify 4.13 (CFITSIO V3.002) return an error
-   if EXTEND are in an extension header (20/06/2007)*/
-      removekeywordfrom_head(tab, "EXTEND");      
-/* fitsverify 4.13 (CFITSIO V3.002) return an error
-   if PCOUNT and GCOUNT are not in the extension header (23/05/2007) */
-      addkeywordto_head(tab, "PCOUNT  ", "required keyword; must = 0");      
-      addkeywordto_head(tab, "GCOUNT  ", "required keyword; must = 1");
-      fitswrite(tab->headbuf,"PCOUNT  ", &tab->pcount, H_INT, T_LONG);     
-      fitswrite(tab->headbuf,"GCOUNT  ", &tab->gcount, H_INT, T_LONG);
       return RETURN_ERROR;
       }
 
@@ -578,36 +564,6 @@ int	addkeywordto_head(tabstruct *tab, char *keyword, char *comment)
   }
 
 
-/****** removekeywordfrom_head ************************************************
-PROTO	int removekeywordfrom_head(tabstruct *tab, char *keyword)
-PURPOSE	Remove a keyword from a table header.
-INPUT	Table structure,
-	String containing the keyword.
-OUTPUT	RETURN_OK if the keyword was found, RETURN_ERROR otherwise..
-NOTES	The headbuf pointer in the tabstruct might be reallocated.
-        '?' wildcard allowed; Don't remove the ``END'' keyword with this!!!
-AUTHOR	E. Bertin (IAP)
-VERSION	11/06/2007
- ***/
-int	removekeywordfrom_head(tabstruct *tab, char *keyword)
-
-  {
-   int	nb;
-
-  if (fitsremove(tab->headbuf, keyword) == RETURN_OK)
-    {
-    if ((nb=fitsfind(tab->headbuf, "END     ")/(FBSIZE/80)+1) < tab->headnblock)
-      {
-      tab->headnblock = nb;
-      QREALLOC(tab->headbuf, char, tab->headnblock*FBSIZE);
-      }
-    return RETURN_OK;
-    }
-  else
-    return RETURN_ERROR;
-  }
-
-
 /****** tformof ***************************************************************
 PROTO	int tformof(char *str, t_type ttype, int n)
 PURPOSE	Return the ``TFORM'' string corresponding to a t_type

src/fits/fitskey.c

@@ -9,7 +9,7 @@
 *
 *	Contents:	Functions related to the management of keys.
 *
-*	Last modify:	04/06/2007
+*	Last modify:	15/08/2003
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -575,7 +575,7 @@ NOTES	This is approximately the same code as for read_keys.
 	A NULL keynames pointer means read ALL keys belonging to the table.
 	A NULL mask pointer means NO selection for reading.
 AUTHOR	E. Bertin (IAP & Leiden observatory)
-VERSION	04/06/2007
+VERSION	15/08/2003
  ***/
 void	show_keys(tabstruct *tab, char **keynames, keystruct **keys, int nkeys,
 		BYTE *mask, FILE *stream,
@@ -691,10 +691,10 @@ void	show_keys(tabstruct *tab, char **keynames, keystruct **keys, int nkeys,
               if (banflag)
                 {
                 if (*key->unit)
-                  fprintf(stream, "# %3d %-15.15s %-47.47s [%s]\n",
+                  fprintf(stream, "# %3d %-19.19s %-47.47s [%s]\n",
                       n, key->name,key->comment, key->unit);
                 else
-                  fprintf(stream, "# %3d %-15.15s %.47s\n",
+                  fprintf(stream, "# %3d %-19.19s %.47s\n",
                       n, key->name,key->comment);
                 n += key->nbytes/t_size[key->ttype];
               }
@@ -730,10 +730,10 @@ void	show_keys(tabstruct *tab, char **keynames, keystruct **keys, int nkeys,
               if (banflag)
                 {
                 if (*key->unit)
-                  fprintf(stream, "# %3d %-15.15s %-47.47s [%s]\n",
+                  fprintf(stream, "# %3d %-19.19s %-47.47s [%s]\n",
                       n, key->name,key->comment, key->unit);
                 else
-                  fprintf(stream, "# %3d %-15.15s %.47s\n",
+                  fprintf(stream, "# %3d %-19.19s %.47s\n",
                       n, key->name,key->comment);
                 n += key->nbytes/t_size[key->ttype];
                 }
@@ -754,10 +754,10 @@ void	show_keys(tabstruct *tab, char **keynames, keystruct **keys, int nkeys,
         switch (o_type) {
         case SHOW_ASCII:
               if (*key->unit)
-                fprintf(stream, "#     %-15.15s %-47.47s [%s]\n",
+                fprintf(stream, "#     %-19.19s %-47.47s [%s]\n",
 	            	key->name,key->comment, key->unit);
               else
-                fprintf(stream, "#     %-15.15s %.47s\n",
+                fprintf(stream, "#     %-19.19s %.47s\n",
             		key->name,key->comment);
               break;
         case SHOW_SKYCAT:

src/fits/fitsutil.c

@@ -9,7 +9,7 @@
 *
 *	Contents:	functions for handling FITS keywords.
 *
-*	Last modify:	12/06/2007
+*	Last modify:	21/09/2006
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -38,8 +38,8 @@ NOTES	For all keywords except commentary ones (like COMMENT, HISTORY or
 	blank), it is checked that they do not exist already.
 	Enough memory should be provided for the FITS header to contain one
 	more line of 80 char.
-AUTHOR	E. Bertin (IAP & Leiden observatory) C. Marmo (IAP)
-VERSION	13/06/2007
+AUTHOR	E. Bertin (IAP & Leiden observatory)
+VERSION	13/06/2004
  ***/
 int	fitsadd(char *fitsbuf, char *keyword, char *comment)
 
@@ -76,26 +76,6 @@ int	fitsadd(char *fitsbuf, char *keyword, char *comment)
       else
         return RETURN_ERROR;
       }
-/*-- Special case of PCOUNT/GCOUNT parameters */
-    if (!strncmp(keyword, "PCOUNT", 6))
-      {
-      headpos=fitsfind(fitsbuf, "NAXIS   ");
-      sscanf(fitsbuf+80*headpos, "NAXIS   =                    %d", &n);
-      if (headpos>0)
-        headpos+=(n+1);
-      else
-        return RETURN_ERROR;
-      }
-    if (!strncmp(keyword, "GCOUNT", 6))
-      {
-      headpos=fitsfind(fitsbuf, "NAXIS   ");
-      sscanf(fitsbuf+80*headpos, "NAXIS   =                    %d", &n);
-      if (headpos>0)
-        headpos+=(n+2);
-      else
-        return RETURN_ERROR;
-      }
-
     key_ptr = fitsbuf+80*headpos;
     memmove(key_ptr+80, key_ptr, 80*(headpos2-headpos+1));
 
@@ -108,6 +88,7 @@ int	fitsadd(char *fitsbuf, char *keyword, char *comment)
     else
       sprintf(str, "%-8.8s=                        %-47.47s",
 	      keyword, " ");
+
     memcpy(key_ptr, str, 80);
     }
 
@@ -181,7 +162,7 @@ OUTPUT	RETURN_OK if something was found, RETURN_ERROR otherwise.
 NOTES	-.
 AUTHOR	E. Bertin (IAP),
         E.R. Deul - Handling of NaN
-VERSION	04/06/2007
+VERSION	19/09/2006
  ***/
 int	fitspick(char *fitsline, char *keyword, void *ptr, h_type *htype,
 		t_type *ttype, char *comment)
@@ -252,7 +233,13 @@ int	fitspick(char *fitsline, char *keyword, void *ptr, h_type *htype,
     {
     for (i=j; i<80 && fitsline[i]!=(char)'/' && fitsline[i]!=(char)'.'; i++);
 /*-- Handle floats*/
-    if (fitsline[i]==(char)'.') 
+    if (i==80)
+      {
+      *((int *)ptr) = 0;
+      *htype = H_INT;
+      *ttype = T_LONG;
+      }
+    else if (fitsline[i]==(char)'.') 
       {
       fixexponent(fitsline);
       *((double *)ptr) = atof(fitsline+j);

src/ldactoasc.c

-/*
- 				ldactoasc.c
-
-*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-*
-*	Part of:	LDACtoASC
-*
-*	Author:		E.BERTIN (IAP)
-*
-*	Contents:	Convert LDAC binary format to ASCII.
-*
-*	Last modify:	04/06/2007
-*
-*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-*/
-
-#ifdef HAVE_CONFIG_H
-#include	"config.h"
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "ldactoasc.h"
-#include "fits/fitscat.h"
-
-#define		SYNTAX  "ldactoasc catalog\n"
-extern const char	notokstr[];
-
-/********************************** main ************************************/
-int	main(int argc, char *argv[])
-
-  {
-   catstruct		*cat;
-   tabstruct		*tab;
-   unsigned short	ashort=1;
-   char			catname[MAXCHAR];
-   int			a, t, opt,opt2;
-
-  if (argc<2)
-    {
-    fprintf(OUTPUT, "\n                %s  Version %s (%s)\n",
-		BANNER, MYVERSION, DATE);
-    fprintf(OUTPUT, "\nFor information, please contact: %s\n", COPYRIGHT);
-    error(EXIT_SUCCESS, "SYNTAX: ", SYNTAX);
-    }
-
-/* Test if byteswapping will be needed */
-  bswapflag = *((char *)&ashort);
-
-/* Default parameters */
-  for (a=1; a<argc; a++)
-    {
-    if (*(argv[a]) == '-')
-      {
-      opt = (int)argv[a][1];
-      {
-      opt2 = (int)tolower((int)argv[a][2]);
-      if (opt == '-')
-        {
-        opt = opt2;
-        opt2 = (int)tolower((int)argv[a][3]);
-        }
-      switch(opt)
-        {
-        case 'v':
-          printf("%s version %s (%s)\n", BANNER,MYVERSION,DATE);
-          exit(EXIT_SUCCESS);
-          break;
-        case 'h':
-          fprintf(OUTPUT, "\nSYNTAX: %s", SYNTAX);
-          exit(EXIT_SUCCESS);
-          break;
-        default:
-          error(EXIT_SUCCESS, "SYNTAX: ", SYNTAX);
-          }
-        }
-      }
-    else
-      strcpy(catname, argv[a]);
-    }
-
-  if ((cat = read_cat(catname)))
-    {
-    tab = cat->tab;
-    for (t=cat->ntab; t--; tab=tab->nexttab)
-      if (!strcmp("LDAC_OBJECTS", tab->extname)
-	  || !strcmp("OBJECTS", tab->extname))
-        show_keys(tab, NULL, NULL, 0, NULL, stdout, 1, 1, 0, SHOW_ASCII);
-    free_cat(&cat, 1);
-
-    exit(EXIT_SUCCESS);
-    }
-  else
-    {
-    error(EXIT_FAILURE,"Cannot open ",catname);
-    return RETURN_ERROR;
-    }
-  }
-