Changeset 7382 for trunk/psModules/src/camera/pmFPARead.c

Timestamp:

Jun 6, 2006, 5:27:52 PM (20 years ago)

Author:

Paul Price

Message:

Moving additional pslib functions over to psLib proper. Some API changes.

File:

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

trunk/psModules/src/camera/pmFPARead.c

@@ -8 +8 @@
 #include "pmHDUUtils.h"
 #include "pmConcepts.h"
-#include "psRegionIsBad.h"
 #include "pmFPAHeader.h"
 
@@ -33 +32 @@
 
     // The image corresponding to the trim region
-    if (psRegionIsBad(*trimsec)) {
+    if (psRegionIsNaN(*trimsec)) {
         psString regionString = psRegionToString(*trimsec);
         psError(PS_ERR_UNKNOWN, true, "Invalid trim section: %s\n", regionString);
@@ -59 +58 @@
     psRegion *biassec = NULL;       // A BIASSEC region from the list
     while ((biassec = psListGetAndIncrement(iter))) {
-        if (psRegionIsBad(*biassec)) {
+        if (psRegionIsNaN(*biassec)) {
             psString regionString = psRegionToString(*biassec);
             psError(PS_ERR_IO, true, "Invalid bias section: %s\n", regionString);
@@ -190 +189 @@
     bool mdok = true;                   // Status of MD lookup
     psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim sections
-    if (!mdok || !trimsec || psRegionIsBad(*trimsec)) {
+    if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) {
         psError(PS_ERR_IO, true, "CELL.TRIMSEC is not set.\n");
         return false;