Ticket #25773: stealth.diff

cfileio.c

@@ -6688 +6688 @@
            for (ii = 1; ii <= nkeys; ii++)   /* copy keywords */
            {
               ffgrec(tptr,  ii, card, status);
+
+              /* must reset the PCOUNT keyword to zero in the new output file */
+              if (strncmp(card, "PCOUNT  ",8) == 0) { /* the PCOUNT keyword? */
+                 if (strncmp(card+25, "    0", 5)) {  /* non-zero value? */
+                    strncpy(card, "PCOUNT  =                    0", 30);
+                 }
+              }   
+ 
               ffprec(fptr, card, status);
            }
 

drvrnet.c

@@ -996 +996 @@
     } 
   } else {
     /* Try the .gz one */
-/*
     strcpy(newfilename,filename);
     strcat(newfilename,".gz");
     alarm(NETTIMEOUT);
@@ -1007 +1006 @@
       strcat(newfilename,".Z");
       alarm(NETTIMEOUT);
       if (ftp_open_network(newfilename,&ftpfile,&command,&sock)) {
-*/      
+        
         /* Now as given */
         alarm(0);
         strcpy(newfilename,filename);
@@ -1018 +1017 @@
           ffpmsg(newfilename);
           goto error;
         }
- /*
       }
     }
-*/
   }
 
   closeftpfile++;
@@ -1587 +1584 @@
     fclose(*command);
     return (FILE_NOT_OPENED);
   }
-
-printf("Return: %s",recbuf);
   
   /*  Passive mode response looks like
       227 Entering Passive Mode (129,194,67,8,210,80) */
@@ -1711 +1706 @@
    int sock;
    int stat;
    int val = 1;
-
-printf("connecting to %s on port %d\n", hostname,port);
-
+ 
    CreateSocketAddress(&sockaddr,hostname,port);
    /* Create socket */
    if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -1776 +1769 @@
 #ifdef DEBUG
    printf ("send raw end, sent %d bytes\n",n);
 #endif
-
-     printf ("sent:   %s", buf);
-
-
    return n;
 }
 
@@ -1803 +1792 @@
       else if (nrecv == 0)
         break;        /*/ EOF */
    }
-     printf ("NET_RecvRaw received %d bytes: %s",length, buf);
 
    return n;
 }
@@ -2121 +2109 @@
 #ifdef DEBUG
     printf("ftp_status, return string was %s\n",recbuf);
 #endif
-    printf("Return: %s",recbuf);
 
     recbuf[len] = '\0'; /* make it short */
     if (!strcmp(recbuf,statusstr)) {

region.c

@@ -5 +5 @@
 #include <ctype.h>
 #include "fitsio2.h"
 #include "region.h"
+static int Pt_in_Poly( double x, double y, int nPts, double *Pts );
 
 /*---------------------------------------------------------------------------*/
 int fits_read_rgnfile( const char *filename,

region.h

@@ -78 +78 @@
 void fits_setup_shape ( RgnShape *shape);
 int fits_read_fits_region ( fitsfile *fptr, WCSdata * wcs, SAORegion **Rgn, int *status);
 int fits_read_ascii_region ( const char *filename, WCSdata * wcs, SAORegion **Rgn, int *status);
-static int Pt_in_Poly( double x, double y, int nPts, double *Pts );