Fixed errors with gcc -fno-common option. (a3ce8c8a) · Commits · csst-pipeline / msc / sextractor

doc/src/conf.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -67,9 +67,9 @@ author = u'E. Bertin'
		# built documents.
		#
		# The short X.Y version.
		version = '2.25.1'
		version = '2.25.2'
		# The full version, including alpha/beta/rc tags.
		release = '2.25.1'
		release = '2.25.2'

		# The language for content autogenerated by Sphinx. Refer to documentation
		# for a list of supported languages.
		@@ -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 = 'Wed Feb 19 2020'
		today = 'Wed Aug 12 2020'
		#
		# Else, today_fmt is used as the format for a strftime call.
		#
		@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
		# The name for this set of Sphinx documents.
		# "<project> v<release> documentation" by default.
		#
		# html_title = u'SExtractor v2.25.1'
		# html_title = u'SExtractor v2.25.2'

		# A shorter title for the navigation bar. Default is the same as html_title.
		#

+8 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2015 Emmanuel Bertin -- IAP/CNRS/UPMC
		* Copyright: (C) 1993-2020 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: 26/01/2015
		* Last modified: 15/07/2020
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -45,12 +45,18 @@
		#include "sexheadsc.h"
		#include "xml.h"

		objstruct outobj, flagobj;
		obj2struct outobj2, flagobj2;

		catstruct *fitscat;
		tabstruct *objtab = NULL;
		FILE *ascfile;
		char *buf;
		int catopen_flag = 0;

		double ddummy;
		int idummy;

		/***************************** readcatparams *****************************/
		/*
		Read the catalog config file

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
		* Copyright: (C) 1993-2020 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: 11/10/2010
		* Last modified: 15/07/2020
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -46,6 +46,7 @@

		static LONG *cleanvictim;

		objliststruct *cleanobjlist;

		/***************************** initclean ********************************
		PROTO void initclean(void)

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
		* Copyright: (C) 1993-2020 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: 11/10/2010
		* Last modified: 15/07/2020
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -33,7 +33,7 @@

		/------------------------------- variables ---------------------------------/

		objliststruct cleanobjlist; / laconic, isn't it? */
		extern objliststruct *cleanobjlist;

		/------------------------------- functions ---------------------------------/

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*
		* This file part of: SExtractor
		*
		* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC
		* Copyright: (C) 1993-2020 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: 11/10/2010
		* Last modified: 15/07/2020
		*
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%/

		@@ -47,6 +47,7 @@ static char *marker;
		static status *psstack;
		static int start, end, *discan, xmin,ymin,xmax,ymax;

		PIXTYPE *dumscan;

		/***************************** lutzalloc *********************************/
		/*