Changeset 15516 for branches/eam_branch_20071023/psModules/src/objects/pmTrend2D.c

Timestamp:

Nov 8, 2007, 12:59:04 PM (19 years ago)

Author:

eugene

Message:

accepting updates from HEAD

File:

• branches/eam_branch_20071023/psModules/src/objects/pmTrend2D.c (modified) (9 diffs)

branches/eam_branch_20071023/psModules/src/objects/pmTrend2D.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-29 22:42:34 $
+ *  @version $Revision: 1.4.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-08 22:59:04 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -11 +11 @@
 // XXXX: Ignore (2)
 
+// XXXX: ignore
+
+// XXXX: ignore
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -32 +36 @@
 pmTrend2D *pmTrend2DAlloc (pmTrend2DMode mode, psImage *image, int nXtrend, int nYtrend, psStats *stats)
 {
-    assert (image);
+    PS_ASSERT_PTR_NON_NULL(stats, NULL);
+    if (mode == PM_TREND_MAP) {
+        PS_ASSERT_PTR_NON_NULL(image, NULL);
+    }
 
     pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
@@ -73 +80 @@
           break;
       }
-
+      // XXX: Put a more graceful error here.
       default:
         psAbort ("error");
     }
     return (trend);
+}
+
+bool psMemCheckTrend2D(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) pmTrend2DFree);
 }
 
@@ -123 +136 @@
 pmTrend2D *pmTrend2DFieldAlloc (pmTrend2DMode mode, int nXfield, int nYfield, int nXtrend, int nYtrend, psStats *stats)
 {
+    PS_ASSERT_PTR_NON_NULL(stats, NULL);
     pmTrend2D *trend = (pmTrend2D *) psAlloc(sizeof(pmTrend2D));
     psMemSetDeallocator(trend, (psFreeFunc) pmTrend2DFree);
@@ -164 +178 @@
 
       default:
+        // XXX: Put a more graceful error here.
         psAbort ("error");
     }
@@ -169 +184 @@
 }
 
-bool pmTrend2DFit (pmTrend2D *trend, psVector *mask, psMaskType maskVal, psVector *x, psVector *y, psVector *f, psVector *df) {
+bool pmTrend2DFit (pmTrend2D *trend, psVector *mask, psMaskType maskVal, psVector *x,
+                   psVector *y, psVector *f, psVector *df)
+{
+    PS_ASSERT_PTR_NON_NULL(trend, false);
 
     bool status;
@@ -199 +217 @@
 }
 
-double pmTrend2DEval (pmTrend2D *trend, float x, float y) {
+double pmTrend2DEval (pmTrend2D *trend, float x, float y)
+{
+    if (!trend) return 0.0;
 
     double result;
-
-    assert (trend);
-
     switch (trend->mode) {
       case PM_TREND_POLY_ORD:
@@ -221 +238 @@
 }
 
-psVector *pmTrend2DEvalVector (pmTrend2D *trend, psVector *x, psVector *y) {
-
+psVector *pmTrend2DEvalVector (pmTrend2D *trend, psVector *x, psVector *y)
+{
+    PS_ASSERT_PTR_NON_NULL(trend, NULL);
     psVector *result;