[Teem-commit] SF.net SVN: teem: [3855] teem/trunk/src/ten/fiber.c

[<kin...@us...>]

Revision: 3855
          http://teem.svn.sourceforge.net/teem/?rev=3855&view=rev
Author:   kindlmann
Date:     2008-06-11 15:37:16 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
fixed annoying problem where trying to start a fiber outside the volume bounds would be a biffable error, instead of a quiet non-starter

Modified Paths:
--------------
    teem/trunk/src/ten/fiber.c

Modified: teem/trunk/src/ten/fiber.c
===================================================================
--- teem/trunk/src/ten/fiber.c	2008-06-11 22:34:07 UTC (rev 3854)
+++ teem/trunk/src/ten/fiber.c	2008-06-11 22:37:16 UTC (rev 3855)
@@ -527,9 +527,21 @@
     biffAdd(TEN, err); return 1;
   }
   if (gret) {
-    sprintf(err, "%s: gage problem on first _tenFiberProbe: %s (%d)",
-            me, tfx->gtx->errStr, tfx->gtx->errNum);
-    biffAdd(TEN, err); return 1;
+    if (gageErrBoundsSpace != tfx->gtx->errNum) {
+      sprintf(err, "%s: gage problem on first _tenFiberProbe: %s (%d)",
+              me, tfx->gtx->errStr, tfx->gtx->errNum);
+      biffAdd(TEN, err); return 1;
+    } else {
+      /* the problem on the first probe was that it was out of bounds,
+         which is not a catastrophe; its handled the same as below */
+      tfx->whyNowhere = tenFiberStopBounds;
+      if (nfiber) {
+        nrrdEmpty(nfiber);
+      } else {
+        *startIdxP = *endIdxP = 0;
+      }
+      return 0;
+    }
   }
 
   /* see if we're doomed (tract dies before it gets anywhere)  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.