Changeset 34088 for trunk/Ohana/src/libdvo

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

Files:

• ImageOps.c (modified) (3 diffs)
• coordops.c (modified) (2 diffs)
• dbCmdlineFields.c (modified) (1 diff)
• dbRPN.c (modified) (2 diffs)
• dvo_image.c (modified) (1 diff)
• dvo_tiny_values.c (modified) (2 diffs)
• skyregion_gsc.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/src/ImageOps.c

@@ -8 +8 @@
 {
 
-  int j, flipped, status, InPic;
+  int j, flipped, status;
   off_t i, n, *subset;
   int npts;
@@ -65 +65 @@
       x[2] = image[i].NX; y[2] = image[i].NY;
       x[3] = 0;           y[3] = image[i].NY;
-      InPic = flipped = FALSE;
+      flipped = FALSE;
       for (j = 0; j < 4; j++) {
         XY_to_RD (&r, &d, x[j], y[j], &image[i].coords);
@@ -95 +95 @@
       x[2] = image[i].NX; y[2] = image[i].NY;
       x[3] = 0;           y[3] = image[i].NY;
-      InPic = flipped = FALSE;
+      flipped = FALSE;
       for (j = 0; j < 4; j++) {
         XY_to_RD (&r, &d, x[j], y[j], &image[i].coords);

trunk/Ohana/src/libdvo/src/coordops.c

@@ -68 +68 @@
   mode = GetProjectionMode (proj);
   if (proj == PROJ_NONE) return (FALSE);
-  if (proj == PROJ_MODE_NONE) return (FALSE);
+  if (mode == PROJ_MODE_NONE) return (FALSE);
 
   stht = ctht = 1;
@@ -201 +201 @@
   mode = GetProjectionMode (proj);
   if (proj == PROJ_NONE) return (FALSE);
-  if (proj == PROJ_MODE_NONE) return (FALSE);
+  if (mode == PROJ_MODE_NONE) return (FALSE);
 
   /**** Locally Cartesian Projections ****/

trunk/Ohana/src/libdvo/src/dbCmdlineFields.c

@@ -136 +136 @@
     // XXX the ra and dec range depend on the projection. 
     // XXX this is wrong...
-    int status;
-    status = XY_to_RD (&Rmin, &Dmin, graphsky.xmin, graphsky.ymin, &graphsky.coords);
-    status = XY_to_RD (&Rmax, &Dmax, graphsky.xmax, graphsky.ymax, &graphsky.coords);
+    // int status;
+    XY_to_RD (&Rmin, &Dmin, graphsky.xmin, graphsky.ymin, &graphsky.coords);
+    XY_to_RD (&Rmax, &Dmax, graphsky.xmax, graphsky.ymax, &graphsky.coords);
   }
 

trunk/Ohana/src/libdvo/src/dbRPN.c

@@ -4 +4 @@
 dbStack *dbRPN (int argc, char **argv, int *nstack) {
   
-  int type, Nx, Ny;
+  int type;
   int i, j, Nstack, Nop_stack, NSTACK;
   dbStack *stack, *op_stack;
@@ -17 +17 @@
   }
   
-  Nx = Ny = Nstack = Nop_stack = 0;
+  Nstack = Nop_stack = 0;
   for (i = 0; i < argc; i++) {
     

trunk/Ohana/src/libdvo/src/dvo_image.c

@@ -111 +111 @@
       exit (2);
   }
-  return (TRUE);
+  return (status);
 }
 

trunk/Ohana/src/libdvo/src/dvo_tiny_values.c

@@ -51 +51 @@
 
     for (i = 0; i < catalog[0].Naverage; i++) {
-      CopyAverageToTiny (&catalog[0].averageT[i], &catalog[0].average[i]);
+      CopyAverageToTiny (&averageT[i], &average[i]);
     }
   }
@@ -61 +61 @@
 
     for (i = 0; i < catalog[0].Nmeasure; i++) {
-      CopyMeasureToTiny (&catalog[0].measureT[i], &catalog[0].measure[i]);
+      CopyMeasureToTiny (&measureT[i], &measure[i]);
     }
   }

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -271 +271 @@
   int i, j, Nz, NZ, Nregions, poleRegion;
   SkyRegion *regions;
-  SkyRegion tempregion;
   SkyRegionZone *zones;
   char basename[64];
@@ -294 +293 @@
       poleRegion = SIGN(regions[i].Dmin);
       Nregions --;
-      tempregion = regions[i];
       for (j = i; j < Nregions; j++) {
         regions[j] = regions[j+1];