Ticket #25413: cfitsio-dist.diff

cfitsio/cfileio.c

@@ -2647 +2647 @@
     char *cptr, keyname[FLEN_KEYWORD], card[FLEN_CARD];
     int ii, tstatus, anynull;
     long minrow, maxrow, minslice, maxslice, mincube, maxcube;
-    long iii, jjj, kkk, firstpix;
+    long firstpix;
+    long ncubeiter, nsliceiter, nrowiter, kiter, jiter, iiter;
     int klen, kk, jj;
     long outnaxes[9], outsize, buffsize;
     double *buffer, crpix, cdelt;
@@ -2843 +2844 @@
 
     minrow = fpixels[1];
     maxrow = lpixels[1];
+    if (minrow > maxrow) {
+        nrowiter = (minrow - maxrow + incs[1]) / incs[1];
+    } else {
+        nrowiter = (maxrow - minrow + incs[1]) / incs[1];
+    }
+
     minslice = fpixels[2];
     maxslice = lpixels[2];
+    if (minslice > maxslice) {
+        nsliceiter = (minslice - maxslice + incs[2]) / incs[2];
+    } else {
+        nsliceiter = (maxslice - minslice + incs[2]) / incs[2];
+    }
+
     mincube = fpixels[3];
     maxcube = lpixels[3];
-    
+    if (mincube > maxcube) {
+        ncubeiter = (mincube - maxcube + incs[3]) / incs[3];
+    } else {
+        ncubeiter = (maxcube - mincube + incs[3]) / incs[3];
+    }
+
     firstpix = 1;
-    for (kkk = mincube; kkk <= maxcube; kkk += incs[3])
+    for (kiter = 0; kiter < ncubeiter; kiter++)
     {
-      fpixels[3] = kkk;
-      lpixels[3] = kkk;
-      for (jjj = minslice; jjj <= maxslice; jjj += incs[2])
+      if (mincube > maxcube) {
+         fpixels[3] = mincube - (kiter * incs[3]);
+      } else {
+         fpixels[3] = mincube + (kiter * incs[3]);
+      }
+      
+      lpixels[3] = fpixels[3];
+
+      for (jiter = 0; jiter < nsliceiter; jiter++)
       {
-        fpixels[2] = jjj;
-        lpixels[2] = jjj;
-        for (iii = minrow; iii <= maxrow; iii += incs[1])
+        if (minslice > maxslice) {
+            fpixels[2] = minslice - (jiter * incs[2]);
+        } else {
+            fpixels[2] = minslice + (jiter * incs[2]);
+        }
+
+        lpixels[2] = fpixels[2];
+
+        for (iiter = 0; iiter < nrowiter; iiter++)
         {
-            fpixels[1] = iii;
-            lpixels[1] = iii;
+            if (minrow > maxrow) {
+               fpixels[1] = minrow - (iiter * incs[1]);
+            } else {
+               fpixels[1] = minrow + (iiter * incs[1]);
+            }
+
+            lpixels[1] = fpixels[1];
 
             if (bitpix == 8)
             {

cfitsio/changes.txt

@@ -2 +2 @@
 
 Version 3.25 - 9 June 2010
 
+   - fixed bug that was introduced in version 3.13 that broke the ability
+     to reverse an image section along the y-axis with an image section
+     specifier like this: myimage.fits[*,-*].  This bug caused the output
+     image to be filled with zeros.
+
    - fixed typo in the definition of the ftgprh Fortran wrapper routine
      in f77_wrap3.c.
 
    - modified the cfitsio.pc.in configuration file to make the lib path
-     a variable, instead of hard coding the path.   The provides more
+     a variable instead of hard coding the path.   The provides more
      flexibility for projects such as suse and fedora when building CFITSIO.
 
    - fixed bug in imcomp_compress_tile in imcompress.c which caused