Changeset 17419 for branches/ipp-2-5/Ohana/src/opihi/dvo/dbExtractMeasures.c

Timestamp:

Apr 9, 2008, 12:15:16 PM (18 years ago)

Author:

eugene

Message:

updates to fix compile errors caught by Wall, Werror

File:

• branches/ipp-2-5/Ohana/src/opihi/dvo/dbExtractMeasures.c (modified) (5 diffs)

branches/ipp-2-5/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -76 +76 @@
   double ra, dec, x, y, dT;
 
-  Image *image;
   Coords *mosaic;
   PhotCode *equiv;
@@ -132 +131 @@
             break;
           }
-          Nsec = GetPhotcodeNsec (equiv);
+          Nsec = GetPhotcodeNsec (equiv->code);
           if (Nsec == -1) break;
           value = secfilt[Nsec].Ncode;
@@ -141 +140 @@
             break;
           }
-          Nsec = GetPhotcodeNsec (equiv);
+          Nsec = GetPhotcodeNsec (equiv->code);
           if (Nsec == -1) break;
           value = secfilt[Nsec].Nused;
@@ -317 +316 @@
       value = measure[0].Xccd;
 # else
-      ra  = average[0].R - measure[0].dR / 3600.0;
-      dec = average[0].D - measure[0].dD / 3600.0;
-      image = MatchImage (measure[0].t, measure[0].photcode);
-      if (image == NULL) break;
-      RD_to_XY (&x, &y, ra, dec, &image[0].coords);
-      value = x;
+      { 
+        Image *image;
+        ra  = average[0].R - measure[0].dR / 3600.0;
+        dec = average[0].D - measure[0].dD / 3600.0;
+        image = MatchImage (measure[0].t, measure[0].photcode);
+        if (image == NULL) break;
+        RD_to_XY (&x, &y, ra, dec, &image[0].coords);
+        value = x;
+      }
 # endif
       break;
@@ -330 +332 @@
       value = measure[0].Yccd;
 # else
-      ra  = average[0].R - measure[0].dR / 3600.0;
-      dec = average[0].D - measure[0].dD / 3600.0;
-      image = MatchImage (measure[0].t, measure[0].photcode);
-      if (image == NULL) break;
-      RD_to_XY (&x, &y, ra, dec, &image[0].coords);
-      value = y;
+      {
+        Image *image;
+        ra  = average[0].R - measure[0].dR / 3600.0;
+        dec = average[0].D - measure[0].dD / 3600.0;
+        image = MatchImage (measure[0].t, measure[0].photcode);
+        if (image == NULL) break;
+        RD_to_XY (&x, &y, ra, dec, &image[0].coords);
+        value = y;
+      }
 # endif
       break;