[cgma-dev] r4919 - cgm/trunk/itaps

[wilsonp at engr.wisc.edu]

Author: wilsonp
Date: 2011-06-02 02:14:03 -0500 (Thu, 02 Jun 2011)
New Revision: 4919

Modified:
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeom_CGMA.cc
Log:
Backed out changes to usage/behavior of some of the interface variables, based on misunderstanding.

Passes make check - though still not getFacets test - one underway.


Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2011-06-02 06:31:55 UTC (rev 4918)
+++ cgm/trunk/itaps/iGeom.h	2011-06-02 07:14:03 UTC (rev 4919)
@@ -3927,12 +3927,12 @@
      * \param instance iGeom instance handle
      * \param entity_handle Entity being queried
      * \param dist_tolerance Tolerance guidance for faceting engine
-     * \param **points List of vertices in faceting of curve or surface
-     * \param *points_allocated Number of points in faceting
-     * \param *points_size Size of points array (should be 3*points_allocated?)
-     * \param **facets List of facets in faceting of surface
-     * \param *facets_allocated Number of facets in surface faceting
-     * \param *facets_size Size of facets array (should be 3*facets_allocated?)
+     * \param points List of vertices in faceting of curve or surface
+     * \param points_allocated Allocated size of vertex list array
+     * \param points_size Occupied size of vertex list array
+     * \param facets List of facets in faceting of surface
+     * \param facets_allocated Allocated size of facet list array
+     * \param facets_size Occupied size of facet list array
      * \param *err Pointer to error type returned from function
      */
   void iGeom_getFacets(iGeom_Instance instance,

Modified: cgm/trunk/itaps/iGeom_CGMA.cc
===================================================================
--- cgm/trunk/itaps/iGeom_CGMA.cc	2011-06-02 06:31:55 UTC (rev 4918)
+++ cgm/trunk/itaps/iGeom_CGMA.cc	2011-06-02 07:14:03 UTC (rev 4919)
@@ -7106,8 +7106,6 @@
         y += step;
         z += step; 
       } 
-      *points_allocated = p_count;
-      *points_size = p_count * 3;
     }
     if(f_count)
     {
@@ -7125,8 +7123,6 @@
          *(connectivity + 2) = list[i*4 + 3];
          connectivity += 3;
       }
-      *facets_allocated = f_count/4;
-      *facets_size = f_count*3/4;
     } 
     RETURN(iBase_SUCCESS); 
   }