Changeset 34088 for trunk/Ohana/src/getstar

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/getstar/src

Files:

• GetFileMode.c (modified) (1 diff)
• ReadImageFiles.c (modified) (1 diff)
• edge_check.c (modified) (2 diffs)
• select_by_region.c (modified) (2 diffs)

trunk/Ohana/src/getstar/src/GetFileMode.c

@@ -14 +14 @@
   gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);
     
-  if ((Naxis == 2) || !simple) {
-    if (!strcmp (&ctype[4], "-WRP")) {
+  if (haveNaxis && ((Naxis == 2) || !simple)) {
+    if (haveCTYPE && !strcmp (&ctype[4], "-WRP")) {
       return MOSAIC_CMP;
     }

trunk/Ohana/src/getstar/src/ReadImageFiles.c

@@ -1 +1 @@
 # include "dvoImageOverlaps.h"
-# define DVO_IMAGE_NAME_LEN 128
 
 Image *ReadImageFiles (char *filename, off_t *Nimages) {

trunk/Ohana/src/getstar/src/edge_check.c

@@ -4 +4 @@
 
   double theta1, theta2;
-  double Theta1, Theta2;
 
   theta1 = opening_angle (x1[0], y1[0], x2[0], y2[0], x1[1], y1[1]); 
@@ -17 +16 @@
   }
 
-  Theta1 = theta1;
-  Theta2 = theta2;
   theta1 = opening_angle (x2[0], y2[0], x1[1], y1[1], x2[1], y2[1]); 
   theta2 = opening_angle (x2[0], y2[0], x1[1], y1[1], x1[0], y1[0]); 

trunk/Ohana/src/getstar/src/select_by_region.c

@@ -4 +4 @@
 int select_by_region (Catalog *output, Catalog *catalog, SkyRegion *region, int start, int end) {
 
-  int i, j, Nm, offset, m, Nsecfilt, code, Nsec;
+  int i, j, offset, m, Nsecfilt, code, Nsec;
   int Nave, NAVE, Nmeas, NMEAS, needMeas;
   double R, D, AREA;
@@ -140 +140 @@
     }
 
-    Nm = 0;
-    offset = catalog[0].average[i].measureOffset;
-
     if (needMeas) {
+      offset = catalog[0].average[i].measureOffset;
       for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
         output[0].measure[Nmeas] = catalog[0].measure[offset + j];