Skip to content
GitLab
Commit a3ce8c8a authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed errors with gcc -fno-common option.

parent 75b9de5a
Show whitespace changes
Inline Side-by-side
doc/src/conf.py
View file @ a3ce8c8a
...@@ -67,9 +67,9 @@ author = u'E. Bertin' ...@@ -67,9 +67,9 @@ author = u'E. Bertin'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.25.1' version = '2.25.2'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
...@@ -81,7 +81,7 @@ language = None ...@@ -81,7 +81,7 @@ language = None
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # 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. # 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()] ...@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# The name for this set of Sphinx documents. # The name for this set of Sphinx documents.
# "<project> v<release> documentation" by default. # "<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. # A shorter title for the navigation bar. Default is the same as html_title.
# #
......
src/catout.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * 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 @@ ...@@ -45,12 +45,18 @@
#include "sexheadsc.h" #include "sexheadsc.h"
#include "xml.h" #include "xml.h"
objstruct outobj, flagobj;
obj2struct outobj2, flagobj2;
catstruct *fitscat; catstruct *fitscat;
tabstruct *objtab = NULL; tabstruct *objtab = NULL;
FILE *ascfile; FILE *ascfile;
char *buf; char *buf;
int catopen_flag = 0; int catopen_flag = 0;
double ddummy;
int idummy;
/******************************* readcatparams *******************************/ /******************************* readcatparams *******************************/
/* /*
Read the catalog config file Read the catalog config file
......
src/clean.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * 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 @@ ...@@ -46,6 +46,7 @@
static LONG *cleanvictim; static LONG *cleanvictim;
objliststruct *cleanobjlist;
/******************************* initclean ********************************** /******************************* initclean **********************************
PROTO void initclean(void) PROTO void initclean(void)
......
src/clean.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * 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 @@ ...@@ -33,7 +33,7 @@
/*------------------------------- variables ---------------------------------*/ /*------------------------------- variables ---------------------------------*/
objliststruct *cleanobjlist; /* laconic, isn't it? */ extern objliststruct *cleanobjlist;
/*------------------------------- functions ---------------------------------*/ /*------------------------------- functions ---------------------------------*/
......
src/extract.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * 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; ...@@ -47,6 +47,7 @@ static char *marker;
static status *psstack; static status *psstack;
static int *start, *end, *discan, xmin,ymin,xmax,ymax; static int *start, *end, *discan, xmin,ymin,xmax,ymax;
PIXTYPE *dumscan;
/******************************* lutzalloc ***********************************/ /******************************* lutzalloc ***********************************/
/* /*
......
src/extract.h
View file @ a3ce8c8a
...@@ -37,7 +37,7 @@ typedef enum {COMPLETE, INCOMPLETE, NONOBJECT, OBJECT} ...@@ -37,7 +37,7 @@ typedef enum {COMPLETE, INCOMPLETE, NONOBJECT, OBJECT}
status; /* Extraction status */ status; /* Extraction status */
/*--------------------------------- variables -------------------------------*/ /*--------------------------------- variables -------------------------------*/
PIXTYPE *dumscan; extern PIXTYPE *dumscan;
/*------------------------------- structures --------------------------------*/ /*------------------------------- structures --------------------------------*/
/* Temporary object parameters during extraction */ /* Temporary object parameters during extraction */
......
src/filter.c
View file @ a3ce8c8a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
#include "filter.h" #include "filter.h"
#include "image.h" #include "image.h"
filterstruct *thefilter;
/******************************** convolve ***********************************/ /******************************** convolve ***********************************/
/* /*
Convolve a scan line with an array. Convolve a scan line with an array.
......
src/filter.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -43,7 +43,7 @@ typedef struct structfilter ...@@ -43,7 +43,7 @@ typedef struct structfilter
struct structbpann *bpann; struct structbpann *bpann;
} filterstruct; } filterstruct;
filterstruct *thefilter; extern filterstruct *thefilter;
/*------------------------------- functions ---------------------------------*/ /*------------------------------- functions ---------------------------------*/
void convolve(picstruct *, PIXTYPE *, int y), void convolve(picstruct *, PIXTYPE *, int y),
......
src/fits/fitscat.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: AstrOmatic FITS/LDAC library * This file part of: AstrOmatic FITS/LDAC library
* *
* Copyright: (C) 1995-2012 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1995-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* along with AstrOmatic software. * along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 29/08/2012 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include "fitscat_defs.h" #include "fitscat_defs.h"
#include "fitscat.h" #include "fitscat.h"
char fits_str[MAXCHAR];
/****** about_cat ************************************************************** /****** about_cat **************************************************************
PROTO int about_cat(catstruct *cat, FILE *stream) PROTO int about_cat(catstruct *cat, FILE *stream)
PURPOSE Print some info about a catalog. PURPOSE Print some info about a catalog.
......
src/fits/fitscat_defs.h
View file @ a3ce8c8a
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* along with AstrOmatic software. * along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/02/2020 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -86,7 +86,7 @@ typedef unsigned char BYTE; /* a byte */ ...@@ -86,7 +86,7 @@ typedef unsigned char BYTE; /* a byte */
typedef int LONG; /* for DEC-Alpha... */ typedef int LONG; /* for DEC-Alpha... */
/*----------------------------- Internal constants --------------------------*/ /*----------------------------- Internal constants --------------------------*/
char gstr[MAXCHAR]; extern char fits_str[MAXCHAR];
/*----------------------------- External constants --------------------------*/ /*----------------------------- External constants --------------------------*/
...@@ -124,30 +124,30 @@ char gstr[MAXCHAR]; ...@@ -124,30 +124,30 @@ char gstr[MAXCHAR];
#define QCALLOC(ptr, typ, nel) \ #define QCALLOC(ptr, typ, nel) \
{if (!(ptr = (typ *)calloc((size_t)(nel),sizeof(typ)))) \ {if (!(ptr = (typ *)calloc((size_t)(nel),sizeof(typ)))) \
{ \ { \
sprintf(gstr, #ptr " (" #nel "=%lld elements) " \ sprintf(fits_str, #ptr " (" #nel "=%zd elements) " \
"at line %d in module " __FILE__ " !", \ "at line %d in module " __FILE__ " !", \
(size_t)(nel)*sizeof(typ), __LINE__); \ (size_t)(nel)*sizeof(typ), __LINE__); \
error(EXIT_FAILURE, "Could not allocate memory for ", gstr);\ error(EXIT_FAILURE, "Could not allocate memory for ", fits_str);\
}; \ }; \
} }
#define QMALLOC(ptr, typ, nel) \ #define QMALLOC(ptr, typ, nel) \
{if (!(ptr = (typ *)malloc((size_t)(nel)*sizeof(typ)))) \ {if (!(ptr = (typ *)malloc((size_t)(nel)*sizeof(typ)))) \
{ \ { \
sprintf(gstr, #ptr " (" #nel "=%lld elements) " \ sprintf(fits_str, #ptr " (" #nel "=%zd elements) " \
"at line %d in module " __FILE__ " !", \ "at line %d in module " __FILE__ " !", \
(size_t)(nel)*sizeof(typ), __LINE__); \ (size_t)(nel)*sizeof(typ), __LINE__); \
error(EXIT_FAILURE, "Could not allocate memory for ", gstr);\ error(EXIT_FAILURE, "Could not allocate memory for ", fits_str);\
}; \ }; \
} }
#define QREALLOC(ptr, typ, nel) \ #define QREALLOC(ptr, typ, nel) \
{if (!(ptr = (typ *)realloc(ptr, (size_t)(nel)*sizeof(typ))))\ {if (!(ptr = (typ *)realloc(ptr, (size_t)(nel)*sizeof(typ))))\
{ \ { \
sprintf(gstr, #ptr " (" #nel "=%lld elements) " \ sprintf(fits_str, #ptr " (" #nel "=%zd elements) " \
"at line %d in module " __FILE__ " !", \ "at line %d in module " __FILE__ " !", \
(size_t)(nel)*sizeof(typ), __LINE__); \ (size_t)(nel)*sizeof(typ), __LINE__); \
error(EXIT_FAILURE, "Could not allocate memory for ", gstr);\ error(EXIT_FAILURE, "Could not allocate memory for ", fits_str);\
}; \ }; \
} }
...@@ -155,10 +155,10 @@ char gstr[MAXCHAR]; ...@@ -155,10 +155,10 @@ char gstr[MAXCHAR];
{if (ptrin) \ {if (ptrin) \
{if (!(ptrout = (typ *)malloc((size_t)(nel)*sizeof(typ)))) \ {if (!(ptrout = (typ *)malloc((size_t)(nel)*sizeof(typ)))) \
{ \ { \
sprintf(gstr, #ptrout " (" #nel "=%lld elements) " \ sprintf(fits_str, #ptrout " (" #nel "=%zd elements) " \
"at line %d in module " __FILE__ " !", \ "at line %d in module " __FILE__ " !", \
(size_t)(nel)*sizeof(typ), __LINE__); \ (size_t)(nel)*sizeof(typ), __LINE__); \
error(EXIT_FAILURE,"Could not allocate memory for ",gstr);\ error(EXIT_FAILURE,"Could not allocate memory for ",fits_str);\
}; \ }; \
memcpy(ptrout, ptrin, (size_t)(nel)*sizeof(typ)); \ memcpy(ptrout, ptrin, (size_t)(nel)*sizeof(typ)); \
}; \ }; \
......
src/globals.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 12/09/2013 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -30,13 +30,11 @@ ...@@ -30,13 +30,11 @@
/*----------------------- miscellaneous variables ---------------------------*/ /*----------------------- miscellaneous variables ---------------------------*/
sexcatstruct thecat; extern sexcatstruct thecat;
picstruct thefield1,thefield2, thewfield1,thewfield2; extern picstruct thefield1,thefield2, thewfield1,thewfield2;
objstruct flagobj; extern objstruct flagobj, outobj;
obj2struct flagobj2; extern obj2struct flagobj2, outobj2;
extern obj2struct outobj2; extern char gstr[MAXCHAR];
float ctg[37], stg[37];
char gstr[MAXCHAR];
/*------------------------------- functions ---------------------------------*/ /*------------------------------- functions ---------------------------------*/
extern void alloccatparams(void), extern void alloccatparams(void),
......
src/graph.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "globals.h" #include "globals.h"
double sexx1, sexy1; double sexx1, sexy1;
float ctg[37], stg[37];
/********************************* sexmove **********************************/ /********************************* sexmove **********************************/
/* /*
......
src/key.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: AstrOmatic software * This file part of: AstrOmatic software
* *
* Copyright: (C) 1993-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1993-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* along with AstrOmatic software. * along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 10/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -51,5 +51,5 @@ typedef struct ...@@ -51,5 +51,5 @@ typedef struct
/*---------------------------------- protos --------------------------------*/ /*---------------------------------- protos --------------------------------*/
int findkeys(char *str, char key[][32], int mode); extern int findkeys(char *str, char key[][32], int mode);
src/makeit.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 21/01/2015 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include "xml.h" #include "xml.h"
static int selectext(char *filename); static int selectext(char *filename);
time_t thetimet, thetimet2; time_t thetimet, thetimet2;
#ifdef USE_MODEL #ifdef USE_MODEL
extern profitstruct *theprofit,*thedprofit, *thepprofit,*theqprofit; extern profitstruct *theprofit,*thedprofit, *thepprofit,*theqprofit;
...@@ -63,7 +64,12 @@ extern profitstruct *theprofit,*thedprofit, *thepprofit,*theqprofit; ...@@ -63,7 +64,12 @@ extern profitstruct *theprofit,*thedprofit, *thepprofit,*theqprofit;
profitstruct *theprofit,*thedprofit, *thepprofit,*theqprofit; profitstruct *theprofit,*thedprofit, *thepprofit,*theqprofit;
#endif #endif
extern char profname[][32]; extern char profname[][32];
double dtime; extern float ctg[37], stg[37];
sexcatstruct thecat;
picstruct thefield1,thefield2, thewfield1,thewfield2;
char gstr[MAXCHAR];
/******************************** makeit *************************************/ /******************************** makeit *************************************/
/* /*
...@@ -80,6 +86,7 @@ void makeit() ...@@ -80,6 +86,7 @@ void makeit()
patternstruct *pattern; patternstruct *pattern;
static time_t thetime1, thetime2; static time_t thetime1, thetime2;
struct tm *tm; struct tm *tm;
double dtime;
unsigned int modeltype; unsigned int modeltype;
int nflag[MAXFLAG], nparam2[2], int nflag[MAXFLAG], nparam2[2],
i, nok, ntab, next, ntabmax, forcextflag, i, nok, ntab, next, ntabmax, forcextflag,
......
src/param.h
View file @ a3ce8c8a
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
objstruct outobj; extern objstruct outobj;
obj2struct outobj2; extern obj2struct outobj2;
/*--------------------------------- initialization --------------------------*/ /*--------------------------------- initialization --------------------------*/
keystruct objkey[] = { keystruct objkey[] = {
......
src/plist.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -38,6 +38,13 @@ ...@@ -38,6 +38,13 @@
#include "prefs.h" #include "prefs.h"
#include "plist.h" #include "plist.h"
int plistexist_value, plistexist_dvalue, plistexist_cdvalue,
plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
plistexist_dgeo,
plistoff_value, plistoff_dvalue, plistoff_cdvalue,
plistoff_flag[MAXFLAG], plistoff_wflag, plistoff_dthresh, plistoff_var,
plistoff_dgeox, plistoff_dgeoy, plistsize;
/******************************** createblank ******************************* /******************************** createblank *******************************
PROTO int createblank(int no, objliststruct *objlist) PROTO int createblank(int no, objliststruct *objlist)
......
src/plist.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 14/01/2015 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -47,7 +47,7 @@ typedef struct ...@@ -47,7 +47,7 @@ typedef struct
/*-------------------------------- globals ----------------------------------*/ /*-------------------------------- globals ----------------------------------*/
int plistexist_value, plistexist_dvalue, plistexist_cdvalue, extern int plistexist_value, plistexist_dvalue, plistexist_cdvalue,
plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var, plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
plistexist_dgeo, plistexist_dgeo,
plistoff_value, plistoff_dvalue, plistoff_cdvalue, plistoff_value, plistoff_dvalue, plistoff_cdvalue,
......
src/preflist.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * 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 * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 12/01/2015 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#endif #endif
/*-------------------------------- initialization ---------------------------*/ /*-------------------------------- initialization ---------------------------*/
int idummy; extern int idummy;
pkeystruct key[] = pkeystruct key[] =
{ {
......
src/prefs.c
View file @ a3ce8c8a
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 19/02/2020 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -56,6 +56,9 @@ ...@@ -56,6 +56,9 @@
#include "preflist.h" #include "preflist.h"
#include "fits/fitscat.h" #include "fits/fitscat.h"
int findkeys(char *str, char key[][32], int mode);
prefstruct prefs;
/********************************* dumpprefs ********************************/ /********************************* dumpprefs ********************************/
/* /*
......
src/prefs.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1993-2018 IAP/CNRS/UPMC * Copyright: (C) 1993-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 09/01/2018 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -254,7 +254,7 @@ typedef struct ...@@ -254,7 +254,7 @@ typedef struct
int nthreads; /* Number of active threads */ int nthreads; /* Number of active threads */
} prefstruct; } prefstruct;
prefstruct prefs; extern prefstruct prefs;
/*-------------------------------- protos -----------------------------------*/ /*-------------------------------- protos -----------------------------------*/
extern int cistrcmp(char *cs, char *ct, int mode); extern int cistrcmp(char *cs, char *ct, int mode);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment