[Ptinpoly-commits] r19 - in pkg: . src

[noreply at r-forge.r-project.org]

Author: jmaisog
Date: 2014-05-02 02:58:54 +0200 (Fri, 02 May 2014)
New Revision: 19

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
   pkg/src/pinpolyhedronA.cc
Log:


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2014-05-01 13:07:16 UTC (rev 18)
+++ pkg/DESCRIPTION	2014-05-02 00:58:54 UTC (rev 19)
@@ -1,7 +1,7 @@
 Package: ptinpoly
 Title: Point-In-Polyhedron Test (2D and 3D)
 Version: 2.2
-Date: 2014-04-30
+Date: 2014-05-01
 Author: Jose M. Maisog, Yuan Wang, George Luta, Jianfei Liu
 Maintainer: Jose M. Maisog <bravas02 at gmail.com>
 Description: This library provides a function 'pip3d', which tests whether a point in 3D space is
@@ -10,6 +10,6 @@
 		within, exactly on, or outside a polygon.
 License: GPL-2
 LazyLoad: yes
-Depends: misc3d
+Imports: misc3d
 Suggests: rgl, geometry
 URL: http://ptinpoly.pbworks.com

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2014-05-01 13:07:16 UTC (rev 18)
+++ pkg/NAMESPACE	2014-05-02 00:58:54 UTC (rev 19)
@@ -3,3 +3,4 @@
 export(pip3d)
 export(blocks2vf)
 export(vf2blocks)
+importFrom(misc3d, makeTriangles)

Modified: pkg/src/pinpolyhedronA.cc
===================================================================
--- pkg/src/pinpolyhedronA.cc	2014-05-01 13:07:16 UTC (rev 18)
+++ pkg/src/pinpolyhedronA.cc	2014-05-02 00:58:54 UTC (rev 19)
@@ -30,7 +30,8 @@
 int (*PointInPolyhedron::trips)[3];
 int PointInPolyhedron::numtri;
 int absolute;
-int *startaddress=(int *)1;
+//int *startaddress=(int *)1;
+int *startaddress=0;
 extern int positionOfPointProjectToTri(double p[3],double p0[3],double p1[3],double p2[3]);
 extern double sqDistPointToTri(double p[3],double p0[3],double p1[3],double p2[3]);
 extern double sqDistPointToSeg3D(double p[3],double p0[3],double p1[3]);