Changeset 15981

Timestamp:

Jan 2, 2008, 10:40:28 AM (18 years ago)

Author:

gusciora

Message:

Changed some assert() code to PS_ASSERT() code.

File:

• trunk/psModules/src/objects/pmTrend2D.c (modified) (5 diffs)

trunk/psModules/src/objects/pmTrend2D.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-02 20:40:28 $
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
  *
  */
-
-// XXXX: ignore
 
 #ifdef HAVE_CONFIG_H
@@ -91 +89 @@
 pmTrend2D *pmTrend2DNoImageAlloc (pmTrend2DMode mode, psImageBinning *binning, psStats *stats)
 {
+    if (mode == PM_TREND_MAP) {
+        PS_ASSERT_PTR_NON_NULL(binning, NULL);
+        PS_ASSERT_PTR_NON_NULL(stats, NULL);
+    }
     pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
     psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
@@ -184 +186 @@
 {
     PS_ASSERT_PTR_NON_NULL(trend, false);
+    PS_ASSERT_VECTOR_NON_NULL(mask, false);
+    PS_ASSERT_VECTOR_NON_NULL(x, false);
+    PS_ASSERT_VECTOR_NON_NULL(y, false);
+    PS_ASSERT_VECTOR_NON_NULL(f, false);
 
     bool status;
-
-    assert (trend);
-    assert (x);
-    assert (y);
-    assert (f);
-
     switch (trend->mode) {
       case PM_TREND_POLY_ORD:
@@ -237 +237 @@
 {
     PS_ASSERT_PTR_NON_NULL(trend, NULL);
+    PS_ASSERT_VECTOR_NON_NULL(x, false);
+    PS_ASSERT_VECTOR_NON_NULL(y, false);
     psVector *result;
-
-    assert (trend);
-    assert (x);
-    assert (y);
 
     switch (trend->mode) {
@@ -277 +275 @@
         break;
       default:
+        psError (PS_ERR_UNKNOWN, true, "Unknown pmTrend2D mode\n");
         psAbort ("invalid mode %d", mode);
     }