Changeset 15591

Timestamp:

Nov 12, 2007, 11:58:17 AM (18 years ago)

Author:

Paul Price

Message:

Adding assertions to protect from SEGV. Many more required!

File:

• trunk/psModules/src/astrom/pmAstrometryDistortion.c (modified) (10 diffs)

trunk/psModules/src/astrom/pmAstrometryDistortion.c

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-10-09 19:27:04 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-11-12 21:58:17 $
 *
 *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -112 +112 @@
                 Npts++;
             }
-            
+
             psTrace ("psModules.astrom", 4, "Npts: %d (%d,%d) : (%d - %d),(%d - %d)\n", Npts, nx, ny, Xmin, Xmax, Ymin, Ymax);
 
@@ -171 +171 @@
 bool pmAstromFitDistortion(pmFPA *fpa, psArray *gradients, double pixelScale)
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_ARRAY_NON_NULL(gradients, false);
 
     psPolynomial2D *localX = NULL;
@@ -211 +213 @@
     for (int i = 0; i <= fpa->toTPA->x->nX; i++) {
         for (int j = 0; j <= fpa->toTPA->x->nY; j++) {
-            if ((i > 0) && (i <= fpa->toTPA->x->nX)) {
-                localX->coeffMask[i-1][j] = fpa->toTPA->x->coeffMask[i][j];
-            }
-            if ((j > 0) && (j <= fpa->toTPA->x->nY)) {
-                localY->coeffMask[i][j-1] = fpa->toTPA->x->coeffMask[i][j];
-            }
+            if ((i > 0) && (i <= fpa->toTPA->x->nX)) {
+                localX->coeffMask[i-1][j] = fpa->toTPA->x->coeffMask[i][j];
+            }
+            if ((j > 0) && (j <= fpa->toTPA->x->nY)) {
+                localY->coeffMask[i][j-1] = fpa->toTPA->x->coeffMask[i][j];
+            }
         }
     }
@@ -223 +225 @@
     if (!psVectorClipFitPolynomial2D (localX, stats, mask, 0xff, dPdL, NULL, L, M)) {
         psLogMsg ("psastro", 3, "failed to fit x-dir gradient\n");
-        psFree (localX);
-        psFree (localY);
+        psFree (localX);
+        psFree (localY);
         goto escape;
     }
@@ -230 +232 @@
     if (!psVectorClipFitPolynomial2D (localY, stats, mask, 0xff, dPdM, NULL, L, M)) {
         psLogMsg ("psastro", 3, "failed to fit y-dir gradient\n");
-        psFree (localX);
-        psFree (localY);
+        psFree (localX);
+        psFree (localY);
         goto escape;
     }
@@ -239 +241 @@
     for (int i = 1; i <= fpa->toTPA->x->nX; i++) {
         if (fpa->toTPA->x->coeffMask[i][0] & PS_POLY_MASK_SET) {
-            continue;
-        }
-        fpa->toTPA->x->coeff[i][0] = localX->coeff[i-1][0] / i;
+            continue;
+        }
+        fpa->toTPA->x->coeff[i][0] = localX->coeff[i-1][0] / i;
     }
     for (int j = 1; j <= fpa->toTPA->x->nY; j++) {
         if (fpa->toTPA->x->coeffMask[0][j] & PS_POLY_MASK_SET) {
-            continue;
-        }
-        fpa->toTPA->x->coeff[0][j] = localY->coeff[0][j-1] / j;
+            continue;
+        }
+        fpa->toTPA->x->coeff[0][j] = localY->coeff[0][j-1] / j;
     }
     for (int i = 1; i <= fpa->toTPA->x->nX; i++) {
         for (int j = 1; j <= fpa->toTPA->x->nY; j++) {
             if (fpa->toTPA->x->coeffMask[i][j] & PS_POLY_MASK_SET) {
-                continue;
-            }
-            fpa->toTPA->x->coeff[i][j] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
+                continue;
+            }
+            fpa->toTPA->x->coeff[i][j] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
         }
     }
@@ -269 +271 @@
     for (int i = 0; i < fpa->toTPA->y->nX; i++) {
         for (int j = 0; j < fpa->toTPA->y->nY; j++) {
-            if ((i > 0) && (i <= fpa->toTPA->y->nX)) {
-                localX->coeffMask[i-1][j] = fpa->toTPA->y->coeffMask[i][j];
-            }
-            if ((j > 0) && (j <= fpa->toTPA->y->nY)) {
-                localY->coeffMask[i][j-1] = fpa->toTPA->y->coeffMask[i][j];
-            }
+            if ((i > 0) && (i <= fpa->toTPA->y->nX)) {
+                localX->coeffMask[i-1][j] = fpa->toTPA->y->coeffMask[i][j];
+            }
+            if ((j > 0) && (j <= fpa->toTPA->y->nY)) {
+                localY->coeffMask[i][j-1] = fpa->toTPA->y->coeffMask[i][j];
+            }
         }
     }
@@ -286 +288 @@
     for (int i = 1; i <= fpa->toTPA->y->nX; i++) {
         if (fpa->toTPA->y->coeffMask[i][0] & PS_POLY_MASK_SET) {
-            continue;
-        }
-        fpa->toTPA->y->coeff[i][0] = localX->coeff[i-1][0] / i;
+            continue;
+        }
+        fpa->toTPA->y->coeff[i][0] = localX->coeff[i-1][0] / i;
     }
     for (int j = 1; j <= fpa->toTPA->y->nY; j++) {
         if (fpa->toTPA->y->coeffMask[0][j] & PS_POLY_MASK_SET) {
-            continue;
-        }
-        fpa->toTPA->y->coeff[0][j] = localY->coeff[0][j-1] / j;
+            continue;
+        }
+        fpa->toTPA->y->coeff[0][j] = localY->coeff[0][j-1] / j;
     }
     for (int i = 1; i <= fpa->toTPA->y->nX; i++) {
         for (int j = 1; j <= fpa->toTPA->y->nY; j++) {
             if (fpa->toTPA->y->coeffMask[i][j] & PS_POLY_MASK_SET) {
-                continue;
-            }
-            fpa->toTPA->y->coeff[i][j] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
+                continue;
+            }
+            fpa->toTPA->y->coeff[i][j] = 0.5*(localX->coeff[i-1][j] / i + localY->coeff[i][j-1] / j);
         }
     }
@@ -328 +330 @@
     if (fpa->fromTPA == NULL) {
         psError (PS_ERR_UNKNOWN, false, "failed to invert fpa->toTPA\n");
-        return false;
+        return false;
     }