[brlcad-commits] SF.net SVN: brlcad:[47511] brlcad/trunk/src/libged/polyclip.cpp

[<br...@us...>]

Revision: 47511
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47511&view=rev
Author:   brlcad
Date:     2011-11-16 22:28:08 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
non-API functions shouldn't have ged_ prefix and should be made static when possible.

Modified Paths:
--------------
    brlcad/trunk/src/libged/polyclip.cpp

Modified: brlcad/trunk/src/libged/polyclip.cpp
===================================================================
--- brlcad/trunk/src/libged/polyclip.cpp	2011-11-16 22:25:20 UTC (rev 47510)
+++ brlcad/trunk/src/libged/polyclip.cpp	2011-11-16 22:28:08 UTC (rev 47511)
@@ -40,8 +40,8 @@
 } clipper_vertex;
 
 
-void
-ged_polyclip_load_polygon(ClipperLib::Clipper &clipper, ClipperLib::PolyType ptype, ged_polygon *gpoly) 
+static void
+load_polygon(ClipperLib::Clipper &clipper, ClipperLib::PolyType ptype, ged_polygon *gpoly) 
 {
     register size_t j, k, n;
     ClipperLib::Polygon curr_poly;
@@ -59,21 +59,21 @@
     }
 }
 
-void
-ged_polyclip_load_polygons(ClipperLib::Clipper &clipper, ClipperLib::PolyType ptype, ged_polygons *subj) 
+static void
+load_polygons(ClipperLib::Clipper &clipper, ClipperLib::PolyType ptype, ged_polygons *subj) 
 {
     register size_t i;
 
     for (i = 0; i < subj->gp_num_polygons; ++i)
-	ged_polyclip_load_polygon(clipper, ptype, &subj->gp_polygon[i]);
+	load_polygon(clipper, ptype, &subj->gp_polygon[i]);
 }
 
 
 /*
  * Process/extract the clipper_polys into a ged_polygon.
  */
-ged_polygon *
-ged_polyclip_extract(ClipperLib::ExPolygons &clipper_polys)
+static ged_polygon *
+extract(ClipperLib::ExPolygons &clipper_polys)
 {
     register size_t i, j, k, n;
     size_t num_contours = 0;
@@ -141,10 +141,10 @@
     /* need the inverse of the matrix above to put things back after clipping */
 
     /* Load subject polygon into clipper */
-    ged_polyclip_load_polygon(clipper, ClipperLib::ptSubject, subj);
+    load_polygon(clipper, ClipperLib::ptSubject, subj);
 
     /* Load clip polygon into clipper */
-    ged_polyclip_load_polygon(clipper, ClipperLib::ptClip, clip);
+    load_polygon(clipper, ClipperLib::ptClip, clip);
 
     /* Convert op from BRL-CAD to Clipper */
     switch (op) {
@@ -165,7 +165,7 @@
     /* Clip'em */
     clipper.Execute(ctOp, result_clipper_polys, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd);
 
-    return ged_polyclip_extract(result_clipper_polys);
+    return extract(result_clipper_polys);
 }
 
 
@@ -182,10 +182,10 @@
     /* need the inverse of the matrix above to put things back after clipping */
 
     /* Load subject polygons into clipper */
-    ged_polyclip_load_polygons(clipper, ClipperLib::ptSubject, subj);
+    load_polygons(clipper, ClipperLib::ptSubject, subj);
 
     /* Load clip polygons into clipper */
-    ged_polyclip_load_polygons(clipper, ClipperLib::ptClip, clip);
+    load_polygons(clipper, ClipperLib::ptClip, clip);
 
     /* Convert op from BRL-CAD to Clipper */
     switch (op) {
@@ -206,7 +206,7 @@
     /* Clip'em */
     clipper.Execute(ctOp, result_clipper_polys, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd);
 
-    return ged_polyclip_extract(result_clipper_polys);
+    return extract(result_clipper_polys);
 }
 
 

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