Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/camera/pmFPARead.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPARead.c (modified) (5 diffs)

branches/simtest_nebulous_branches/psModules/src/camera/pmFPARead.c

@@ -296 +296 @@
                         psFits *fits,    // FITS file
                         int z,          // Plane number to read
-                        int *zMax,      // Max plane number in this cell
+                        int *zMax,      // Max plane number in this cell
                         int numScans,   // Number of scans to read at a time
                         fpaReadType type, // Type of image
@@ -314 +314 @@
         return true;
       } else {
-        return false;
+        return false;
       }
     }
@@ -387 +387 @@
                 psFree(regionString);
                 psFree(readout);
+                psFree(iter);
                 return false;
             }
@@ -485 +486 @@
                              psFits *fits, // FITS file
                              int z,     // Desired image plane
-                             int *zMax, // Max plane number in this cell
+                             int *zMax, // Max plane number in this cell
                              int numScans, // Number of scans (row or col depends on CELL.READDIR); 0 for all
                              int overlap, // Number of scans (row/col) to overlap between scans
@@ -627 +628 @@
     // Blow away existing data.
     // Do this before returning, so that we're not returning data from a previous read
-    psFree(*image);
-    *image = NULL;
+//    psFree(*image);
+//    *image = NULL;
     *image = readoutReadComponent(*image, fits, trimsec, readdir, thisScan, lastScan, z, bad, pixelTypes[type]);