Changeset 19011

Timestamp:

Aug 11, 2008, 2:20:41 PM (18 years ago)

Author:

Paul Price

Message:

Call to readoutHaveMoreScans had parameters around the wrong way.

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -46 +46 @@
 // Return pointer to appropriate value for tracking scans
 static int readoutGetThisScan(pmReadout *readout, // Readout of interest
-                              fpaReadType type // Type of image
+                              fpaReadType type // Type of image
     )
 {
@@ -63 +63 @@
 // Return pointer to appropriate value for tracking scans
 static int readoutSetLastScan(pmReadout *readout, // Readout of interest
-                              fpaReadType type,   // Type of image
-                              int numScans        // requested number of scans
+                              fpaReadType type,   // Type of image
+                              int numScans        // requested number of scans
     )
 {
@@ -70 +70 @@
       case FPA_READ_TYPE_IMAGE:
         readout->lastImageScan = readout->thisImageScan + numScans;
-        return readout->lastImageScan;
+        return readout->lastImageScan;
       case FPA_READ_TYPE_MASK:
         readout->lastMaskScan = readout->thisMaskScan + numScans;
-        return readout->lastMaskScan;
+        return readout->lastMaskScan;
       case FPA_READ_TYPE_WEIGHT:
         readout->lastWeightScan = readout->thisWeightScan + numScans;
-        return readout->lastWeightScan;
+        return readout->lastWeightScan;
       default:
         psAbort("Unknown read type: %x\n", type);
@@ -159 +159 @@
 // beyond the end?  Requires that cellNumReadouts() has been called before (for header and
 // concepts to have been read) In the process, adjusts the TRIMSEC
-static bool readoutHaveMoreScans(bool *result,   // true : more data to read 
-                             pmReadout *readout, // Readout of interest
-                             int numScans, // Number of scans to read at a time
-                             fpaReadType type, // Type of image
-                             pmConfig *config // Configuration
-    )
+static bool readoutHaveMoreScans(bool *result,   // true : more data to read
+                                 pmReadout *readout, // Readout of interest
+                                 int numScans, // Number of scans to read at a time
+                                 fpaReadType type, // Type of image
+                                 pmConfig *config // Configuration
+                                 )
 {
     assert(result);
@@ -215 +215 @@
     // Calculate the segment offset and upper limit
     if (numScans == 0) {
-        // in the case of numScans == 0, we never call this funtion unless the data has not yet 
-        // been read.  thus, only if the delta is  should we return false (ie, trimsec defines an empty region)
+        // in the case of numScans == 0, we never call this funtion unless the data has not yet
+        // been read.  thus, only if the delta is  should we return false (ie, trimsec defines an empty region)
         int thisScan = (readdir == 1) ? trimsec->y0 : trimsec->x0;
-        int lastScan = (readdir == 1) ? trimsec->y1 : trimsec->x1;
-        *result = (lastScan > thisScan);
-        return true;
-    } 
+        int lastScan = (readdir == 1) ? trimsec->y1 : trimsec->x1;
+        *result = (lastScan > thisScan);
+        return true;
+    }
 
     // allow multiple threads to read different segments into different readouts
@@ -249 +249 @@
 
     // XXX this may not be the valid test in a multithread environment. consider a fileGroup of
-    // N readouts, but numScans set to 0.  only the first should report that it requires data, 
+    // N readouts, but numScans set to 0.  only the first should report that it requires data,
     // even if all readouts lack the image pointer.
     if (!image) {
         return true;
-    } 
+    }
 
     // If we have already read an image, this result implies we are done (no more to read)
@@ -459 +459 @@
 
     bool haveData;
-    if (!readoutHaveMoreScans (&haveData, readout, type, numScans, config)) {
+    if (!readoutHaveMoreScans(&haveData, readout, numScans, type, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine readout properties.");
         return false;