Changeset 2275 for trunk/psModules/src/pmMaskBadPixels.c

Timestamp:

Nov 3, 2004, 4:02:10 PM (22 years ago)

Author:

desonia

Message:

fixed problems with psError and associate parameter checking macros.

File:

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

trunk/psModules/src/pmMaskBadPixels.c

@@ -19 +19 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 23:52:09 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 02:02:10 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
         return true;   // Readout may not have data in it
     } else if(mask==NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_NULL_MASK_IMAGE);
+        psError( PS_ERR_BAD_PARAMETER_NULL, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_NULL_MASK_IMAGE);
         return false;
     }
@@ -68 +68 @@
     inImage = in->image;
     if (inImage == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_NULL_INPUT_IMAGE);
+        psError( PS_ERR_BAD_PARAMETER_NULL, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_NULL_INPUT_IMAGE);
         return false;
     } else if(in->mask == NULL) {
@@ -79 +79 @@
     // Check input image and its mask are not larger than mask
     if(inImage->numRows > mask->numRows || inImage->numCols > mask->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_SIZE_INPUT_IMAGE,
-                   inImage->numRows, inImage->numCols, mask->numRows, mask->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_SIZE_INPUT_IMAGE,
+                 inImage->numRows, inImage->numCols, mask->numRows, mask->numCols);
         return false;
     } else if(inMask->numRows>mask->numRows || inMask->numCols>mask->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_SIZE_MASK_IMAGE,
-                   inMask->numRows, inMask->numCols, mask->numRows, mask->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_SIZE_MASK_IMAGE,
+                 inMask->numRows, inMask->numCols, mask->numRows, mask->numCols);
         return false;
     }
@@ -96 +96 @@
     // Check that offsets are within image limits
     if(totOffRow>=mask->numRows || totOffCol>=mask->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_OFFSET_MASK_IMAGE,
-                   totOffRow, totOffCol, mask->numRows, mask->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_OFFSET_MASK_IMAGE,
+                 totOffRow, totOffCol, mask->numRows, mask->numCols);
         return false;
     } else if(totOffRow>=inImage->numRows || totOffCol>=inImage->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_OFFSET_INPUT_IMAGE,
-                   totOffRow, totOffCol, inImage->numRows, inImage->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_OFFSET_INPUT_IMAGE,
+                 totOffRow, totOffCol, inImage->numRows, inImage->numCols);
         return false;
     } else if(totOffRow>=inMask->numRows || totOffCol>=inMask->numCols) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_OFFSET_INPUT_IMAGE_MASK,
-                   totOffRow, totOffCol, inMask->numRows, inMask->numCols);
+        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_OFFSET_INPUT_IMAGE_MASK,
+                 totOffRow, totOffCol, inMask->numRows, inMask->numCols);
         return false;
     }
@@ -116 +116 @@
     maskType = mask->type.type;
     if(PS_IS_PSELEMTYPE_COMPLEX(inType)) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_TYPE_INPUT_IMAGE,
-                   inType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_TYPE_INPUT_IMAGE,
+                 inType);
         return false;
     } else if(maskType!=PS_TYPE_MASK) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_TYPE_MASK_IMAGE,
-                   maskType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_TYPE_MASK_IMAGE,
+                 maskType);
         return false;
     }
@@ -175 +175 @@
         PM_BAD_PIXELS(F64);
     default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "pmMaskBadPixels", PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_pmMaskBadPixels_TYPE_UNSUPPORTED,
-                   inType);
+        psError( PS_ERR_BAD_PARAMETER_TYPE, true,
+                 PS_ERRORTEXT_pmMaskBadPixels_TYPE_UNSUPPORTED,
+                 inType);
     }