Changeset 21065 for trunk/Ohana

Timestamp:

Dec 30, 2008, 10:18:22 AM (18 years ago)

Author:

eugene

Message:

fixed a couple of bugs related to box bounds

File:

• trunk/Ohana/src/opihi/dvo/imbox.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/imbox.c

@@ -49 +49 @@
     // XXX currently, image uses an unsigned short for NX,XY. this is rather restrictive
     // and needs to be at least checked.
-    haveNx = gfits_scan (&header, "NAXIS1",   "%d", 1, &Nx);
-    haveNy = gfits_scan (&header, "NAXIS2",   "%d", 1, &Ny);
-
-    if (!haveNx && !haveNy) {
-        haveNx = gfits_scan (&header, "IMNAXIS1",   "%d", 1, &Nx);
-        haveNy = gfits_scan (&header, "IMNAXIS2",   "%d", 1, &Ny);
-    }
+    haveNx = gfits_scan (&header, "IMNAXIS1",   "%d", 1, &Nx);
+    haveNy = gfits_scan (&header, "IMNAXIS2",   "%d", 1, &Ny);
 
     if (!haveNx && !haveNy) {
         haveNx = gfits_scan (&header, "ZNAXIS1",   "%d", 1, &Nx);
         haveNy = gfits_scan (&header, "ZNAXIS2",   "%d", 1, &Ny);
+    }
+
+    if (!haveNx && !haveNy) {
+        haveNx = gfits_scan (&header, "NAXIS1",   "%d", 1, &Nx);
+        haveNy = gfits_scan (&header, "NAXIS2",   "%d", 1, &Ny);
     }
 
@@ -69 +69 @@
     x[0] = 0;  y[0] = 0;
     x[1] = Nx; y[1] = 0;
-    x[2] = Ny; y[2] = Ny;
+    x[2] = Nx; y[2] = Ny;
     x[3] = 0;  y[3] = Ny;
     status = FALSE;