Changeset 9998

Timestamp:

Nov 14, 2006, 4:50:24 PM (19 years ago)

Author:

Paul Price

Message:

Fixing case where numScans == 0.

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPARead.c

@@ -261 +261 @@
         if (readdir == 1) {
             // Reading rows
+            if (numScans == 0) {
+                numScans = naxis2 - readout->row0;
+            }
             readout->row0 += readout->image->numRows;
             offset = readout->row0;
-            if (numScans == 0) {
-                numScans = naxis2 - offset;
-            }
         } else {
             // Reading columns
+            if (numScans == 0) {
+                numScans = naxis1 - readout->col0;
+            }
             readout->col0 += readout->image->numCols;
             offset = readout->col0;
-            if (numScans == 0) {
-                numScans = naxis1 - offset;
-            }
+        }
+    } else {
+        if (numScans == 0) {
+            if (readdir == 1) {
+                numScans = naxis2;
+            } else
+                numScans = naxis1;
         }
     }