[Teem-commit] SF.net SVN: teem:[7234] teem/trunk/python/cffi

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

Revision: 7234
          http://sourceforge.net/p/teem/code/7234
Author:   kindlmann
Date:     2024-07-25 00:36:16 +0000 (Thu, 25 Jul 2024)
Log Message:
-----------
syncing with sources

Modified Paths:
--------------
    teem/trunk/python/cffi/biffdata/limn.csv
    teem/trunk/python/cffi/cdef/cdef_limn.h
    teem/trunk/python/cffi/teem.py

Modified: teem/trunk/python/cffi/biffdata/limn.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/limn.csv	2024-07-25 00:34:44 UTC (rev 7233)
+++ teem/trunk/python/cffi/biffdata/limn.csv	2024-07-25 00:36:16 UTC (rev 7234)
@@ -64,10 +64,10 @@
 limnCbfPointsCheck,int,1,0,limn,limn/splineFit.c:249
 limnCbfCtxPrep,int,1,0,limn,limn/splineFit.c:520
 limnCbfTVT,int,1,0,limn,limn/splineFit.c:788
-limnCbfSingle,int,1,0,limn,limn/splineFit.c:1517
-limnCbfCorners,int,1,0,limn,limn/splineFit.c:1568
-limnCbfMulti,int,1,0,limn,limn/splineFit.c:1770
-limnCbfGo,int,1,0,limn,limn/splineFit.c:1888
+limnCbfSingle,int,1,0,limn,limn/splineFit.c:1528
+limnCbfCorners,int,1,0,limn,limn/splineFit.c:1579
+limnCbfMulti,int,1,0,limn,limn/splineFit.c:1781
+limnCbfGo,int,1,0,limn,limn/splineFit.c:1899
 limnObjectWorldHomog,int,1,0,limn,limn/transform.c:25
 limnObjectFaceNormals,int,1,0,limn,limn/transform.c:47
 limnObjectSpaceTransform,int,1,0,limn,limn/transform.c:210

Modified: teem/trunk/python/cffi/cdef/cdef_limn.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_limn.h	2024-07-25 00:34:44 UTC (rev 7233)
+++ teem/trunk/python/cffi/cdef/cdef_limn.h	2024-07-25 00:36:16 UTC (rev 7234)
@@ -495,11 +495,11 @@
                    continuous between multiple spline segments) */
     cornerNMS;  /* (if cornerFind) non-minimal-suppression of corners: accept as
                    corners only those with locally minimal angle */
-  int (*cornerCB)(double *tvtNew,                  /* if corner, set new TVT */
+  int (*cornerCB)(double *tvtNew, /* if corner (non-zero return), set new TVT */
                   const struct limnCbfCtx_t *fctx, /* this struct */
-                  double angleMeas,                /* measured angle */
-                  const double *tvtMeas,           /* measured TVT */
-                  const double *vertOrig);         /* original vertex pos */
+                  double angleMeas,                /* angle measured at fctx->scale */
+                  const double *tvtMeas,           /* TVT measured at fctx->scale */
+                  const double *tvt0);             /* TVT at scale=0 */
   const void *cornerCBData;                        /* holds extra info for cornerCB */
   unsigned int nrpIterMax;                         /* max # iters of nrp */
   double
@@ -851,7 +851,7 @@
 extern void limnCbfSegEval(double *xy, const limnCbfSeg *seg, double tt);
 extern void limnCbfPathSample(double *xy, unsigned int pointNum,
                                    const limnCbfPath *path);
-extern int limnCbfTVT(double lt[2], double vv[2], double rt[2],
+extern int limnCbfTVT(double lt[2], double vv[2], double rt[2], double *tvt0,
                            const limnCbfCtx *fctx, const limnCbfPoints *lpnt,
                            unsigned int loi, unsigned int hii, unsigned int vvi,
                            int oneSided);

Modified: teem/trunk/python/cffi/teem.py
===================================================================
--- teem/trunk/python/cffi/teem.py	2024-07-25 00:34:44 UTC (rev 7233)
+++ teem/trunk/python/cffi/teem.py	2024-07-25 00:36:16 UTC (rev 7234)
@@ -437,10 +437,10 @@
     'limnCbfPointsCheck': (_equals_one, 0, b'limn', 'limn/splineFit.c:249'),
     'limnCbfCtxPrep': (_equals_one, 0, b'limn', 'limn/splineFit.c:520'),
     'limnCbfTVT': (_equals_one, 0, b'limn', 'limn/splineFit.c:788'),
-    'limnCbfSingle': (_equals_one, 0, b'limn', 'limn/splineFit.c:1517'),
-    'limnCbfCorners': (_equals_one, 0, b'limn', 'limn/splineFit.c:1568'),
-    'limnCbfMulti': (_equals_one, 0, b'limn', 'limn/splineFit.c:1770'),
-    'limnCbfGo': (_equals_one, 0, b'limn', 'limn/splineFit.c:1888'),
+    'limnCbfSingle': (_equals_one, 0, b'limn', 'limn/splineFit.c:1528'),
+    'limnCbfCorners': (_equals_one, 0, b'limn', 'limn/splineFit.c:1579'),
+    'limnCbfMulti': (_equals_one, 0, b'limn', 'limn/splineFit.c:1781'),
+    'limnCbfGo': (_equals_one, 0, b'limn', 'limn/splineFit.c:1899'),
     'limnObjectWorldHomog': (_equals_one, 0, b'limn', 'limn/transform.c:25'),
     'limnObjectFaceNormals': (_equals_one, 0, b'limn', 'limn/transform.c:47'),
     'limnObjectSpaceTransform': (_equals_one, 0, b'limn', 'limn/transform.c:210'),

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