[Teem-commit] SF.net SVN: teem:[7159] teem/trunk/src/nrrd

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

Revision: 7159
          http://sourceforge.net/p/teem/code/7159
Author:   kindlmann
Date:     2023-09-11 10:45:59 +0000 (Mon, 11 Sep 2023)
Log Message:
-----------
removing test on nrrdTypeIsIntegral[nrrdTypeBlock] from nrrdSanity()

Modified Paths:
--------------
    teem/trunk/src/nrrd/arraysNrrd.c
    teem/trunk/src/nrrd/simple.c

Modified: teem/trunk/src/nrrd/arraysNrrd.c
===================================================================
--- teem/trunk/src/nrrd/arraysNrrd.c	2023-09-11 10:12:18 UTC (rev 7158)
+++ teem/trunk/src/nrrd/arraysNrrd.c	2023-09-11 10:45:59 UTC (rev 7159)
@@ -73,10 +73,10 @@
   0, /* nrrdTypeFloat: float */
   0, /* nrrdTypeDouble: double */
   0  /* nrrdTypeBlock: "for some reason we pretend that blocks are integers" is what this
-     used to say since ~2002 when this array was created (under the  name
-     nrrdTypeIsFixedPoint), but that was never justified or necessary (afaik).  For 2023
-     Teem v2 hacking, GLK got annoyed that CC code in cc.c didn't immediately  complain
-     that nrrdTypeBloack was a useless type for output CC IDs. */
+     used to say since ~2002 when this array was created (under the name nrrdTypeFixed[],
+     as opposed to floating point), but that was never justified or necessary (afaik).
+     For 2023 Teem v2 hacking, GLK got annoyed that CC code in cc.c didn't immediately
+     complain that nrrdTypeBloack was a useless type for output CC IDs. */
 };
 
 const int nrrdTypeIsUnsigned[NRRD_TYPE_MAX + 1] = {

Modified: teem/trunk/src/nrrd/simple.c
===================================================================
--- teem/trunk/src/nrrd/simple.c	2023-09-11 10:12:18 UTC (rev 7158)
+++ teem/trunk/src/nrrd/simple.c	2023-09-11 10:45:59 UTC (rev 7159)
@@ -1538,6 +1538,8 @@
     return 0;
   }
 
+  /* this check was added in 2002 without explanation, but now (2023 pre v2 hacking)
+  it conflicts with a change that made that array entry 0; wackiness as yet unseen.
   if (!nrrdTypeIsIntegral[nrrdTypeBlock]) {
     biffAddf(NRRD,
              "%s: nrrdTypeInteger[nrrdTypeBlock] is not true, things "
@@ -1544,7 +1546,7 @@
              "could get wacky",
              me);
     return 0;
-  }
+  } */
 
   /* HEY: any other assumptions built into Teem? */
 

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