Changeset 34540

Timestamp:

Oct 24, 2012, 8:49:03 AM (14 years ago)

Author:

bills

Message:

in psphotSatstarProfileOp if source->satstar is NULL, use source->parent->satstar
if both are null assert instead of triggering SEGV

File:

• trunk/psphot/src/psphotDeblendSatstars.c (modified) (1 diff)

trunk/psphot/src/psphotDeblendSatstars.c

@@ -544 +544 @@
     float logRdel = 0.1;
 
-    float Xc = source->satstar->Xo - source->pixels->col0 - 0.5;
-    float Yc = source->satstar->Yo - source->pixels->row0 - 0.5;
-    psVector *logRmodel = source->satstar->logRmodel;
-    psVector *logFmodel = source->satstar->logFmodel;
+    pmSourceSatstar *satstar = source->satstar ? source->satstar : (source->parent ? source->parent->satstar : NULL);
+    psAssert (satstar, "null satstar");
+    float Xc = satstar->Xo - source->pixels->col0 - 0.5;
+    float Yc = satstar->Yo - source->pixels->row0 - 0.5;
+    psVector *logRmodel = satstar->logRmodel;
+    psVector *logFmodel = satstar->logFmodel;
 
     for (int iy = 0; iy < source->pixels->numRows; iy++) {