Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7241] teem/trunk/python/cffi
|
From: <kin...@us...> - 2024-09-19 21:28:44
|
Revision: 7241
http://sourceforge.net/p/teem/code/7241
Author: kindlmann
Date: 2024-09-19 21:28:42 +0000 (Thu, 19 Sep 2024)
Log Message:
-----------
syncing with source
Modified Paths:
--------------
teem/trunk/python/cffi/biffdata/nrrd.csv
teem/trunk/python/cffi/cdef/cdef_nrrd.h
teem/trunk/python/cffi/teem.py
Modified: teem/trunk/python/cffi/biffdata/nrrd.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/nrrd.csv 2024-09-19 20:41:54 UTC (rev 7240)
+++ teem/trunk/python/cffi/biffdata/nrrd.csv 2024-09-19 21:28:42 UTC (rev 7241)
@@ -71,28 +71,28 @@
nrrdBoundarySpecParse,int,1,0,nrrd,nrrd/methodsNrrd.c:117
nrrdBoundarySpecSprint,int,1,0,nrrd,nrrd/methodsNrrd.c:176
nrrdBoundarySpecCompare,int,1,0,nrrd,nrrd/methodsNrrd.c:198
-nrrdBasicInfoCopy,int,1,0,nrrd,nrrd/methodsNrrd.c:538
-nrrdWrap_nva,int,1,0,nrrd,nrrd/methodsNrrd.c:814
-nrrdWrap_va,int,1,0,nrrd,nrrd/methodsNrrd.c:845
-nrrdCopy,int,1,0,nrrd,nrrd/methodsNrrd.c:936
-nrrdAlloc_nva,int,1,0,nrrd,nrrd/methodsNrrd.c:966
-nrrdAlloc_va,int,1,0,nrrd,nrrd/methodsNrrd.c:1015
-nrrdMaybeAlloc_nva,int,1,0,nrrd,nrrd/methodsNrrd.c:1136
-nrrdMaybeAlloc_va,int,1,0,nrrd,nrrd/methodsNrrd.c:1153
-nrrdCompare,int,1,0,nrrd,nrrd/methodsNrrd.c:1194
-nrrdPPM,int,1,0,nrrd,nrrd/methodsNrrd.c:1380
-nrrdPGM,int,1,0,nrrd,nrrd/methodsNrrd.c:1400
+nrrdBasicInfoCopy,int,1,0,nrrd,nrrd/methodsNrrd.c:541
+nrrdWrap_nva,int,1,0,nrrd,nrrd/methodsNrrd.c:817
+nrrdWrap_va,int,1,0,nrrd,nrrd/methodsNrrd.c:848
+nrrdCopy,int,1,0,nrrd,nrrd/methodsNrrd.c:939
+nrrdAlloc_nva,int,1,0,nrrd,nrrd/methodsNrrd.c:969
+nrrdAlloc_va,int,1,0,nrrd,nrrd/methodsNrrd.c:1018
+nrrdMaybeAlloc_nva,int,1,0,nrrd,nrrd/methodsNrrd.c:1139
+nrrdMaybeAlloc_va,int,1,0,nrrd,nrrd/methodsNrrd.c:1156
+nrrdCompare,int,1,0,nrrd,nrrd/methodsNrrd.c:1197
+nrrdPPM,int,1,0,nrrd,nrrd/methodsNrrd.c:1383
+nrrdPGM,int,1,0,nrrd,nrrd/methodsNrrd.c:1403
nrrdSpaceVectorParse,int,1,4,nrrd,nrrd/parseNrrd.c:521
_nrrdDataFNCheck,int,1,3,nrrd,nrrd/parseNrrd.c:1198
nrrdRangePercentileSet,int,1,0,nrrd,nrrd/range.c:109
nrrdRangePercentileFromStringSet,int,1,0,nrrd,nrrd/range.c:211
-nrrdOneLine,int,1,0,nrrd,nrrd/read.c:72
-nrrdLineSkip,int,1,0,nrrd,nrrd/read.c:236
-nrrdByteSkip,int,1,0,nrrd,nrrd/read.c:332
-nrrdRead,int,1,0,nrrd,nrrd/read.c:496
-nrrdStringRead,int,1,0,nrrd,nrrd/read.c:516
-nrrdLoad,int,1|2,0,nrrd,nrrd/read.c:612
-nrrdLoadMulti,int,1,0,nrrd,nrrd/read.c:666
+nrrdOneLine,int,1,0,nrrd,nrrd/read.c:76
+nrrdLineSkip,int,1,0,nrrd,nrrd/read.c:240
+nrrdByteSkip,int,1,0,nrrd,nrrd/read.c:336
+nrrdRead,int,1,0,nrrd,nrrd/read.c:500
+nrrdStringRead,int,1,0,nrrd,nrrd/read.c:520
+nrrdLoad,int,1|2,0,nrrd,nrrd/read.c:616
+nrrdLoadMulti,int,1,0,nrrd,nrrd/read.c:683
nrrdInvertPerm,int,1,0,nrrd,nrrd/reorder.c:34
nrrdAxesInsert,int,1,0,nrrd,nrrd/reorder.c:86
nrrdAxesPermute,int,1,0,nrrd,nrrd/reorder.c:152
@@ -147,10 +147,10 @@
nrrdPad_nva,int,1,0,nrrd,nrrd/superset.c:487
nrrdSimplePad_va,int,1,0,nrrd,nrrd/superset.c:515
nrrdSimplePad_nva,int,1,0,nrrd,nrrd/superset.c:553
-nrrdIoStateSet,int,1,0,nrrd,nrrd/write.c:31
-nrrdIoStateEncodingSet,int,1,0,nrrd,nrrd/write.c:104
-nrrdIoStateFormatSet,int,1,0,nrrd,nrrd/write.c:124
-nrrdWrite,int,1,0,nrrd,nrrd/write.c:944
-nrrdStringWrite,int,1,0,nrrd,nrrd/write.c:960
-nrrdSave,int,1,0,nrrd,nrrd/write.c:981
-nrrdSaveMulti,int,1,0,nrrd,nrrd/write.c:1034
+nrrdIoStateSet,int,1,0,nrrd,nrrd/write.c:30
+nrrdIoStateEncodingSet,int,1,0,nrrd,nrrd/write.c:103
+nrrdIoStateFormatSet,int,1,0,nrrd,nrrd/write.c:123
+nrrdWrite,int,1,0,nrrd,nrrd/write.c:943
+nrrdStringWrite,int,1,0,nrrd,nrrd/write.c:959
+nrrdSave,int,1,0,nrrd,nrrd/write.c:980
+nrrdSaveMulti,int,1,0,nrrd,nrrd/write.c:1046
Modified: teem/trunk/python/cffi/cdef/cdef_nrrd.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_nrrd.h 2024-09-19 20:41:54 UTC (rev 7240)
+++ teem/trunk/python/cffi/cdef/cdef_nrrd.h 2024-09-19 21:28:42 UTC (rev 7241)
@@ -1151,15 +1151,29 @@
nrrd format. Probably used in conjunction with
skipData. (currently for "unu data")
ON WRITE: no semantics */
- zlibLevel, /* zlib compression level (0-9, -1 for
- default[6], 0 for no compression). */
- zlibStrategy, /* zlib compression strategy, can be one
- of the nrrdZlibStrategy enums, default is
- nrrdZlibStrategyDefault. */
- bzip2BlockSize, /* block size used for compression,
- roughly equivalent to better but slower
- (1-9, -1 for default[9]). */
/* ---- BEGIN non-NrrdIO */
+ declineStdioOnTTY, /* ON READ and ON WRITE: If nrrdLoad is about to read from
+ filename "-" (via nrrdRead), or nrrdSave is about to write to
+ "-" (via nrrdWrite), regardless of file format (which isn't
+ known on read, though may be known on write): if this is
+ non-zero, decline to nrrdRead from stdin or nrrdWrite to stdout
+ IF stdin/stdout seems to be a terminal (as per isatty()). On
+ read, this avoids cryptic stalls as something tries to read
+ from the terminal (where a human is unlikely to be typing the
+ file contents), and on write, this avoids clobbering the
+ terminal with screens of non-printing characters. Using
+ filename "-=" is a sneaky way to name stdin/stdout while
+ over-riding this declination and force that IO to happen. */
+ /* ---- END non-NrrdIO */
+ zlibLevel, /* zlib compression level (0-9, -1 for
+ default[6], 0 for no compression). */
+ zlibStrategy, /* zlib compression strategy, can be one
+ of the nrrdZlibStrategy enums, default is
+ nrrdZlibStrategyDefault. */
+ bzip2BlockSize, /* block size used for compression,
+ roughly equivalent to better but slower
+ (1-9, -1 for default[9]). */
+ /* ---- BEGIN non-NrrdIO */
/* seems odd to have contents of NrrdIoState differ between full Teem
and NrrdIO, but these fields can't be meaningfully set or read if
the nrrdFormatPNGsRGBIntent is not available */
@@ -1412,6 +1426,7 @@
extern double nrrdDefaultResamplePadValue;
extern int nrrdDefaultResampleNonExistent;
extern double nrrdDefaultKernelParm0;
+extern int nrrdDefaultDeclineStdioOnTTY;
/* ---- END non-NrrdIO */
extern int nrrdDefaultCenter;
extern double nrrdDefaultSpacing;
Modified: teem/trunk/python/cffi/teem.py
===================================================================
--- teem/trunk/python/cffi/teem.py 2024-09-19 20:41:54 UTC (rev 7240)
+++ teem/trunk/python/cffi/teem.py 2024-09-19 21:28:42 UTC (rev 7241)
@@ -194,28 +194,28 @@
'nrrdBoundarySpecParse': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:117'),
'nrrdBoundarySpecSprint': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:176'),
'nrrdBoundarySpecCompare': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:198'),
- 'nrrdBasicInfoCopy': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:538'),
- 'nrrdWrap_nva': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:814'),
- 'nrrdWrap_va': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:845'),
- 'nrrdCopy': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:936'),
- 'nrrdAlloc_nva': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:966'),
- 'nrrdAlloc_va': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1015'),
- 'nrrdMaybeAlloc_nva': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1136'),
- 'nrrdMaybeAlloc_va': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1153'),
- 'nrrdCompare': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1194'),
- 'nrrdPPM': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1380'),
- 'nrrdPGM': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1400'),
+ 'nrrdBasicInfoCopy': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:541'),
+ 'nrrdWrap_nva': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:817'),
+ 'nrrdWrap_va': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:848'),
+ 'nrrdCopy': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:939'),
+ 'nrrdAlloc_nva': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:969'),
+ 'nrrdAlloc_va': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1018'),
+ 'nrrdMaybeAlloc_nva': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1139'),
+ 'nrrdMaybeAlloc_va': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1156'),
+ 'nrrdCompare': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1197'),
+ 'nrrdPPM': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1383'),
+ 'nrrdPGM': (_equals_one, 0, b'nrrd', 'nrrd/methodsNrrd.c:1403'),
'nrrdSpaceVectorParse': (_equals_one, 4, b'nrrd', 'nrrd/parseNrrd.c:521'),
'_nrrdDataFNCheck': (_equals_one, 3, b'nrrd', 'nrrd/parseNrrd.c:1198'),
'nrrdRangePercentileSet': (_equals_one, 0, b'nrrd', 'nrrd/range.c:109'),
'nrrdRangePercentileFromStringSet': (_equals_one, 0, b'nrrd', 'nrrd/range.c:211'),
- 'nrrdOneLine': (_equals_one, 0, b'nrrd', 'nrrd/read.c:72'),
- 'nrrdLineSkip': (_equals_one, 0, b'nrrd', 'nrrd/read.c:236'),
- 'nrrdByteSkip': (_equals_one, 0, b'nrrd', 'nrrd/read.c:332'),
- 'nrrdRead': (_equals_one, 0, b'nrrd', 'nrrd/read.c:496'),
- 'nrrdStringRead': (_equals_one, 0, b'nrrd', 'nrrd/read.c:516'),
- 'nrrdLoad': ((lambda rv: 1 == rv or 2 == rv), 0, b'nrrd', 'nrrd/read.c:612'),
- 'nrrdLoadMulti': (_equals_one, 0, b'nrrd', 'nrrd/read.c:666'),
+ 'nrrdOneLine': (_equals_one, 0, b'nrrd', 'nrrd/read.c:76'),
+ 'nrrdLineSkip': (_equals_one, 0, b'nrrd', 'nrrd/read.c:240'),
+ 'nrrdByteSkip': (_equals_one, 0, b'nrrd', 'nrrd/read.c:336'),
+ 'nrrdRead': (_equals_one, 0, b'nrrd', 'nrrd/read.c:500'),
+ 'nrrdStringRead': (_equals_one, 0, b'nrrd', 'nrrd/read.c:520'),
+ 'nrrdLoad': ((lambda rv: 1 == rv or 2 == rv), 0, b'nrrd', 'nrrd/read.c:616'),
+ 'nrrdLoadMulti': (_equals_one, 0, b'nrrd', 'nrrd/read.c:683'),
'nrrdInvertPerm': (_equals_one, 0, b'nrrd', 'nrrd/reorder.c:34'),
'nrrdAxesInsert': (_equals_one, 0, b'nrrd', 'nrrd/reorder.c:86'),
'nrrdAxesPermute': (_equals_one, 0, b'nrrd', 'nrrd/reorder.c:152'),
@@ -270,13 +270,13 @@
'nrrdPad_nva': (_equals_one, 0, b'nrrd', 'nrrd/superset.c:487'),
'nrrdSimplePad_va': (_equals_one, 0, b'nrrd', 'nrrd/superset.c:515'),
'nrrdSimplePad_nva': (_equals_one, 0, b'nrrd', 'nrrd/superset.c:553'),
- 'nrrdIoStateSet': (_equals_one, 0, b'nrrd', 'nrrd/write.c:31'),
- 'nrrdIoStateEncodingSet': (_equals_one, 0, b'nrrd', 'nrrd/write.c:104'),
- 'nrrdIoStateFormatSet': (_equals_one, 0, b'nrrd', 'nrrd/write.c:124'),
- 'nrrdWrite': (_equals_one, 0, b'nrrd', 'nrrd/write.c:944'),
- 'nrrdStringWrite': (_equals_one, 0, b'nrrd', 'nrrd/write.c:960'),
- 'nrrdSave': (_equals_one, 0, b'nrrd', 'nrrd/write.c:981'),
- 'nrrdSaveMulti': (_equals_one, 0, b'nrrd', 'nrrd/write.c:1034'),
+ 'nrrdIoStateSet': (_equals_one, 0, b'nrrd', 'nrrd/write.c:30'),
+ 'nrrdIoStateEncodingSet': (_equals_one, 0, b'nrrd', 'nrrd/write.c:103'),
+ 'nrrdIoStateFormatSet': (_equals_one, 0, b'nrrd', 'nrrd/write.c:123'),
+ 'nrrdWrite': (_equals_one, 0, b'nrrd', 'nrrd/write.c:943'),
+ 'nrrdStringWrite': (_equals_one, 0, b'nrrd', 'nrrd/write.c:959'),
+ 'nrrdSave': (_equals_one, 0, b'nrrd', 'nrrd/write.c:980'),
+ 'nrrdSaveMulti': (_equals_one, 0, b'nrrd', 'nrrd/write.c:1046'),
'ell_Nm_check': (_equals_one, 0, b'ell', 'ell/genmat.c:25'),
'ell_Nm_tran': (_equals_one, 0, b'ell', 'ell/genmat.c:59'),
'ell_Nm_mul': (_equals_one, 0, b'ell', 'ell/genmat.c:104'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
