diff --git a/.cvsignore b/.cvsignore index 0182805..e4f7f8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.6.7.tar.gz +wcstools-3.6.8.tar.gz diff --git a/sources b/sources index a907d32..650cea6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -301be6880e514b7d66997375550fb708 wcstools-3.6.7.tar.gz +c48a173124360facf6b399da8d1f7422 wcstools-3.6.8.tar.gz diff --git a/wcstools.spec b/wcstools.spec index 6b84e63..05c47f9 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,5 +1,5 @@ Name: wcstools -Version: 3.6.7 +Version: 3.6.8 Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image @@ -82,6 +82,9 @@ This are the files needed to develop an application using libwcs. %changelog +* Mon Mar 19 2007 Sergio Pascual 3.6.8-1 +- New upstream source 3.6.8 +- Added pacthes to remove warnings during the compilation * Mon Feb 26 2007 Sergio Pascual 3.6.7-1 - New upstream source 3.6.7 * Wed Nov 15 2006 Sergio Pascual 3.6.6-1 diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch index a619358..35e79d0 100644 --- a/wcstools3-codewarn.patch +++ b/wcstools3-codewarn.patch @@ -29,7 +29,705 @@ diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c else lname = strlen (refcatname); - catname = (char *)calloc (lname + 16, 1); -+ catname = (char *)calloc (lname + 37, 1); ++ catname = (char *)calloc (lname + 37, sizeof(char)); if (lname > 0) sprintf (catname, "%s sources", refcatname); else +diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c +--- wcstools-3.6.8/bincat.c 2007-03-13 16:05:40.000000000 +0100 ++++ wcstools-3.6.8.new/bincat.c 2007-03-19 18:14:16.000000000 +0100 +@@ -90,7 +90,7 @@ + char *lastchar; + char filename[128]; + FILE *flist; +- char *listfile; ++ char *listfile = NULL; + char rastr[32], decstr[32]; + double x, y; + char cs1; +diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c +--- wcstools-3.6.8/crlf.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/crlf.c 2007-03-19 18:25:29.000000000 +0100 +@@ -99,7 +99,7 @@ + if (buffer[i] == (char) 13) + buffer[i] = (char) 10; + } +- (void) write (1, buffer, nbr); ++ write (1, buffer, nbr); + } + } + return; +Sólo en wcstools-3.6.8.new: debugfiles.list +Sólo en wcstools-3.6.8.new: debugsources.list +diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c +--- wcstools-3.6.8/delwcs.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/delwcs.c 2007-03-19 18:07:46.000000000 +0100 +@@ -114,7 +114,7 @@ + + { + char *header; /* FITS image header */ +- char *image; /* Image pixels */ ++ char *image = NULL; /* Image pixels */ + int lhead; /* Maximum number of bytes in FITS header */ + int nbhead; /* Actual number of bytes in FITS header */ + int iraffile; /* 1 if IRAF image */ +diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c +--- wcstools-3.6.8/edhead.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/edhead.c 2007-03-19 18:23:53.000000000 +0100 +@@ -210,8 +210,8 @@ + break; + } + nbytes = i + 1; +- (void) fwrite (headline, 1, nbytes, fd); +- (void) fwrite (newline, 1, 1, fd); ++ fwrite (headline, 1, nbytes, fd); ++ fwrite (newline, 1, 1, fd); + } + fclose (fd); + free (header); +diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c +--- wcstools-3.6.8/getcol.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/getcol.c 2007-03-19 18:25:09.000000000 +0100 +@@ -447,7 +447,7 @@ + nop++; + } + else +- printf (" Constants %s, %s, or operation %s illegal\n",sop1,sop2,opi[0]); ++ printf (" Constants %s, %s, or operation %c illegal\n",sop1,sop2,opi[0]); + } + + /* File to read */ +diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c +--- wcstools-3.6.8/getdate.c 2007-03-19 18:25:53.000000000 +0100 ++++ wcstools-3.6.8.new/getdate.c 2007-03-19 18:13:02.000000000 +0100 +@@ -409,7 +409,7 @@ + int year, vyear; + int lfd, oldfits; + char outform[16]; +- char *fitsdate, *newfdate, *stdate; ++ char *fitsdate = NULL, *newfdate, *stdate; + char temp[64]; + char fyear[16]; + char ts0[9]; +diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c +--- wcstools-3.6.8/getpix.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/getpix.c 2007-03-19 18:24:05.000000000 +0100 +@@ -68,7 +68,7 @@ + char *fn; + char *rrange; /* Row range string */ + char *crange; /* Column range string */ +- char *rstr; ++ char *rstr = NULL; + char *dstr = NULL; + char *cstr; + int systemp; +diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c +--- wcstools-3.6.8/gettab.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/gettab.c 2007-03-19 18:10:32.000000000 +0100 +@@ -559,7 +559,7 @@ + char *alias[]; /* Output names of keywords if different from input */ + + { +- char *str; ++ char *str = NULL; + char *cstr, *cval, cvalue[64]; + int pass = 0; + int drop; +diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c +--- wcstools-3.6.8/imfill.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/imfill.c 2007-03-19 18:13:20.000000000 +0100 +@@ -313,7 +313,7 @@ + int nfilled; + int nbadpix; + int i; +- char *irafheader; /* IRAF image header */ ++ char *irafheader = NULL; /* IRAF image header */ + char newname[256]; /* Name for revised image */ + char *ltime; + char *endchar; +diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c +--- wcstools-3.6.8/imsmooth.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/imsmooth.c 2007-03-19 18:13:39.000000000 +0100 +@@ -263,7 +263,7 @@ + char *ext = NULL; + char *newimage = NULL; + char *imext = NULL; +- char *imext1; ++ char *imext1 = NULL; + char *fname; + char extname[16]; + int lext = 0; +diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c +--- wcstools-3.6.8/imstack.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/imstack.c 2007-03-19 18:24:43.000000000 +0100 +@@ -194,7 +194,7 @@ + blanks = (char *) malloc ((size_t) nbytes); + for (i = 0; i < nbytes; i++) + blanks[i] = 0; +- (void) fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); ++ fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); + free (blanks); + } + } +@@ -449,7 +449,7 @@ + blanks = (char *) malloc ((size_t) nbytes); + for (i = 0; i < nbytes; i++) + blanks[i] = 0; +- (void) fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); ++ fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); + free (blanks); + } + } +diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c +--- wcstools-3.6.8/libwcs/binread.c 2007-03-19 18:25:53.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/binread.c 2007-03-19 18:22:34.000000000 +0100 +@@ -505,7 +505,7 @@ + struct Star *star; + char str[128]; + int nmag; +- int mrv; ++ int mrv = 0; + + nstar = 0; + starcat = binopen (bincat); +@@ -694,7 +694,7 @@ + int nmag; /* Real number of magnitudes per entry (- rv) */ + int jstar; + int nstar; +- double mag; ++ double mag = 0.; + double num; + int magsort; + int istar = 0; +diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c +--- wcstools-3.6.8/libwcs/fileutil.c 2007-01-11 22:57:29.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/fileutil.c 2007-03-19 18:23:34.000000000 +0100 +@@ -343,7 +343,7 @@ + /* If line can be read, add null at the end of the first token */ + if (fgets (token, ncmax, diskfile) != NULL) { + if (token[0] == '#') { +- (void) fgets (token, ncmax, diskfile); ++ fgets (token, ncmax, diskfile); + } + + /* If only character is a control character, return a NULL */ +diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c +--- wcstools-3.6.8/libwcs/findstar.c 2007-01-10 18:35:23.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/findstar.c 2007-03-19 17:51:55.000000000 +0100 +@@ -747,7 +747,7 @@ + double sd = 0.0; + int i; + int npix; +- double dnpix; ++ double dnpix = 0.; + double sum; + + pmin = -1.0e20; +diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c +--- wcstools-3.6.8/libwcs/gsc2read.c 2007-03-13 18:12:56.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/gsc2read.c 2007-03-19 18:21:39.000000000 +0100 +@@ -191,7 +191,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +@@ -294,7 +294,7 @@ + char *databuff; + char *lastbuff; + char *oldbuff; +- char *colhead, *colsep; ++ /*char *colhead, *colsep;*/ + int lhead, lbuff, i, j; + char ctab = (char) 9; + char ccom = ','; +diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c +--- wcstools-3.6.8/libwcs/gscread.c 2007-01-10 19:17:17.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/gscread.c 2007-03-19 18:14:55.000000000 +0100 +@@ -549,7 +549,7 @@ + int *gtype; /* Array of object types (returned) */ + int nlog; /* 1 for diagnostics */ + { +- char *table; /* FITS table */ ++ char *table = NULL; /* FITS table */ + char inpath[64]; /* Pathname for input FITS table file */ + char entry[100]; /* Buffer for FITS table row */ + int class; /* Object class (0>star, 3>other) */ +@@ -574,7 +574,7 @@ + double perr0 = 0.0; + double ra0 = 0.0; + double dec0 = 0.0; +- char *str; ++ char *str = NULL; + char *url; + + itot = 0; +@@ -795,7 +795,7 @@ + int rlist[100]; /* List of input FITS tables files */ + char inpath[64]; /* Pathname for input FITS table file */ + char entry[100]; /* Buffer for FITS table row */ +- int class, class0; /* Object class (0>star, 3>other) */ ++ int class = 0, class0 = 0; /* Object class (0>star, 3>other) */ + int sysref=WCS_J2000; /* Catalog coordinate system */ + double eqref=2000.0; /* Catalog equinox */ + struct Keyword kw[8]; /* Keyword structure */ +@@ -808,9 +808,9 @@ + int ik,nk,itable,ntable,jstar; + int nbline,npos,nbhead; + int nbr,nrmax,nstar,i; +- int ift, band0, band; +- double ra,ra0,rasum,dec,dec0,decsum,perr,perr0,perr2,perrsum,msum; +- double mag,mag0,merr,merr0,merr2,merrsum; ++ int ift, band0 = 0., band = 0.; ++ double ra,ra0 = 0.,rasum,dec,dec0 = 0.,decsum,perr,perr0 = 0.,perr2,perrsum,msum; ++ double mag,mag0 = 0.,merr,merr0 = 0.,merr2,merrsum; + double rra1, rra2, rdec1, rdec2; + double rdist, ddist; + char *str; +diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c +--- wcstools-3.6.8/libwcs/hput.c 2007-01-16 18:18:13.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/hput.c 2007-03-19 18:02:03.000000000 +0100 +@@ -273,7 +273,7 @@ + const char *cval; /* character string containing the value for variable + keyword. trailing and leading blanks are removed. */ + { +- int lroot, lcv, i, ii, nkw, lkw, lval; ++ int lroot = 0, lcv, i, ii, nkw, lkw, lval; + int comment = 0; + const char *v; + char keyroot[8], newkey[12], value[80]; +diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c +--- wcstools-3.6.8/libwcs/imhfile.c 2007-01-08 18:24:29.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imhfile.c 2007-03-19 18:23:06.000000000 +0100 +@@ -910,7 +910,7 @@ + + /* Write IRAF header to disk file */ + nbw = write (fd, irafheader, nbhead); +- (void) ftruncate (fd, nbhead); ++ ftruncate (fd, nbhead); + close (fd); + if (nbw < nbhead) { + (void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", +diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c +--- wcstools-3.6.8/libwcs/imsetwcs.c 2007-01-11 23:01:41.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imsetwcs.c 2007-03-19 17:51:28.000000000 +0100 +@@ -136,22 +136,22 @@ + int nmax; /* Maximum number of matches possible (nrg or nbs) */ + int lofld = 0; /* Length of object name field in output */ + double mag1,mag2; +- int refcat; /* reference catalog switch */ ++ int refcat = 0; /* reference catalog switch */ + int nmag, mprop; + double dxys; + char numstr[32]; + int minstars; +- int ngmax; ++ int ngmax = 0; + int nbin, nbytes; + int iterate, toliterate, nfiterate; +- int imag, magsort; ++ int imag, magsort = 0; + int niter = 0; + int recenter = recenter0; + int ret = 0; + int is, ig, igs, i, j; + char rstr[32], dstr[32]; + double refeq, refep; +- double maxnum; ++ double maxnum = 0.; + int nnfld; + int refsys; + char refcoor[8]; +diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c +--- wcstools-3.6.8/libwcs/imutil.c 2007-01-11 20:51:15.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imutil.c 2007-03-19 18:06:49.000000000 +0100 +@@ -164,7 +164,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int bitpixb; /* Number of bits per pixel in bad pixel file */ +@@ -217,7 +217,7 @@ + if (*bb++) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -236,7 +236,7 @@ + if (*bb++) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -263,7 +263,7 @@ + if (*bb++) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -282,7 +282,7 @@ + if (*bb++) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -310,7 +310,7 @@ + if (*bb++) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -329,7 +329,7 @@ + if (*bb++) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -355,7 +355,7 @@ + if (*bb++) { + *b2++ = bpval; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -374,7 +374,7 @@ + if (*bb++) { + *b2++ = bpval; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -407,7 +407,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int checkmin = 0; +@@ -450,12 +450,12 @@ + if (checkmin && *bb < mnvali2) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvali2) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -482,12 +482,12 @@ + if (checkmin && *bb < mnvali4) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvali4) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -514,12 +514,12 @@ + if (checkmin && *bb < mnvalr4) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvalr4) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -546,12 +546,12 @@ + if (checkmin && *bb < mnvalr8) { + *b2++ = bpvalr8; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvalr8) { + *b2++ = bpvalr8; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -589,7 +589,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute median */ ++int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -698,7 +698,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute median */ ++int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1173,7 +1173,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1278,7 +1278,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1651,7 +1651,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +- int ix,iy; /* Pixel around which to compute median */ ++ int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1752,7 +1752,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute median */ ++int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c +--- wcstools-3.6.8/libwcs/proj.c 2006-06-20 22:08:00.000000000 +0200 ++++ wcstools-3.6.8.new/libwcs/proj.c 2007-03-19 18:04:58.000000000 +0100 +@@ -3672,7 +3672,7 @@ + + { + int face; +- double cthe, eta, l, m, n, rho, xi; ++ double cthe, eta = 0., l, m, n, rho, xi = 0.; + const float tol = 1.0e-7; + + float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2; +diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c +--- wcstools-3.6.8/libwcs/sdssread.c 2007-01-10 19:24:44.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/sdssread.c 2007-03-19 18:21:55.000000000 +0100 +@@ -165,7 +165,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c +--- wcstools-3.6.8/libwcs/tabread.c 2007-03-13 18:20:27.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/tabread.c 2007-03-19 18:22:23.000000000 +0100 +@@ -778,7 +778,7 @@ + int nstar; + int imag; + double ra,dec, rapm, decpm; +- double mag, parallax, rv; ++ double mag = 0., parallax, rv; + double num; + int peak; + int istar, nstars, lstar; +@@ -2149,7 +2149,7 @@ + tabtable->lline = (nextline - tabtable->tabdata) * 2; + tabtable->tabline = (char *) calloc (tabtable->lline, 1); + fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); +- (void) fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); ++ fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); + lline = strlen (tabtable->tabline); + if (tabtable->tabline[lline-1] < 32) + tabtable->tabline[lline-1] = (char) 0; +@@ -2231,7 +2231,7 @@ + fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); + tabtable->iline = 0; + for (i = tabtable->iline; i < iline; i++) { +- (void) fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); ++ fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); + tabtable->iline++; + } + lline = strlen (tabtable->tabline); +diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c +--- wcstools-3.6.8/libwcs/tmcread.c 2007-01-10 19:09:43.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/tmcread.c 2007-03-19 17:57:35.000000000 +0100 +@@ -529,7 +529,7 @@ + int sysref=WCS_J2000; /* Catalog coordinate system */ + double eqref=2000.0; /* Catalog equinox */ + double epref=2000.0; /* Catalog epoch */ +- struct StarCat *starcat; ++ struct StarCat *starcat = NULL; + struct Star *star; + char *str; + +diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c +--- wcstools-3.6.8/libwcs/wcsinit.c 2007-03-13 22:46:18.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/wcsinit.c 2007-03-19 17:56:56.000000000 +0100 +@@ -1072,7 +1072,7 @@ + static void + wcseq (hstring, wcs) + +-char *hstring; /* character string containing FITS header information ++const char *hstring; /* character string containing FITS header information + in the format = [/ ] */ + struct WorldCoor *wcs; /* World coordinate system data structure */ + { +@@ -1086,7 +1086,7 @@ + static void + wcseqm (hstring, wcs, mchar) + +-char *hstring; /* character string containing FITS header information ++const char *hstring; /* character string containing FITS header information + in the format = [/ ] */ + struct WorldCoor *wcs; /* World coordinate system data structure */ + char *mchar; /* Suffix character for one of multiple WCS */ +diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c +--- wcstools-3.6.8/libwcs/webread.c 2007-03-13 16:53:08.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/webread.c 2007-03-19 18:21:16.000000000 +0100 +@@ -248,7 +248,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +@@ -374,7 +374,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +@@ -572,7 +572,7 @@ + fflush(sok); + free (server); + +- (void) fscanf(sok, "%*s %d %*s\r\n", &status); ++ fscanf(sok, "%*s %d %*s\r\n", &status); + + /* Skip continue lines + if (status == 100) { +@@ -606,7 +606,7 @@ + lline = 1; + *lbuff = 0; + while (lline > 0) { +- (void) fgets (linebuff, LINE, sok); ++ fgets (linebuff, LINE, sok); + lline = strlen (linebuff); + if (lline < 1) + break; +@@ -642,7 +642,7 @@ + else { + buff = tabbuff + lcbuff; + } +- (void) fread (buff, 1, lchunk, sok); ++ fread (buff, 1, lchunk, sok); + buff[lchunk] = (char) 0; + if (diag) + fprintf (stderr, "%s\n", buff); +diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c +--- wcstools-3.6.8/scat.c 2007-03-13 17:47:10.000000000 +0100 ++++ wcstools-3.6.8.new/scat.c 2007-03-19 18:08:13.000000000 +0100 +@@ -1101,7 +1101,7 @@ + double crao, cdeco; /* Output center long/lat or RA/Dec in degrees */ + double epout = 0.0; + int ng; /* Number of catalog stars */ +- int ns; /* Number of brightest catalog stars actually used */ ++ int ns = 0; /* Number of brightest catalog stars actually used */ + struct Range *range = NULL; /* Range of catalog numbers to list */ + int nfind; /* Number of stars to find */ + int i, is, j, ngmax, nc; +@@ -1122,7 +1122,7 @@ + int nlog; + int magsort; + int typecol; +- int band; ++ int band = 0; + int imag, nmagr; + int sysout = 0; + char sortletter = (char) 0; +diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c +--- wcstools-3.6.8/setpix.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/setpix.c 2007-03-19 18:09:13.000000000 +0100 +@@ -258,9 +258,9 @@ + int lhead; /* Maximum number of bytes in FITS header */ + int nbhead; /* Actual number of bytes in FITS header */ + int iraffile; /* 1 if IRAF image */ +- char *irafheader; /* IRAF image header */ ++ char *irafheader = NULL; /* IRAF image header */ + int i, lext, lroot; +- int nx, ny, ix, iy, x, y, ipix; ++ int nx, ny, ix, iy, x, y, ipix = 0; + char *imext, *imext1; + double bzero; /* Zero point for pixel scaling */ + double bscale; /* Scale factor for pixel scaling */ +diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c +--- wcstools-3.6.8/wcshead.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/wcshead.c 2007-03-19 18:09:34.000000000 +0100 +@@ -211,7 +211,7 @@ + char *GetFITShead(); + char rastr[32], decstr[32], fform[8]; + struct WorldCoor *wcs, *GetWCSFITS(); +- double wfrst, dwl, wlast, dxpix, zvel, vel; ++ double wfrst, dwl, wlast, dxpix, zvel = 0., vel; + int logwav = 0; + + if (rootdir){ diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index ef5ff24..17e0694 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -1,14 +1,6 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile --- wcstools-3.6.7.old/libwcs/Makefile 2007-01-10 20:26:36.000000000 +0100 +++ wcstools-3.6.7/libwcs/Makefile 2007-02-26 15:42:32.000000000 +0100 -@@ -1,5 +1,5 @@ --CFLAGS= -g --CC= cc -Wall -+ -+ - - OBJS = imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \ - fitswcs.o wcsinit.o wcs.o ty2read.o webread.o tmcread.o \ @@ -11,10 +11,18 @@ sortstar.o platefit.o iget.o fileutil.o \ wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o @@ -34,20 +26,16 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile clean: - rm -f *.a *.o + rm -f *.a *.o *.so* ---- wcstools-3.6.7.old/Makefile 2007-01-10 20:38:20.000000000 +0100 -+++ wcstools-3.6.7/Makefile 2007-02-26 15:55:19.000000000 +0100 -@@ -1,7 +1,7 @@ --CFLAGS= -g --CC= cc -Wall +--- wcstools-3.6.8.old/Makefile 2007-02-28 21:44:24.000000000 +0100 ++++ wcstools-3.6.8/Makefile 2007-03-19 17:36:28.000000000 +0100 +@@ -1,6 +1,6 @@ + CFLAGS= -g + CC= cc -LIBWCS = libwcs/libwcs.a --LIBS = $(LIBWCS) -lm -+#CFLAGS= -g -+#CC= cc -Wall +LIBWCS = libwcs/libwcs.so -+LIBS = -L./libwcs -lwcs -lm + LIBS = $(LIBWCS) -lm #CATLIBS = $(LIBS) -lnsl -lsocket CATLIBS = $(LIBS) - BIN = bin @@ -19,10 +19,10 @@ $(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS) @@ -87,3 +75,61 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile clean: - make objclean; make binclean + $(MAKE) objclean; $(MAKE) binclean +diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c +--- wcstools-3.6.8/libwcs/imhfile.c 2007-03-19 18:26:41.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imhfile.c 2007-03-19 18:40:26.000000000 +0100 +@@ -1036,11 +1036,11 @@ + int len; + char *newpixname; + +- newpixname = (char *) calloc (SZ_IM2PIXFILE, 1); ++ newpixname = (char *) calloc (SZ_IM2PIXFILE + 1, sizeof(char)); + + /* Pixel file is in same directory as header */ + if (strncmp(pixname, "HDR$", 4) == 0 ) { +- (void)strncpy (newpixname, hdrname, SZ_IM2PIXFILE); ++ strncpy (newpixname, hdrname, SZ_IM2PIXFILE); + + /* find the end of the pathname */ + len = strlen (newpixname); +@@ -1053,7 +1053,7 @@ + + /* add name */ + newpixname[len] = '\0'; +- (void)strncat (newpixname, &pixname[4], SZ_IM2PIXFILE); ++ strncat (newpixname, &pixname[4], SZ_IM2PIXFILE); + } + + /* Bare pixel file with no path is assumed to be same as HDR$filename */ +Sólo en wcstools-3.6.8/libwcs: imhfile.o +Sólo en wcstools-3.6.8/libwcs: imio.o +Sólo en wcstools-3.6.8/libwcs: imrotate.o +Sólo en wcstools-3.6.8/libwcs: imsetwcs.o +Sólo en wcstools-3.6.8/libwcs: imutil.o +Sólo en wcstools-3.6.8/libwcs: libwcs.a +Sólo en wcstools-3.6.8/libwcs: libwcs.so +Sólo en wcstools-3.6.8/libwcs: libwcs.so.3 +Sólo en wcstools-3.6.8/libwcs: libwcs.so.3.0.0 +Sólo en wcstools-3.6.8/libwcs: lin.o +Sólo en wcstools-3.6.8/libwcs: matchstar.o +Sólo en wcstools-3.6.8/libwcs: platefit.o +Sólo en wcstools-3.6.8/libwcs: platepos.o +Sólo en wcstools-3.6.8/libwcs: proj.o +Sólo en wcstools-3.6.8/libwcs: sdssread.o +Sólo en wcstools-3.6.8/libwcs: sortstar.o +Sólo en wcstools-3.6.8/libwcs: sph.o +Sólo en wcstools-3.6.8/libwcs: tabread.o +Sólo en wcstools-3.6.8/libwcs: tmcread.o +Sólo en wcstools-3.6.8/libwcs: tnxpos.o +Sólo en wcstools-3.6.8/libwcs: ty2read.o +Sólo en wcstools-3.6.8/libwcs: uacread.o +Sólo en wcstools-3.6.8/libwcs: ubcread.o +Sólo en wcstools-3.6.8/libwcs: ucacread.o +Sólo en wcstools-3.6.8/libwcs: ujcread.o +Sólo en wcstools-3.6.8/libwcs: wcscon.o +Sólo en wcstools-3.6.8/libwcs: wcsinit.o +Sólo en wcstools-3.6.8/libwcs: wcslib.o +Sólo en wcstools-3.6.8/libwcs: wcs.o +Sólo en wcstools-3.6.8/libwcs: wcstrig.o +Sólo en wcstools-3.6.8/libwcs: webread.o +Sólo en wcstools-3.6.8/libwcs: worldpos.o