Merge pull request #44 from astromatic/cfitsio (c7bf6799) · Commits · csst-pipeline / msc / sextractor

configure.ac

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		#
		# This file part of: SExtractor
		#
		# Copyright: (C) 2002-2022 IAP/CNRS/SorbonneU
		# Copyright: (C) 2002-2023 IAP/CNRS/SorbonneU
		#
		# License: GNU General Public License
		#
		@@ -22,7 +22,7 @@
		# You should have received a copy of the GNU General Public License
		# along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
		#
		# Last modified: 16/09/2022
		# Last modified: 26/02/2023
		#
		#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
		define([AC_CACHE_SAVE],)

		# This is your standard AstrOmatic source code...
		AC_INIT([SExtractor],[2.27.0],[astromatic@astromatic.iap.fr],
		AC_INIT([SExtractor],[2.27.1],[astromatic@astromatic.iap.fr],
		[sextractor],[http://astromatic.net/software/sextractor])
		AC_CONFIG_MACRO_DIR([m4])
		AC_CONFIG_AUX_DIR(autoconf)

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ language = None
		# There are two options for replacing \|today\|: either, you set today to some
		# non-false value, then it is used:
		#
		today = 'Fri Sep 16 2022'
		today = 'Sat Feb 25 2023'
		#
		# Else, today_fmt is used as the format for a strftime call.
		#

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2020 IAP/CNRS/SorbonneU
		* Copyright: (C) 1993-2023 CFHT/IAP/CNRS/SorbonneU
		*
		* License: GNU General Public License
		*
		@@ -22,7 +22,7 @@
		* You should have received a copy of the GNU General Public License
		* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
		*
		* Last modified: 15/07/2020
		* Last modified: 26/02/2023
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -1086,6 +1086,7 @@ void reendcat()
		QFTELL(fitscat->file, pos, fitscat->filename);
		QFSEEK(fitscat->file, tab->headpos, SEEK_SET, fitscat->filename);
		save_tab(fitscat, tab);
		remove_tab(fitscat, "LDAC_IMHEAD", 0);
		QFSEEK(fitscat->file, pos, SEEK_SET, fitscat->filename);
		break;

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2013 Emmanuel Bertin -- IAP/CNRS/UPMC
		* Copyright: (C) 1993-2023 CFHT/IAP/CNRS/SorbonneU
		*
		* License: GNU General Public License
		*
		@@ -22,7 +22,7 @@
		* You should have received a copy of the GNU General Public License
		* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
		*
		* Last modified: 23/09/2013
		* Last modified: 25/02/2023
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -406,6 +406,7 @@ void reinitcheck(picstruct field, checkstruct check)
		remove_tabs(cat);
		copy_tab_fromptr(field->tab, cat, 0);
		tab = cat->tab;
		decomp_head(tab);
		tab->cat = cat;
		if (check->next<=1)
		prim_head(tab);

+9 −15

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2020 IAP/CNRS/SorbonneU
		* Copyright: (C) 1993-2023 CFHT/IAP/CNRS/SorbonneU
		*
		* License: GNU General Public License
		*
		@@ -22,7 +22,7 @@
		* You should have received a copy of the GNU General Public License
		* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
		*
		* Last modified: 23/09/2020
		* Last modified: 25/02/2023
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -70,25 +70,19 @@ picstruct newfield(char filename, int flags, int ext)
		field->cat = cat;
		nok = 0;
		tab = cat->tab;
		#ifdef HAVE_CFITSIO
		if (tab->isTileCompressed)
		nok++;
		#endif
		if (tab->naxis >= 2
		if ((tab->isTileCompressed) \|\|
		(tab->naxis >= 2
		&& strncmp(tab->xtension, "BINTABLE", 8)
		&& strncmp(tab->xtension, "ASCTABLE", 8))
		&& strncmp(tab->xtension, "ASCTABLE", 8)))
		nok++;
		ext2 = ext;
		for (ntab=cat->ntab; ext2-- && ntab--;)
		{
		tab=tab->nexttab;
		#ifdef HAVE_CFITSIO
		if (tab->isTileCompressed)
		nok++;
		#endif
		if (tab->naxis >= 2
		if ((tab->isTileCompressed) \|\|
		(tab->naxis >= 2
		&& strncmp(tab->xtension, "BINTABLE", 8)
		&& strncmp(tab->xtension, "ASCTABLE", 8))
		&& strncmp(tab->xtension, "ASCTABLE", 8)))
		nok++;
		}
		if (!nok)