Changeset 34088 for trunk/Ohana/src/libfits

Timestamp:

Jun 26, 2012, 11:46:01 AM (14 years ago)

Author:

eugene

Message:

updates for pedantic gcc, mods to relphot average mags to handle GPC1 stacks

Location:

trunk/Ohana/src/libfits

Files:

• Makefile (modified) (1 diff)
• extern/fits_hdecompress.c (modified) (4 diffs)
• extern/ricecomp.c (modified) (12 diffs)
• matrix/F_compress_M.c (modified) (3 diffs)
• table/F_copy_T.c (modified) (2 diffs)

trunk/Ohana/src/libfits/Makefile

@@ -16 +16 @@
 
 # programs may add their own internal requirements here
-FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC -Wall -Werror
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
 FULL_CPPFLAGS = $(BASE_CPPFLAGS) -I$(EXT)
 FULL_LDFLAGS  = $(BASE_LDFLAGS) -lohana

trunk/Ohana/src/libfits/extern/fits_hdecompress.c

@@ -1048 +1048 @@
 {
 LONGLONG sumall;
-int nel, stat;
+int stat;
 unsigned char nbitplanes[3];
 char tmagic[2];
@@ -1071 +1071 @@
         *scale=readint(infile);                         /* scale factor for digitization        */
         
-        nel = (*nx) * (*ny);
+        // nel = (*nx) * (*ny);
 
         /* sum of all pixels    */
@@ -1095 +1095 @@
 */
 {
-int nel, stat;
+int stat;
 LONGLONG sumall;
 unsigned char nbitplanes[3];
@@ -1119 +1119 @@
         *scale=readint(infile);                         /* scale factor for digitization        */
         
-        nel = (*nx) * (*ny);
+        // nel = (*nx) * (*ny);
 
         /* sum of all pixels    */

trunk/Ohana/src/libfits/extern/ricecomp.c

@@ -59 +59 @@
 {
 Buffer bufmem, *buffer = &bufmem;
-int bsize, i, j, thisblock;
+int i, j, thisblock;
 int lastpix, nextpix, pdiff;
 int v, fs, fsmask, top, fsmax, fsbits, bbits;
@@ -73 +73 @@
      * compression of short & byte images.
      */
-    bsize = 4;
+// int bsize = 4;
 
 /*    nblock = 32; now an input parameter*/
@@ -277 +277 @@
 {
 Buffer bufmem, *buffer = &bufmem;
-int bsize, i, j, thisblock;
+int i, j, thisblock;
 
 /* 
@@ -299 +299 @@
      * compression of short & byte images.
      */
-    bsize = 2;
+// bsize = 2;
 
 /*    nblock = 32; now an input parameter */
@@ -501 +501 @@
 {
 Buffer bufmem, *buffer = &bufmem;
-int bsize, i, j, thisblock;
+int i, j, thisblock;
 
 /* 
@@ -523 +523 @@
      * compression of short & byte images.
      */
-    bsize = 1;
+    // bsize = 1;
 
 /*    nblock = 32; now an input parameter */
@@ -826 +826 @@
              int nblock)                /* coding block size            */
 {
-int bsize, i, k, imax;
+int i, k, imax;
 int nbits, nzero, fs;
 unsigned char *cend, bytevalue;
@@ -839 +839 @@
      * compression of short & byte images.
      */
-    bsize = 4;
+// bsize = 4;
 
 /*    nblock = 32; now an input parameter */
@@ -1014 +1014 @@
 {
 int i, imax;
-int bsize, k;
+int k;
 int nbits, nzero, fs;
 unsigned char *cend, bytevalue;
@@ -1028 +1028 @@
      */
 
-    bsize = 2;
+// bsize = 2;
     
 /*    nblock = 32; now an input parameter */
@@ -1200 +1200 @@
 {
 int i, imax;
-int bsize, k;
+int k;
 int nbits, nzero, fs;
 unsigned char *cend;
@@ -1214 +1214 @@
      */
 
-    bsize = 1;
+// bsize = 1;
     
 /*    nblock = 32; now an input parameter */

trunk/Ohana/src/libfits/matrix/F_compress_M.c

@@ -45 +45 @@
   float zscale, zzero;
 
-  int zdata_pixsize, odata_pixsize, idata_pixsize;
+  int zdata_pixsize, odata_pixsize;
 
   int *ztile = NULL;
@@ -236 +236 @@
   zdata_pixsize = gfits_vartable_heap_pixsize (zdef.format);
 
-  // size of a pixel in the final image
-  idata_pixsize = abs(header[0].bitpix) / 8;
+  // size of a pixel in the final image (not needed)
+  // idata_pixsize = abs(header[0].bitpix) / 8;
 
   // size of a pixel in the output from the decompression routine
@@ -480 +480 @@
 int gfits_compressed_is_primary (Header *header) {
 
-    int has_ztension, has_zimage;
-    int ztension, zimage;
-
-    has_zimage   = gfits_scan_alt (header, "ZIMAGE",   "%t", 1, &zimage);
-    has_ztension = gfits_scan_alt (header, "ZTENSION", "%t", 1, &ztension);
+  int zimage = FALSE;
+  // int ztension = FALSE;
+
+    int has_zimage   = gfits_scan_alt (header, "ZIMAGE",   "%t", 1, &zimage);
+    // int has_ztension = gfits_scan_alt (header, "ZTENSION", "%t", 1, &ztension);
 
     if (has_zimage && zimage) return (TRUE);

trunk/Ohana/src/libfits/table/F_copy_T.c

@@ -17 +17 @@
 int gfits_copy_vtable (VTable *in, VTable *out) {
 
-  off_t i, Nx, Ny, Nrows;
+  off_t i;
 
   /* find buffer size */
-  Nx = in[0].header[0].Naxis[0];
-  Ny = in[0].header[0].Naxis[1];
+  off_t Nx = in[0].header[0].Naxis[0];
+  // off_t Ny = in[0].header[0].Naxis[1];
 
   // validate these two?
@@ -32 +32 @@
   out[0].Nrow     = in[0].Nrow;
 
-  Nrows = out[0].Nrow;
+  off_t Nrows = out[0].Nrow;
 
   ALLOCATE (out[0].row, off_t, MAX (Nrows, 1));