Changeset 34088 for trunk/Ohana/src/kapa2/src/bDrawImage.c

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

File:

• trunk/Ohana/src/kapa2/src/bDrawImage.c (modified) (4 diffs)

trunk/Ohana/src/kapa2/src/bDrawImage.c

@@ -11 +11 @@
   int i_start, i_end, j_start, j_end;
   int I_start, J_start;
-  int dropback;  /* this is a bit of a kludge... */
-  int dx, dy, DX, DY, inDX, inDY, Xs, Ys;
+  // int dropback;  /* this is a bit of a kludge... */
+  int dx, dy, DX, inDX, inDY, Xs, Ys;
   int expand_in, expand_out;
-  double expand, Ix, Iy;
+  double Ix, Iy;
   unsigned char *out_pix;
   unsigned short *in_pix, *in_pix_ref;
@@ -35 +35 @@
 
   assert ((image[0].picture.expand >= 1) || (image[0].picture.expand <= -2));
-  expand = expand_in = expand_out = 1.0;
+  expand_in = expand_out = 1.0;
   if (image[0].picture.expand > 0) {
-    expand = 1 / (1.0*image[0].picture.expand);
     expand_out = image[0].picture.expand;
     expand_in  = 1;
   }
   if (image[0].picture.expand < 0) {
-    expand = fabs((double)image[0].picture.expand);
     expand_out = 1;
     expand_in  = -image[0].picture.expand;
@@ -53 +51 @@
   dy = image[0].picture.dy;
   DX = image[0].image[0].matrix.Naxis[0];
-  DY = image[0].image[0].matrix.Naxis[1];
+  // int DY = image[0].image[0].matrix.Naxis[1];
 
   // the created buffer is supposed to contain the output windows
@@ -82 +80 @@
   inDY = image[0].picture.flipy ? -1 : +1;
 
-  dropback = expand_out - (i_end - i_start) % expand_out;
-  if ((i_end - i_start) % expand_out == 0) dropback = 0;
+  // dropback = expand_out - (i_end - i_start) % expand_out;
+  // if ((i_end - i_start) % expand_out == 0) dropback = 0;
 
   ALLOCATE (line_buffer, bDrawColor, 3*dx);