diff --git a/ChangeLog b/ChangeLog
index 3c7607deb604a9287a53c1680ec8af1c86d4fc4a..257ce0432ae1c846e194f101070b4cbeb9917acb 100644
--- a/ChangeLog
+++ b/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
diff --git a/Makefile.am b/Makefile.am
index 104c14da9f229601da0d4e900f7f62815707e111..9a8cee9b6798cca078c72a0b8c36cfc295a77fd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
# 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"
diff --git a/Makefile.in b/Makefile.in
index 68e0f7de75fa329df8cf721d629d1f60118b844f..71e14656d4acfd494bdc7e63a7f9342a7c771035 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# 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"
diff --git a/aclocal.m4 b/aclocal.m4
index 4e3644ab1afad3500da03d659eb3d5a9e153766f..0c32a668713e19a9097d8ba1d4507207af06aa90 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 Free Software Foundation, Inc.
# This file 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.
@@ -11,23 +11,11 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# -*- Autoconf -*-
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
@@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.4])])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+ [AM_AUTOMAKE_VERSION([1.9.6])])
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -107,25 +84,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
# Free Software Foundation, Inc.
+#
+# This file 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.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
# This was merged into AC_PROG_CC in Autoconf.
@@ -140,26 +106,16 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
])
AU_DEFUN([fp_PROG_CC_STDC])
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# AM_CONDITIONAL -*- Autoconf -*-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 6
+# serial 7
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -183,26 +139,15 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# serial 7 -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
+#
+# This file 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.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+# serial 8
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -211,7 +156,6 @@ fi])])
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@@ -351,27 +295,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-#serial 2
+#serial 3
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@@ -430,54 +363,31 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 7
+# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-# Do all the work for Automake. -*- Autoconf -*-
+# Do all the work for Automake. -*- Autoconf -*-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
+#
+# This file 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.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 12
-# serial 11
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
@@ -579,51 +489,27 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
-# -*- Autoconf -*-
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 1
+# serial 2
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
@@ -638,26 +524,15 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 2
+# serial 3
# AM_MAKE_INCLUDE()
# -----------------
@@ -701,27 +576,16 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-# -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 3
+# serial 4
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -747,27 +611,16 @@ else
fi
])
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
@@ -821,26 +674,15 @@ else
fi
AC_SUBST([mkdir_p])])
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Helper functions for option handling. -*- Autoconf -*-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 2
+# serial 3
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -865,28 +707,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-#
-# Check to make sure that the build environment is sane.
-#
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 3
+# serial 4
# AM_SANITY_CHECK
# ---------------
@@ -929,25 +759,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+# AM_PROG_INSTALL_STRIP
+# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
@@ -970,25 +789,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+# serial 2
# _AM_PROG_TAR(FORMAT)
# --------------------
@@ -1076,5 +883,3 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([acx_urbi_resolve_dir.m4])
-m4_include([acx_prog_cc_optim.m4])
diff --git a/acx_urbi_resolve_dir.m4 b/acx_urbi_resolve_dir.m4
deleted file mode 100644
index cd8b1eadf751f58e65c3a4e267f4c9da143acc43..0000000000000000000000000000000000000000
--- a/acx_urbi_resolve_dir.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-# 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:
diff --git a/config.h.in b/config.h.in
index 75e88632e42cfbb0e43c21a79473fef6f42ef463..7395a9bd40d4f811e245a07b465affa7d2fddcaf 100644
--- a/config.h.in
+++ b/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
diff --git a/configure b/configure
index d89f381a5b1a06d4904a9e9f48dadb5c4610f161..3bab1ba35973b8efc446cb5b9c809df34b9d088b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /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'`\\"
diff --git a/configure.ac b/configure.ac
index 300cacef45ae7a76e35e129ff4c3b5139bef597a..e43c7643bd4b927ec2786d8a43fad977d38adae9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
# 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
diff --git a/man/Makefile.in b/man/Makefile.in
index 500723e995d65d62095af32a9e33666135709cc8..70e0908433b54986b74bc492fcfcfeb2239926be 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,8 +1,8 @@
-# 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 \
diff --git a/man/sex.1 b/man/sex.1
index eadfd9c0b7f79dc8171e6a2cf785b017ae3c7b95..e5411353499e014ddf4fb9840921a334b5307e9f 100644
--- a/man/sex.1
+++ b/man/sex.1
@@ -1,4 +1,4 @@
-.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
diff --git a/sextractor-tpx.spec.in b/sextractor-tpx.spec.in
index d6ecc30bd29379c8a199c8fb9f1b730d886a2f3f..6ff251469642a6bfb7e2911a67c6cdf5a04d16e7 100644
--- a/sextractor-tpx.spec.in
+++ b/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
diff --git a/sextractor.spec.in b/sextractor.spec.in
index 4007c9035d694cadec0bd7420d26ba75316a84e4..d505b2ce4073f7ab798849ec49d06555d17dae2c 100644
--- a/sextractor.spec.in
+++ b/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
diff --git a/src/Makefile.am b/src/Makefile.am
index e5dc31d786a4f3ef4b3d41266ca9ef2e75efac70..7f1e3532b76ca5114202e821801dad08f458a2c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
# 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"`
diff --git a/src/Makefile.in b/src/Makefile.in
index e5f876a4f69a1e12c476fae009bbd59214e402f1..e61b88a2be855ec2a924b1e4450b5b8321709ddc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# 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 \
diff --git a/src/fits/Makefile.in b/src/fits/Makefile.in
index 9f732b6c09212a9f935e4dbe3b8ca0a6a13218da..adeece2ea7b6231290d19982685acbe15daf36ca 100644
--- a/src/fits/Makefile.in
+++ b/src/fits/Makefile.in
@@ -1,8 +1,8 @@
-# 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 \
diff --git a/src/fits/fitscat.h b/src/fits/fitscat.h
index fe88309523fb5591d39bd5f553311624cb13b01a..b4c4e6b06368fbf23f16a6f575bdfd4bfbd352af 100644
--- a/src/fits/fitscat.h
+++ b/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),
diff --git a/src/fits/fitshead.c b/src/fits/fitshead.c
index 1125f88ec0f07ed012cc26068898302b400edd52..7a3409c4933c3c84d04a1bb0654f34f99e99fd20 100644
--- a/src/fits/fitshead.c
+++ b/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
diff --git a/src/fits/fitskey.c b/src/fits/fitskey.c
index 9e6c9a39d1ead5e2a89c21d8f2b0d26ba16f6a3d..4e1cfa3dd25a9a234d6409e1d97cb65794ad965d 100644
--- a/src/fits/fitskey.c
+++ b/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:
diff --git a/src/fits/fitsutil.c b/src/fits/fitsutil.c
index 7044add7f3a38b89ad6e06ef34e91fa432853b15..6992c9990da57fecd630fe4ff65f03613b6960c2 100644
--- a/src/fits/fitsutil.c
+++ b/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);
diff --git a/src/ldactoasc.c b/src/ldactoasc.c
deleted file mode 100644
index 8c2afc4c5edb3094eec66645f223a652e690c9ff..0000000000000000000000000000000000000000
--- a/src/ldactoasc.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- 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;
- }
- }
-
diff --git a/src/ldactoasc.h b/src/ldactoasc.h
deleted file mode 100644
index c408e6f263268194441f7858c3dffd27ce449a41..0000000000000000000000000000000000000000
--- a/src/ldactoasc.h
+++ /dev/null
@@ -1,146 +0,0 @@
- /*
- ldactoasc.h
-
-*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-*
-* Part of: LDACtoASC
-*
-* Author: E.BERTIN (IAP)
-*
-* Contents: global definitions.
-*
-* Last modify: 04/06/2007
-*
-*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-*/
-
-/* Check if we are using a configure script here */
-#ifndef HAVE_CONFIG_H
-#define VERSION "1.x"
-#define DATE "2007-06-04"
-#define THREADS_NMAX 16 /* max. number of threads */
-#endif
-
-/*------------------------ what, who, when and where ------------------------*/
-
-#define BANNER "LDACtoASC"
-#ifdef USE_THREADS
-#define MYVERSION VERSION "-MP"
-#else
-#define MYVERSION VERSION
-#endif
-#define COPYRIGHT "Emmanuel BERTIN <bertin@iap.fr>"
-#define WEBSITE "http://terapix.iap.fr/soft/sextractor/"
-#define INSTITUTE "TERAPIX team at IAP http://terapix.iap.fr"
-
-/*----------------------------- Physical constants --------------------------*/
-
-#ifndef PI
-#define PI 3.1415926535898
-#endif
-
-/*----------------------------- Internal constants --------------------------*/
-
-#define BIG 1e+30 /* a huge number */
-#define TINY (1.0/BIG) /* a small number */
-#define OUTPUT stdout /* where all msgs are sent */
-#define MAXCHAR 512 /* max. number of characters */
-#define MAXFILE 32768 /* max number of input files */
-
-/*------------ Set defines according to machine's specificities -------------*/
-
-#if 0
-#define NO_ENVVAR
-#endif
-
-/*--------------------- in case of missing constants ------------------------*/
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE -1
-#endif
-
-/*---------------------------- return messages ------------------------------*/
-
-#define RETURN_OK 0
-#define RETURN_ERROR (-1)
-#define RETURN_FATAL_ERROR (-2)
-
-/*------------------------------- Other Macros ------------------------------*/
-
-#define DEXP(x) exp(2.30258509299*(x)) /* 10^x */
-
-#define QFREAD(ptr, size, afile, fname) \
- if (fread(ptr, (size_t)(size), (size_t)1, afile)!=1) \
- error(EXIT_FAILURE, "*Error* while reading ", fname)
-
-#define QFWRITE(ptr, size, afile, fname) \
- if (fwrite(ptr, (size_t)(size), (size_t)1, afile)!=1) \
- error(EXIT_FAILURE, "*Error* while writing ", fname)
-
-#define QFSEEK(afile, offset, pos, fname) \
- if (fseek(afile, (offset), pos)) \
- error(EXIT_FAILURE,"*Error*: file positioning failed in ", \
- fname)
-
-#define QFTELL(pos, afile, fname) \
- if ((pos=ftell(afile))==-1) \
- error(EXIT_FAILURE,"*Error*: file position unknown in ", \
- fname)
-
-#define QCALLOC(ptr, typ, nel) \
- {if (!(ptr = (typ *)calloc((size_t)(nel),sizeof(typ)))) \
- error(EXIT_FAILURE, "Not enough memory for ", \
- #ptr " (" #nel " elements) !");;}
-
-#define QMALLOC(ptr, typ, nel) \
- {if (!(ptr = (typ *)malloc((size_t)(nel)*sizeof(typ)))) \
- error(EXIT_FAILURE, "Not enough memory for ", \
- #ptr " (" #nel " elements) !");;}
-
-#define QREALLOC(ptr, typ, nel) \
- {if (!(ptr = (typ *)realloc(ptr, (size_t)(nel)*sizeof(typ)))) \
- error(EXIT_FAILURE, "Not enough memory for ", \
- #ptr " (" #nel " elements) !");;}
-
-#define QMEMCPY(ptrin, ptrout, typ, nel) \
- {if (ptrin) \
- {if (!(ptrout = (typ *)malloc((size_t)(nel)*sizeof(typ)))) \
- error(EXIT_FAILURE, "Not enough memory for ", \
- #ptrout " (" #nel " elements) !"); \
- memcpy(ptrout, ptrin, (size_t)(nel)*sizeof(typ));};;}
-
-#define QPOPEN(file, cmdline, flag) \
- {if (!(file=popen(cmdline, flag))) \
- error(EXIT_FAILURE, "*Error*: cannot execute ", cmdline);;}
-
-#define RINT(x) (int)(floor(x+0.5))
-
-#define NPRINTF if (prefs.verbose_type == NORM) fprintf
-
-#define NFPRINTF(w,x) {if (prefs.verbose_type == NORM) \
- fprintf(w, "\33[1M> %s\n\33[1A",x);}
-
-#define FPRINTF if (prefs.verbose_type == FULL) fprintf
-
-#define QPRINTF if (prefs.verbose_type != QUIET) fprintf
-
-#define QIPRINTF(w,x) {if (prefs.verbose_type == NORM) \
- fprintf(w, "\33[7m%s\33[0m\n", x); \
- else if (prefs.verbose_type == LOG) \
- fprintf(w, "%s\n", x);}
-
-#define QBPRINTF(w,x) {if (prefs.verbose_type == NORM) \
- fprintf(w, "\33[01;31m%s\33[0m\n", x); \
- else if (prefs.verbose_type == LOG) \
- fprintf(w, "%s\n", x);}
-
diff --git a/src/main.c b/src/main.c
index 3997c7e37f8c5ac7cd8e39a68777a5cb70b5d1d1..c52f1c9a3f2f6ada6088593a6d311990c3f633bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,7 @@
*
* Contents: Command-line parsing.
*
-* Last modify: 10/04/2007
+* Last modify: 07/07/2006
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -120,7 +120,6 @@ int main(int argc, char *argv[])
makeit();
- endprefs();
NFPRINTF(OUTPUT, "");
NPRINTF(OUTPUT, "> All done (in %.0f s)\n", prefs.time_diff);
diff --git a/src/makeit.c b/src/makeit.c
index 676ac47f663deb6adda5f524a8294cb0783ed169..de85cbb5e9b832eacb6b6209c8d3b5e9ef36e6c0 100644
--- a/src/makeit.c
+++ b/src/makeit.c
@@ -9,7 +9,7 @@
*
* Contents: main program.
*
-* Last modify: 31/07/2007
+* Last modify: 14/07/2006
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -56,7 +56,6 @@ void makeit()
static time_t thetime1, thetime2;
struct tm *tm;
int i, nok, ntab, next;
- void *gptr, *sptr;
/* Install error logging */
error_installfunc(write_error);
@@ -160,6 +159,7 @@ void makeit()
" CHECK_IMAGE_TYPE");
prefs.check[c] = initcheck(prefs.check_name[i], prefs.check_type[i],
next);
+ free(prefs.check_name[i]);
}
}
@@ -193,7 +193,7 @@ void makeit()
dfield = newfield(prefs.image_name[0], DETECT_FIELD, nok);
field = newfield(prefs.image_name[1], MEASURE_FIELD, nok);
if ((field->width!=dfield->width) || (field->height!=dfield->height))
- error(EXIT_FAILURE, "*Error*: Frames have different sizes","");
+ error(EXIT_FAILURE, "*Error*: Frames have different sizes","");
/*---- Prepare interpolation */
if (prefs.dweight_flag && prefs.interp_type[0] == INTERP_ALL)
init_interpolate(dfield, -1, -1);
@@ -209,14 +209,6 @@ void makeit()
init_interpolate(field, -1, -1); /* 0.0 or anything else */
}
-/*---- Prepare photometry Measurements: gain and saturation definition */
- if (fitsread(field->fitshead, prefs.gain_key, &gptr, H_FLOAT, T_DOUBLE)
- ==RETURN_OK)
- prefs.gain = *(double *)&gptr;
- if (fitsread(field->fitshead, prefs.satur_key, &sptr, H_FLOAT, T_DOUBLE)
- ==RETURN_OK)
- prefs.satur_level = *(double *)&sptr;
-
/*-- Init the WEIGHT-images */
if (prefs.dweight_flag || prefs.weight_flag)
{
diff --git a/src/preflist.h b/src/preflist.h
index 5ac774ab1e011af4b7d4383a961724ecbc8e9795..deac3e43926053663b42684c08918a107c95d444 100644
--- a/src/preflist.h
+++ b/src/preflist.h
@@ -9,7 +9,7 @@
*
* Contents: Keywords for the configuration file.
*
-* Last modify: 31/07/2007
+* Last modify: 14/07/2006
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -91,7 +91,6 @@
{"FLAG_TYPE", P_KEYLIST, prefs.flag_type, 0,0, 0.0,0.0,
{"OR","AND","MIN", "MAX", "MOST",""}, 0, MAXFLAG, &idummy},
{"GAIN", P_FLOAT, &prefs.gain, 0,0, 0.0, 1e+30},
- {"GAIN_KEY", P_STRING, prefs.gain_key},
{"INTERP_MAXXLAG", P_INTLIST, prefs.interp_xtimeout, 1,1000000, 0.0,0.0,
{""}, 1, 2, &prefs.ninterp_xtimeout},
{"INTERP_MAXYLAG", P_INTLIST, prefs.interp_ytimeout, 1,1000000, 0.0,0.0,
@@ -124,7 +123,6 @@
{"PSFDISPLAY_TYPE", P_KEY, &prefs.psfdisplay_type, 0,0, 0.0,0.0,
{"SPLIT","VECTOR",""}},
{"SATUR_LEVEL", P_FLOAT, &prefs.satur_level, 0,0, -1e+30, 1e+30},
- {"SATUR_KEY", P_STRING, prefs.satur_key},
{"SEEING_FWHM", P_FLOAT, &prefs.seeing_fwhm, 0,0, 1e-10, 1e+10},
{"SOM_NAME", P_STRING, prefs.som_name},
{"STARNNW_NAME", P_STRING, prefs.nnw_name},
@@ -212,12 +210,9 @@ char *default_prefs[] =
" ",
"SATUR_LEVEL 50000.0 # level (in ADUs) at which arises saturation",
" ",
-"SATUR_KEY SATURATE # keyword for saturation level (in ADUs)",
-" ",
"MAG_ZEROPOINT 0.0 # magnitude zero-point",
"MAG_GAMMA 4.0 # gamma of emulsion (for photographic scans)",
"GAIN 0.0 # detector gain in e-/ADU",
-"GAIN_KEY GAIN # keyword for detector gain in e-/ADU",
"PIXEL_SCALE 1.0 # size of pixel in arcsec (0=use FITS WCS info)",
" ",
"#------------------------- Star/Galaxy Separation ----------------------------",
diff --git a/src/prefs.c b/src/prefs.c
index dbc1c482edd38f2915072a36efef41d05380ba0d..cb841d06b2021b372ffe76ab5ddc9682770b7cd4 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -9,7 +9,7 @@
*
* Contents: Functions to handle the configuration file.
*
-* Last modify: 10/04/2007
+* Last modify: 12/01/2006
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -598,23 +598,3 @@ void useprefs()
}
-/********************************* endprefs *********************************/
-/*
-Mostly free memory allocate for static arrays.
-*/
-void endprefs(void)
-
- {
- int i;
-
- for (i=0; i<prefs.nfimage_name; i++)
- free(prefs.fimage_name[i]);
- for (i=0; i<prefs.nwimage_name; i++)
- free(prefs.wimage_name[i]);
- for (i=0; i<prefs.npsf_name; i++)
- free(prefs.psf_name[i]);
- for (i=0; i<prefs.ncheck_name; i++)
- free(prefs.check_name[i]);
-
- return;
- }
diff --git a/src/prefs.h b/src/prefs.h
index 0a72516792e8e6bca67d42de36dc5b1406fc2398..c3b58608b285ce8d2a9936cc9afda54eae83e518 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -9,7 +9,7 @@
*
* Contents: Keywords for the configuration file.
*
-* Last modify: 31/07/2007
+* Last modify: 13/07/2006
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
@@ -52,7 +52,6 @@ typedef struct
int deblend_nthresh; /* threshold number */
double deblend_mincont; /* minimum contrast */
double satur_level; /* saturation level */
- char satur_key[8]; /* saturation keyword */
enum {CCD, PHOTO} detect_type; /* detection type */
/*----- Flagging */
char *(fimage_name[MAXFLAG]); /* flagmap filenames */
@@ -92,8 +91,6 @@ typedef struct
double mag_zeropoint; /* magnitude offsets */
double mag_gamma; /* for emulsions */
double gain; /* only for CCD */
- char gain_key[8]; /* gain keyword
- only for CCD */
/*----- S/G separation */
double pixel_scale; /* in arcsec */
double seeing_fwhm; /* in arcsec */
@@ -215,7 +212,6 @@ typedef struct
extern int cistrcmp(char *cs, char *ct, int mode);
extern void dumpprefs(int state),
- endprefs(void),
readprefs(char *filename,char **argkey,char **argval,int narg),
useprefs(void);
#endif
diff --git a/src/wcs/Makefile.in b/src/wcs/Makefile.in
index dd717122e76b9995425d70138aadbd505db7b5f5..e4c294df3e25dcf1a71b1486f7c40d9b5285b800 100644
--- a/src/wcs/Makefile.in
+++ b/src/wcs/Makefile.in
@@ -1,8 +1,8 @@
-# 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 = $(libwcs_c_a_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -39,10 +37,7 @@ POST_UNINSTALL = :
subdir = src/wcs
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)
@@ -168,9 +163,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/wcs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/wcs/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/wcs/Makefile
+ $(AUTOMAKE) --gnu src/wcs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/src/xml.c b/src/xml.c
index c1ebb92f2c69a2a92e046f6874ac4c43d4661665..7f05e4d987340fd77b2b52a69d156aab729d85b4 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -358,9 +358,9 @@ int write_xml_meta(FILE *file, char *error)
fprintf(file, " <TR>\n"
" <TD>%d</TD><TD>%s</TD><TD>%s</TD><TD>%.0f</TD>"
"<TD>%d</TD><TD>%d</TD>\n"
- " <TD>%s,%s</TD><TD>%g %g</TD>\n"
+ " <TD>%s,%s</TD>\n"
" <TD>%g %g</TD><TD>%g %g</TD><TD>%g %g</TD>"
- "<TD>%g %g</TD><TD>%f %f</TD>\n"
+ "<TD>%g %g</TD><TD>%g %g</TD>\n"
" </TR>\n",
xmlstack[n].currext,
xmlstack[n].ext_date,
@@ -373,14 +373,13 @@ int write_xml_meta(FILE *file, char *error)
xmlstack[n].backsig[0], xmlstack[n].backsig[1],
xmlstack[n].sigfac[0], xmlstack[n].sigfac[1],
xmlstack[n].thresh[0], xmlstack[n].thresh[1],
- xmlstack[n].pixscale[0], xmlstack[n].pixscale[1],
- xmlstack[n].epoch[0], xmlstack[n].epoch[1]);
+ xmlstack[n].pixscale[0], xmlstack[n].pixscale[1]);
else
fprintf(file, " <TR>\n"
" <TD>%d</TD><TD>%s</TD><TD>%s</TD><TD>%.0f</TD>"
"<TD>%d</TD><TD>%d</TD>\n"
- " <TD>%s</TD><TD>%g</TD>\n"
- " <TD>%g</TD><TD>%g</TD><TD>%g</TD><TD>%g</TD><TD>%f</TD>\n"
+ " <TD>%s</TD>\n"
+ " <TD>%g</TD><TD>%g</TD><TD>%g</TD><TD>%g</TD><TD>%g</TD>\n"
" </TR>\n",
xmlstack[n].currext,
xmlstack[n].ext_date,
@@ -393,8 +392,7 @@ int write_xml_meta(FILE *file, char *error)
xmlstack[n].backsig[0],
xmlstack[n].sigfac[0],
xmlstack[n].thresh[0],
- xmlstack[n].pixscale[0],
- xmlstack[n].epoch[0]);
+ xmlstack[n].pixscale[0]);
fprintf(file, " </TABLEDATA></DATA>\n");
fprintf(file, " </TABLE>\n");
diff --git a/xsl/sextractor.xsl b/xsl/sextractor.xsl
deleted file mode 100644
index ecf2df5cacabd7ec71215fa10828cc1926b7ce41..0000000000000000000000000000000000000000
--- a/xsl/sextractor.xsl
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY nbsp " ">
- <!ENTITY deg "°">
- <!ENTITY amin "´">
- <!ENTITY asec "¨">
- ]>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- *********************** Global XSL template ************************** -->
- <xsl:template match="/">
- <xsl:variable name="date" select="/VOTABLE/RESOURCE/RESOURCE[@name='MetaData']/PARAM[@name='Date']/@value"/>
- <xsl:variable name="time" select="/VOTABLE/RESOURCE/RESOURCE[@name='MetaData']/PARAM[@name='Time']/@value"/>
- <html>
-
-<!-- HTML head -->
-
- <head>
-
-<!-- javascript -->
-
-<!-- <script type="text/javascript" language="javascript"> -->
-
- <script src="http://terapix.iap.fr/cplt/xsl/sorttable.js"/>
-
- <style type="text/css">
- p.sansserif {font-family: sans-serif}
- body {background-color: white}
- mono {font-family: monospace}
- elen {font-family: monospace; font-size: 100%; font-weight: bold; color: green }
- elep {font-family: monospace; font-size: 100%; font-weight: bold; color: red }
- el {font-family: monospace; font-size: 100%; color: black}
- a {text-decoration: none}
- table.sortable a.sortheader
- {
- background-color:#FFEECC;
- color: black;
- font-weight: bold;
- font-size: 80%;
- text-decoration: none;
- display: button;
- }
- table.sortable span.sortarrow
- {
- color: black;
- font-weight: bold;
- text-decoration: none;
- }
- table.sortable a.sortheader.sub
- {
- vertical-align: sub;
- }
- </style>
-
- <title>
- Processing summary on <xsl:value-of select="$date"/> at <xsl:value-of select="$time"/>
- </title>
- </head>
-
-<!-- HTML body -->
-
- <BODY>
- <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
- <TR>
- <TD ALIGN="LEFT">
- <TABLE BORDER="0">
- <TR>
- <TD ALIGN="CENTER">
- <IMG SRC="http://terapix.iap.fr/cplt/xsl/terapixLogo.png" ALT="Terapix"/>
- </TD>
- <TD ALIGN="CENTER">
- <IMG SRC="http://terapix.iap.fr/cplt/xsl/terapixTitle.png" ALT="Logo"/>
- </TD>
- <TD ALIGN="CENTER">
- <FONT color="#669933">
- <B> Processing summary</B>
- </FONT>
- </TD>
- <TD ALIGN="CENTER">
- <IMG SRC="http://terapix.iap.fr/cplt/xsl/terapixPicture.gif" ALT="Terapix banner"/>
- </TD>
- </TR>
- </TABLE>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE BORDER="0" WIDTH="100%" BGCOLOR="#000000">
- <TR>
- <TH BGCOLOR="#000000" ALIGN="LEFT"><FONT SIZE="-1" COLOR="#FFFFFF"> Home > Tools > Data reduction</FONT></TH>
- </TR>
- </TABLE>
- </TD>
- </TR>
- </TABLE>
- <xsl:call-template name="VOTable"/>
- </BODY>
- </html>
- </xsl:template>
-
-<!-- **************** Generic XSL template for VOTables ****************** -->
- <xsl:template name="VOTable">
- <xsl:for-each select="/VOTABLE">
- <xsl:call-template name="Resource"/>
- </xsl:for-each>
- </xsl:template>
-
-<!-- *************** Generic XSL template for Resources ****************** -->
- <xsl:template name="Resource">
- <xsl:for-each select="RESOURCE">
- <xsl:choose>
- <xsl:when test="@ID='SExtractor'">
- <xsl:call-template name="sextractor"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
-
-<!-- ******************* XSL template for SExtractor ********************* -->
- <xsl:template name="sextractor">
- <xsl:for-each select="RESOURCE[@ID='MetaData']">
- <xsl:call-template name="RunInfo"/>
- <xsl:for-each select="/VOTABLE/RESOURCE[@ID='SExtractor']/TABLE[@ID='Source_List']">
- <xsl:call-template name="sources"/>
- </xsl:for-each>
- <xsl:for-each select="TABLE[@ID='Extension_Data']">
- <xsl:call-template name="extdata"/>
- </xsl:for-each>
- <xsl:for-each select="RESOURCE[@ID='Config']">
- <xsl:call-template name="Config"/>
- </xsl:for-each>
- <xsl:for-each select="TABLE[@ID='Warnings']">
- <xsl:call-template name="Warnings"/>
- </xsl:for-each>
- </xsl:for-each>
- </xsl:template>
-
-<!-- ************* Generic XSL RunInfo template for MetaData ************* -->
- <xsl:template name="RunInfo">
- <p>
-<!-- Software name, version, date, time and number of threads -->
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="PARAM[@name='Soft_URL']/@value"/>
- </xsl:attribute>
- <b>
- <xsl:value-of select="PARAM[@name='Software']/@value"/> <xsl:value-of select="PARAM[@name='Version']/@value"/>
- </b>
- </a>
- started on
- <b><xsl:value-of select="PARAM[@name='Date']/@value"/></b>
- at
- <b><xsl:value-of select="PARAM[@name='Time']/@value"/></b>
- with
- <b><xsl:value-of select="PARAM[@name='NThreads']/@value"/></b>
- thread<xsl:if test="PARAM[@name='NThreads']/@value > 1">s</xsl:if>
-
-<!-- Run time -->
- <xsl:variable name="duration" select="PARAM[@name='Duration']/@value"/>
- (run time:
- <b>
- <xsl:choose>
- <xsl:when test="$duration > 3600.0">
- <xsl:value-of
- select='concat(string(floor($duration div 3600)),
- " h ", format-number(floor(($duration div 60) mod 60.0), "00"),
- " min")'/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="$duration > 60.0">
- <xsl:value-of
- select='concat(format-number(floor($duration div 60),"##"),
- " min ", format-number(floor($duration mod 60.0), "00")," s")'/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select='concat(string($duration), " s")'/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </b>)
- <br />
- by user <b><xsl:value-of select="PARAM[@name='User']/@value"/></b>
- from <b><xsl:value-of select="PARAM[@name='Host']/@value"/></b>
- in <b><mono><xsl:value-of select="PARAM[@name='Path']/@value"/></mono></b>
- </p>
- <p>
- <b style="color: red"><xsl:if test="PARAM[@name='Error_Msg']/@value > 0">
- An Error occured!!! </xsl:if>
- <xsl:value-of select="PARAM[@name='Error_Msg']/@value"/></b>
- </p>
- <p>
- <sans-serif><i>click to expand or hide tables</i></sans-serif>
- </p>
- </xsl:template>
-
-<!-- ******************** XSL template for Source List ******************** -->
- <xsl:template name="sources">
- <xsl:choose>
- <xsl:when test="DATA/TABLEDATA">
- <p>
- <BUTTON type="button" style="background:#CCEECC; font-family: sans-serif; font-weight: bold;" onclick="showhideTable('sources')">
- Source List
- </BUTTON>
- <TABLE id="sources" class="sortable" style="display: none">
- <TR>
- <xsl:for-each select="FIELD">
- <TH BGCOLOR="#FFEECC" align="center"><xsl:attribute name="title"><xsl:value-of select="DESCRIPTION"/></xsl:attribute>
- <xsl:value-of select="@name"/>
- <xsl:text disable-output-escaping="yes">
-
-
- </xsl:text>
- <xsl:value-of select="@unit"/>
- </TH>
- </xsl:for-each>
- </TR>
- <xsl:for-each select="DATA/TABLEDATA">
- <xsl:for-each select="TR">
- <tr>
- <xsl:for-each select="TD">
- <td align="right" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="self::TD"/></el>
- </td>
- </xsl:for-each>
- </tr>
- </xsl:for-each>
- </xsl:for-each>
- </TABLE>
- </p>
- </xsl:when>
- <xsl:otherwise>
- <p>
- <BUTTON type="button" style="background:#CCEECC; font-family: sans-serif; font-weight: bold;" onclick="showhideTable('catparam')">
- Parameter List
- </BUTTON>
- <TABLE id="catparam" class="sortable" style="display: none">
- <TR>
- <TH BGCOLOR="#FFEECC" align="center">Parameter Name</TH>
- <TH BGCOLOR="#FFEECC" align="center">Description</TH>
- </TR>
- <xsl:for-each select="FIELD">
- <tr>
- <td align="left" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="@name"/></el>
- </td>
- <td align="left" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="DESCRIPTION"/></el>
- </td>
- </tr>
- </xsl:for-each>
- </TABLE>
- </p>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-<!-- ******************* XSL template for Extension Data ****************** -->
- <xsl:template name="extdata">
- <xsl:variable name="extension" select="count(FIELD[@name='Extension']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="date" select="count(FIELD[@name='Date']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="time" select="count(FIELD[@name='Time']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="duration" select="count(FIELD[@name='Duration']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="ndet" select="count(FIELD[@name='NDetect']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="nsex" select="count(FIELD[@name='NSextracted']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="imid" select="count(FIELD[@name='Image_Ident']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="backmean" select="count(FIELD[@name='Background_Mean']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="backsig" select="count(FIELD[@name='Background_StDev']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="thresh" select="count(FIELD[@name='Threshold']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="wscale" select="count(FIELD[@name='Weight_Scaling']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="pixscale" select="count(FIELD[@name='Pixel_Scale']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="epoch" select="count(FIELD[@name='Epoch']/preceding-sibling::FIELD)+1"/>
- <p>
- <BUTTON type="button" style="background:#CCEECC; font-family: sans-serif; font-weight: bold;" onclick="showhideTable('extdata')">
- Summary Table on Output Catalog
- </BUTTON>
- <TABLE class="sortable" id="extdata" BORDER="2" style="display: none">
- <TR>
- <TH BGCOLOR="#FFEECC">Extension</TH>
- <TH BGCOLOR="#FFEECC">Date</TH>
- <TH BGCOLOR="#FFEECC">Time</TH>
- <TH BGCOLOR="#FFEECC">Duration</TH>
- <TH BGCOLOR="#FFEECC">Detected Source Number</TH>
- <TH BGCOLOR="#FFEECC">Sextracted Source Number</TH>
- <TH BGCOLOR="#FFEECC">Image ID</TH>
- <TH BGCOLOR="#FFEECC">Mean Background</TH>
- <TH BGCOLOR="#FFEECC">Sigma Background</TH>
- <TH BGCOLOR="#FFEECC">Detection Threshold</TH>
- <TH BGCOLOR="#FFEECC">Weight Scaling</TH>
- <TH BGCOLOR="#FFEECC">Pixel Scale</TH>
- <TH BGCOLOR="#FFEECC">Epoch</TH>
- </TR>
- <xsl:for-each select="DATA/TABLEDATA">
- <xsl:for-each select="TR">
- <tr>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$extension]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$date]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$time]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$duration]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$ndet]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$nsex]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$imid]"/></el>
- </td>
- <td align="right" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="format-number(TD[$backmean],'#####0.00')"/></el>
- </td>
- <td align="right" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="format-number(TD[$backsig],'###0.000')"/></el>
- </td>
- <td align="right" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="format-number(TD[$thresh],'#####0.00')"/></el>
- </td>
- <td align="right" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="format-number(TD[$wscale],'#####0.00')"/></el>
- </td>
- <td align="right" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="format-number(TD[$pixscale],'#0.000')"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$epoch]"/></el>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:for-each>
- </TABLE>
- </p>
- </xsl:template>
-
-<!-- ******************** XSL template for Config File ******************** -->
- <xsl:template name="Config">
- <p>
- <BUTTON type="button" style="background:#CCEECC; font-family: sans-serif; font-weight: bold;" onclick="showhideTable('config')">
- Configuration File: <xsl:value-of select="PARAM[@name='Prefs_Name']/@value"/>
- </BUTTON>
- <TABLE id="config" class="sortable" style="display: none">
- <TR>
- <TH BGCOLOR="#FFEECC">Config Parameter</TH>
- <TH BGCOLOR="#FFEECC">Value</TH>
- </TR>
- <xsl:for-each select="PARAM[position()>2]">
- <tr BGCOLOR="#EEEEEE">
- <td><el><xsl:value-of select="@name"/></el></td>
- <td><el><xsl:value-of select="@value"/></el></td>
- </tr>
- </xsl:for-each>
- </TABLE>
- </p>
- <p>
- <BUTTON type="button" style="background:#CCEECC; font-family: monospace; font-weight: bold: font-size: 80%;" onclick="showhideTable('commandline')">
- Command Line
- </BUTTON>
- <TABLE id="commandline" style="display: none">
- <TR>
- <TD BGCOLOR="#FFEECC" style="font-size: 80%;"><el>Command Line: <xsl:value-of select="PARAM[@name='Command_Line']/@value"/></el></TD>
- </TR>
- </TABLE>
- </p>
- </xsl:template>
-
-<!-- ********************** XSL template for Warnings ********************** -->
- <xsl:template name="Warnings">
- <xsl:variable name="date" select="count(FIELD[@name='Date']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="time" select="count(FIELD[@name='Time']/preceding-sibling::FIELD)+1"/>
- <xsl:variable name="msg" select="count(FIELD[@name='Msg']/preceding-sibling::FIELD)+1"/>
- <p>
- <BUTTON type="button" style="background:#CCEECC; font-family: monospace; font-weight: bold: font-size: 80%;" onclick="showhideTable('warnings')">
- Warnings (limited to the last 100)
- </BUTTON>
- <TABLE id="warnings" style="display: none">
- <TR style="font-size: 80%;">
- <TH BGCOLOR="#FFEECC">Date</TH>
- <TH BGCOLOR="#FFEECC">Time</TH>
- <TH BGCOLOR="#FFEECC">Message</TH>
- </TR>
- <xsl:for-each select="DATA/TABLEDATA">
- <xsl:for-each select="TR">
- <tr>
- <td BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$date]"/></el>
- </td>
- <td BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$time]"/></el>
- </td>
- <td align="center" BGCOLOR="#EEEEEE">
- <el><xsl:value-of select="TD[$msg]"/></el>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:for-each>
- </TABLE>
- </p>
- </xsl:template>
-
- <xsl:template name="Rest">
-</xsl:template>
-</xsl:stylesheet>