[Scipy-svn] r4052 - trunk/scipy/ndimage/src/segment

[scipy-svn at scipy.org]

Author: tom.waite
Date: 2008-03-26 18:36:52 -0500 (Wed, 26 Mar 2008)
New Revision: 4052

Modified:
   trunk/scipy/ndimage/src/segment/ndImage_Segmenter_structs.h
Log:
completed Law's texture feature code.

Modified: trunk/scipy/ndimage/src/segment/ndImage_Segmenter_structs.h
===================================================================
--- trunk/scipy/ndimage/src/segment/ndImage_Segmenter_structs.h	2008-03-26 23:36:07 UTC (rev 4051)
+++ trunk/scipy/ndimage/src/segment/ndImage_Segmenter_structs.h	2008-03-26 23:36:52 UTC (rev 4052)
@@ -4,31 +4,6 @@
 #define bool unsigned char
 
 typedef struct{
-    int x;
-    int y;
-}POINT;
-
-typedef struct{
-    int x;
-    int y;
-    int linkIndex;
-    bool haveLink;
-}bPOINT;
-
-typedef struct{
-    int left;
-    int right;
-    int top;
-    int bottom;
-}RECT;
-
-typedef struct{
-    char filterName[20];
-    float Mean;
-    float Variance;
-}tTEM;
-
-typedef struct{
     int numberKernels;
     int kernelLength;
     int numberFilterLayers;
@@ -46,51 +21,6 @@
     int Area;
     float cX;
     float cY;
-    // filled in BuildBoundary
-    int   curveClose;
-    float cXBoundary;
-    float cYBoundary;
-    float boundaryLength;
-    float minRadius;
-    float maxRadius;
-    float aveRadius;
-    float ratio;
-    float compactness;
-    // filled in VoxelMeasures
-    float voxelMean;
-    float voxelVar;
-    // filled in TextureMeasures
-    float TEM[20];
 }objStruct;
 
-typedef struct{
-    int numberPoints;
-    int curveClose;
-    int classify;
-    float boundaryLength;
-    float minRadius;
-    float maxRadius;
-    float aveRadius;
-    float ratio;
-    float compactness;
-    float voxelMean;
-    float voxelVar;
-    RECT rectangle;
-    POINT centroid;
-    bool isWithin;
-    bool closedCurve;
-    bool criticalSize;
-    int Label;
-}boundaryIndex;
-
-
-typedef struct{
-    POINT xy;
-}blobBoundary;
-
-
-//
-// prototypes
-//
-
 #endif