Changeset 4029 for trunk/psLib/src/imageops/psImageStats.c

Timestamp:

May 25, 2005, 10:26:55 AM (21 years ago)

Author:

gusciora

Message:

I renamed many of the PS_CHECK macros to PS_ASSERT...

File:

• trunk/psLib/src/imageops/psImageStats.c (modified) (13 diffs)

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-11 22:02:16 $
+ *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:26:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
     psVector *junkMask = NULL;
 
-    PS_PTR_CHECK_NULL(stats, NULL);
-    PS_INT_CHECK_ZERO(stats->options, NULL);
-    PS_IMAGE_CHECK_NULL(in, NULL)
+    PS_ASSERT_PTR_NON_NULL(stats, NULL);
+    PS_ASSERT_INT_NONZERO(stats->options, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(in, NULL)
     if (mask != NULL) {
-        PS_IMAGE_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
-        PS_IMAGE_CHECK_SIZE_EQUAL(in, mask, NULL);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL);
     }
 
@@ -124 +124 @@
                               psU32 maskVal)
 {
-    PS_PTR_CHECK_NULL(out, NULL);
-    PS_PTR_CHECK_NULL(in, NULL);
+    PS_ASSERT_PTR_NON_NULL(out, NULL);
+    PS_ASSERT_PTR_NON_NULL(in, NULL);
     if (mask != NULL) {
-        PS_IMAGE_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
-        PS_IMAGE_CHECK_SIZE_EQUAL(in, mask, NULL);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL);
     }
     psVector* junkData = NULL;
@@ -200 +200 @@
 double* calcScaleFactors(psS32 n)
 {
-    PS_INT_CHECK_NON_NEGATIVE(n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(n, NULL);
     psS32 i = 0;
     double tmp = 0.0;
@@ -217 +217 @@
 psPolynomial1D **p_psCreateChebyshevPolys(psS32 maxChebyPoly)
 {
-    PS_INT_CHECK_POSITIVE(maxChebyPoly, NULL);
+    PS_ASSERT_INT_POSITIVE(maxChebyPoly, NULL);
     psPolynomial1D **chebPolys = NULL;
     psS32 i = 0;
@@ -265 +265 @@
                                      const psImage* input)
 {
-    PS_IMAGE_CHECK_NULL(input, NULL);
-    PS_IMAGE_CHECK_EMPTY(input, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(input, NULL);
+    PS_ASSERT_IMAGE_NON_EMPTY(input, NULL);
     if ((input->type.type != PS_TYPE_S8) &&
             (input->type.type != PS_TYPE_U16) &&
@@ -273 +273 @@
         psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n");
     }
-    PS_POLY_CHECK_NULL(coeffs, NULL);
-    PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
+    PS_ASSERT_POLY_NON_NULL(coeffs, NULL);
+    PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
     psS32 x = 0;
     psS32 y = 0;
@@ -388 +388 @@
         const psImage* input)
 {
-    PS_IMAGE_CHECK_NULL(input, NULL);
-    PS_IMAGE_CHECK_EMPTY(input, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(input, NULL);
+    PS_ASSERT_IMAGE_NON_EMPTY(input, NULL);
     if ((input->type.type != PS_TYPE_S8) &&
             (input->type.type != PS_TYPE_U16) &&
@@ -396 +396 @@
         psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n");
     }
-    PS_POLY_CHECK_NULL(coeffs, NULL);
-    PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
+    PS_ASSERT_POLY_NON_NULL(coeffs, NULL);
+    PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
     psS32 x = 0;
     psS32 y = 0;
@@ -519 +519 @@
                                      const psPolynomial2D* coeffs)
 {
-    PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
+    PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
 
     psS32 x = 0;
@@ -586 +586 @@
                                     const psPolynomial2D* coeffs)
 {
-    PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_ORD, NULL);
+    PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_ORD, NULL);
 
     for (int row = 0; row < input->numRows ; row++) {
@@ -613 +613 @@
                                const psPolynomial2D* coeffs)
 {
-    PS_IMAGE_CHECK_NULL(input, NULL);
-    PS_IMAGE_CHECK_EMPTY(input, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(input, NULL);
+    PS_ASSERT_IMAGE_NON_EMPTY(input, NULL);
     if ((input->type.type != PS_TYPE_S8) &&
             (input->type.type != PS_TYPE_U16) &&
@@ -622 +622 @@
                 "Unallowable image type.\n");
     }
-    PS_POLY_CHECK_NULL(coeffs, NULL);
+    PS_ASSERT_POLY_NON_NULL(coeffs, NULL);
 
     if (coeffs->type == PS_POLYNOMIAL_ORD) {