Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Oct 2015 16:34:23 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r399924 - in head: . graphics graphics/nurbs++ graphics/nurbs++/files
Message-ID:  <201510211634.t9LGYN7A029224@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Oct 21 16:34:23 2015
New Revision: 399924
URL: https://svnweb.freebsd.org/changeset/ports/399924

Log:
  - Resurrect; unbreak on all supported versions of FreeBSD (and 8.X)
  - Drop leading indefinite article from COMMENT text
  - Stagify, convert to USES=libtool, switch to .tar.bz2 distfile

Added:
  head/graphics/nurbs++/
     - copied from r342682, head/graphics/nurbs++/
  head/graphics/nurbs++/files/patch-matrix_matrix.h   (contents, props changed)
  head/graphics/nurbs++/files/patch-nurbs_hnurbsS_sp.h   (contents, props changed)
  head/graphics/nurbs++/files/patch-nurbs_nurbs.h   (contents, props changed)
  head/graphics/nurbs++/files/patch-nurbs_nurbsGL.cpp   (contents, props changed)
  head/graphics/nurbs++/files/patch-nurbs_nurbsS.h   (contents, props changed)
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/nurbs++/Makefile
  head/graphics/nurbs++/distinfo
  head/graphics/nurbs++/files/patch-hnurbsS.cpp
  head/graphics/nurbs++/files/patch-hnurbsS_sp.cpp
  head/graphics/nurbs++/files/patch-matrix.cpp
  head/graphics/nurbs++/files/patch-nurbs.cpp
  head/graphics/nurbs++/files/patch-nurbsS.cpp
  head/graphics/nurbs++/files/patch-nurbsS_sp.cpp
  head/graphics/nurbs++/files/patch-nurbsS_sp.h
  head/graphics/nurbs++/files/patch-nurbs_sp.cpp
  head/graphics/nurbs++/files/patch-nurbs_sp.h
  head/graphics/nurbs++/files/patch-vector.cpp
  head/graphics/nurbs++/files/patch-vector.h
  head/graphics/nurbs++/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Oct 21 15:34:39 2015	(r399923)
+++ head/MOVED	Wed Oct 21 16:34:23 2015	(r399924)
@@ -5423,7 +5423,6 @@ multimedia/openmovieeditor||2014-02-03|H
 french/gfaim||2014-02-04|Abandonware
 math/matlab-R2012a-installer|math/matlab-installer|2014-02-04|Now it can handle any Matlab version
 games/deal||2014-02-05|Abandonware
-graphics/nurbs++||2014-02-05|Broken on all supported versions
 japanese/grep|textproc/gnugrep|2014-02-06|Official version properly support multi-byte, consider using textproc/gnugrep
 www/comclear||2014-02-06|Netscape doesn't exist anymore
 editors/openoffice-3|editors/openoffice-4|2014-02-07|OpenOffice 3 is not supported anymore

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Wed Oct 21 15:34:39 2015	(r399923)
+++ head/graphics/Makefile	Wed Oct 21 16:34:23 2015	(r399924)
@@ -603,6 +603,7 @@
     SUBDIR += nip2
     SUBDIR += nomacs
     SUBDIR += npretty
+    SUBDIR += nurbs++
     SUBDIR += nvidia-texture-tools
     SUBDIR += ocaml-images
     SUBDIR += ocaml-lablgl

Modified: head/graphics/nurbs++/Makefile
==============================================================================
--- head/graphics/nurbs++/Makefile	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/Makefile	Wed Oct 21 16:34:23 2015	(r399924)
@@ -5,18 +5,16 @@ PORTNAME=	nurbs++
 PORTVERSION=	3.0.11
 PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	SF/libnurbs/nurbs%2B%2B/nurbs%2B%2B-${PORTVERSION}
+MASTER_SITES=	SF/libnurbs/nurbs%2B%2B/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	A C++ library for representing curves or surfaces
+COMMENT=	C++ library to manipulate and create NURBS curves and surfaces
 
-USE_GCC=	any
-USE_AUTOTOOLS=	libtool
+USES=		libtool tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name="s/x/x/"
+USE_GCC=	any
 USE_LDCONFIG=	yes
 
-MAN1=	nurbs++-config.1
+INSTALL_TARGET=	install-strip
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/graphics/nurbs++/distinfo
==============================================================================
--- head/graphics/nurbs++/distinfo	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/distinfo	Wed Oct 21 16:34:23 2015	(r399924)
@@ -1,2 +1,2 @@
-SHA256 (nurbs++-3.0.11.tar.gz) = e5cff3a2c378d4fa6bf065fc7c45b4a5a0531d948a666b43e5b10aca15add512
-SIZE (nurbs++-3.0.11.tar.gz) = 513512
+SHA256 (nurbs++-3.0.11.tar.bz2) = 61691c401353e5c3bf70f63bc18ce07cefdc802d5abff637f02ea2c86f74fbfe
+SIZE (nurbs++-3.0.11.tar.bz2) = 391439

Modified: head/graphics/nurbs++/files/patch-hnurbsS.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-hnurbsS.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-hnurbsS.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -118,8 +118,10 @@
 +  if(v<this->knotV()[0] || v>this->knotU()[this->knotV().n()-1])
      return -1 ;
  
-   int su = findSpanU(u) ;
-   int sv = findSpanV(v) ;
+-  int su = findSpanU(u) ;
+-  int sv = findSpanV(v) ;
++  int su = this->findSpanU(u) ;
++  int sv = this->findSpanV(v) ;
  
 -  for(int i=0;i<=degU;++i)
 -    for(int j=0;j<=degV;++j){

Modified: head/graphics/nurbs++/files/patch-hnurbsS_sp.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-hnurbsS_sp.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-hnurbsS_sp.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -158,7 +158,7 @@
    }
    updateSurface(); 
  }
-@@ -262,7 +262,7 @@
+@@ -262,12 +262,12 @@
  HNurbsSurfaceSP<T,N>* HNurbsSurfaceSP<T,N>::addLevel(int n, int s) {
    HNurbsSurfaceSP<T,N> *newLevel ;
  
@@ -167,6 +167,12 @@
      return 0 ;
  
    Vector<T> newU,newV ;
+   
+-  splitUV(n,s,n,s,newU,newV) ;
++  this->splitUV(n,s,n,s,newU,newV) ;
+ 
+   newLevel = new HNurbsSurfaceSP<T,N>(this,newU,newV) ;
+ 
 @@ -289,7 +289,7 @@
  HNurbsSurfaceSP<T,N>* HNurbsSurfaceSP<T,N>::addLevel() {
    HNurbsSurfaceSP<T,N> *newLevel ;

Modified: head/graphics/nurbs++/files/patch-matrix.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-matrix.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-matrix.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -5,8 +5,9 @@
      return *this;
    
 -  if ( a.rows() != rows() || a.cols() != cols() ){
+-    resize(a.rows(),a.cols()) ;
 +  if ( a.rows() != this->rows() || a.cols() != this->cols() ){
-     resize(a.rows(),a.cols()) ;
++    this->resize(a.rows(),a.cols()) ;
    }
    
 -  int sze = rows()*cols() ;

Added: head/graphics/nurbs++/files/patch-matrix_matrix.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/nurbs++/files/patch-matrix_matrix.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -0,0 +1,11 @@
+--- matrix/matrix.h.orig
++++ matrix/matrix.h
+@@ -75,7 +75,7 @@
+       
+       Matrix<T>&	operator=(const Matrix<T>&);	
+       T operator=(const T v) 
+-	{ reset((T)0); 
++	{ this->reset((T)0); 
+ 	diag(v);
+ 	return v; }
+       void submatrix(int i, int j, Matrix<T>&); 

Modified: head/graphics/nurbs++/files/patch-nurbs.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-nurbs.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-nurbs.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -22,6 +22,15 @@
  
    T distance = norm(b-a) + norm(c-b) ;
  
+@@ -2396,7 +2396,7 @@
+       r = c ;
+       return ;
+     }
+-    c = pointAt(u) ;
++    c = this->pointAt(u) ;
+     deriveAt(u,2,Cd) ;
+     cd = Cd[1] ;
+     cdd = Cd[2] ;
 @@ -5202,7 +5202,7 @@
  */
  template <class T, int N>
@@ -31,6 +40,15 @@
  
    NurbsCurveArray<T,N> ca ;
    decompose(ca) ;
+@@ -5240,7 +5240,7 @@
+ 
+     for(i=0;i<n;++i){
+       u = (U[U.n()-deg_-1]-U[deg_])*T(i)/T(n-1) + U[deg_] ;
+-      list.add(pointAt(u)) ;
++      list.add(this->pointAt(u)) ;
+       if(uk)
+ 	uk->add(u) ;
+     }
 @@ -5249,7 +5249,7 @@
    }
    else{

Modified: head/graphics/nurbs++/files/patch-nurbsS.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-nurbsS.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-nurbsS.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -66,3 +66,21 @@
  
    Point_nD<T,N> lookAt  ;
    lookAt.x() = (minP.x()+maxP.x())/2.0 ;
+@@ -4715,7 +4715,7 @@
+   T u,v;
+   for (u = fBu; u<fEu+fDu/2; u+=fDu)
+     for (v = fBv; v<fEv+fDv/2; v+=fDv){
+-      Sp = pointAt(u,v);
++      Sp = this->pointAt(u,v);
+       Np = normal(u,v);
+       Np = (norm(Np)!=0)?Np.unitLength():Point_nD<T,N>(0.0);
+       fout << "\t" << Sp << "\t " << Np << endl;
+@@ -4829,7 +4829,7 @@
+     for (u = 0; u<1-fDu/2; u+=fDu){
+       // The change in sign and the swap of y and z coordinates is
+       // for conversion to MINC format.
+-      Sp = -(T)1.0 * pointAt(u,v) ;
++      Sp = -(T)1.0 * this->pointAt(u,v) ;
+       fout << Sp.x() << ' ' << Sp.z() << ' ' << Sp.y() << endl;
+     }
+ 

Modified: head/graphics/nurbs++/files/patch-nurbsS_sp.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-nurbsS_sp.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-nurbsS_sp.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -71,7 +71,7 @@
  
    Du.reset(0) ;
    Dv.reset(0) ;
-@@ -137,8 +137,8 @@
+@@ -137,10 +137,10 @@
  
    no = 0 ;
  
@@ -80,31 +80,49 @@
 +  for(i=0;i<this->P.rows();++i)
 +    for(j=0;j<this->P.cols();++j){
        Point_nD<T,N> norm ;
-       norm = normal(maxAtU_[i],maxAtV_[j]) ;
+-      norm = normal(maxAtU_[i],maxAtV_[j]) ;
++      norm = this->normal(maxAtU_[i],maxAtV_[j]) ;
        if(norm.x() == T(0) && 
-@@ -155,19 +155,19 @@
+ 	 norm.y() == T(0) &&
+ 	 norm.z() == T(0)){
+@@ -150,26 +150,26 @@
+ 	// must handle the corner cases
+ 	int ok = 0 ; 
+ 	if(i==0 && j==0){
+-	  norm = normal(maxAtU_[i]+delta,maxAtV_[j]) ;
+-	  norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
++	  norm = this->normal(maxAtU_[i]+delta,maxAtV_[j]) ;
++	  norm += this->normal(maxAtU_[i],maxAtV_[j]+delta) ;
  	  norm /= T(2) ;
  	  ok = 1 ;
  	}
 -	if(i==P.rows()-1 && j==P.cols()-1){
+-	  norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
+-	  norm += normal(maxAtU_[i],maxAtV_[j]-delta) ;
 +	if(i==this->P.rows()-1 && j==this->P.cols()-1){
- 	  norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
- 	  norm += normal(maxAtU_[i],maxAtV_[j]-delta) ;
++	  norm = this->normal(maxAtU_[i]-delta,maxAtV_[j]) ;
++	  norm += this->normal(maxAtU_[i],maxAtV_[j]-delta) ;
  	  norm /= T(2) ;
  	  ok = 1 ;
  	}
 -	if(i==0 && j==P.cols()-1){
+-	  norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
+-	  norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
 +	if(i==0 && j==this->P.cols()-1){
- 	  norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
- 	  norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
++	  norm = this->normal(maxAtU_[i]-delta,maxAtV_[j]) ;
++	  norm += this->normal(maxAtU_[i],maxAtV_[j]+delta) ;
  	  norm /= T(2) ;
  	  ok = 1 ;
  	}
 -	if(i==P.rows()-1 && j==0){
+-	  norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
+-	  norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
 +	if(i==this->P.rows()-1 && j==0){
- 	  norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
- 	  norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
++	  norm = this->normal(maxAtU_[i]-delta,maxAtV_[j]) ;
++	  norm += this->normal(maxAtU_[i],maxAtV_[j]+delta) ;
  	  norm /= T(2) ;
+ 	  ok = 1 ;
+ 	}
 @@ -178,7 +178,7 @@
  	  while(norm.x() == T(0) && 
  	     norm.y() == T(0) &&
@@ -114,7 +132,7 @@
  #ifdef USE_EXCEPTION
  	      throw NurbsComputationError();
  #else
-@@ -188,12 +188,12 @@
+@@ -188,22 +188,22 @@
  #endif
  	    }
  	    T u1,u2,v1,v2 ;
@@ -125,12 +143,15 @@
  	      v2 = maxAtV_[j]- nt*delta ;
 -	      if(v1>V[V.n()-1]) v1 = V[V.n()-1] ;
 -	      if(v2<V[0]) v2 = V[0] ;
+-	      norm = normal(u1,v1);
+-	      norm += normal(u2,v2) ;
 +	      if(v1>this->V[this->V.n()-1]) v1 = this->V[this->V.n()-1] ;
 +	      if(v2<this->V[0]) v2 = this->V[0] ;
- 	      norm = normal(u1,v1);
- 	      norm += normal(u2,v2) ;
++	      norm = this->normal(u1,v1);
++	      norm += this->normal(u2,v2) ;
  	      norm /= 2 ; 
-@@ -202,8 +202,8 @@
+ 	    }
+ 	    else{
  	      u1 = maxAtU_[i]- nt*delta ;
  	      u2 = maxAtU_[i]+ nt*delta ;
  	      v1 = v2 = maxAtV_[j] ;
@@ -141,7 +162,7 @@
  
  	      T u3,v3 ;
  	      u3 = maxAtU_[i] ;
-@@ -212,8 +212,8 @@
+@@ -212,12 +212,12 @@
  	      else
  		v3 = maxAtV_[j]- nt*delta ;
  
@@ -150,8 +171,15 @@
 +	      if(v3<this->V[0]) v3 = this->V[0] ;
 +	      if(v3>this->V[this->V.n()-1]) v3 = this->V[this->V.n()-1] ;
  
- 	      norm = normal(u1,v1);
- 	      norm += normal(u2,v2) ;
+-	      norm = normal(u1,v1);
+-	      norm += normal(u2,v2) ;
+-	      norm += normal(u3,v3) ;
++	      norm = this->normal(u1,v1);
++	      norm += this->normal(u2,v2) ;
++	      norm += this->normal(u3,v3) ;
+ 	      norm /= 3 ; 
+ 	    }
+ 	    nt *= 10.0 ; 
 @@ -263,13 +263,13 @@
  
    int sizeU, sizeV ;
@@ -194,3 +222,12 @@
  	break ; 
        if( k == i && j==l){
  	pts[n].x() = a.x() ; 
+@@ -316,7 +316,7 @@
+   pu.resize(n) ; 
+   pv.resize(n) ; 
+ 
+-  movePoint(u,v,pts,pu,pv) ;
++  this->movePoint(u,v,pts,pu,pv) ;
+ }
+ 
+ } // end namespace

Modified: head/graphics/nurbs++/files/patch-nurbsS_sp.h
==============================================================================
--- head/graphics/nurbs++/files/patch-nurbsS_sp.h	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-nurbsS_sp.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -9,3 +9,12 @@
    void modSurfCP(int i, int j, const HPoint_nD<T,N>& a) //!< Moves a surface point to a value
      { modSurfCPby(i,j,a-surfP(i,j)) ;  }
  
+@@ -94,7 +94,7 @@
+     { return maxAtV_[i] ; }
+ 
+   HPoint_nD<T,N> surfP(int i,int j) const  //!< the surface point for the control point at i,j
+-    { return hpointAt(maxAtU_[i],maxAtV_[j]); }
++    { return this->hpointAt(maxAtU_[i],maxAtV_[j]); }
+ 
+   void updateMaxUV() //!< Updates both the maxU and maxV values
+     { updateMaxU() ; updateMaxV() ; }

Added: head/graphics/nurbs++/files/patch-nurbs_hnurbsS_sp.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/nurbs++/files/patch-nurbs_hnurbsS_sp.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -0,0 +1,15 @@
+--- nurbs/hnurbsS_sp.h.orig
++++ nurbs/hnurbsS_sp.h
+@@ -83,10 +83,10 @@
+   T maxAtV(int i) const { return maxAtV_[i] ; }
+ 
+   HPoint_nD<T,N> surfP(int i,int j) const 
+-    { return hpointAt(maxAtU_[i],maxAtV_[j]); }
++    { return this->hpointAt(maxAtU_[i],maxAtV_[j]); }
+ 
+   HPoint_nD<T,N> surfP(int i,int j, int lod) const
+-    { return hpointAt(maxAtU_[i],maxAtV_[j],lod) ; }
++    { return this->hpointAt(maxAtU_[i],maxAtV_[j],lod) ; }
+ 
+   void updateMaxUV() 
+     { updateMaxU() ; updateMaxV() ; }

Added: head/graphics/nurbs++/files/patch-nurbs_nurbs.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/nurbs++/files/patch-nurbs_nurbs.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -0,0 +1,13 @@
+--- nurbs/nurbs.h.orig
++++ nurbs/nurbs.h
+@@ -105,8 +105,8 @@
+       
+       // Basis functions
+       T basisFun(T u, int i, int p=-1) const ;
+-      void basisFuns(T u, int span, Vector<T>& N) const ;
+-      void dersBasisFuns(int n,T u, int span, Matrix<T>& N) const;
++      void basisFuns(T u, int span, Vector<T>& N_) const ;
++      void dersBasisFuns(int n,T u, int span, Matrix<T>& N_) const;
+       
+       // Knot functions
+       T minKnot() const //! the minimal value for the knot vector

Added: head/graphics/nurbs++/files/patch-nurbs_nurbsGL.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/nurbs++/files/patch-nurbs_nurbsGL.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -0,0 +1,11 @@
+--- nurbs/nurbsGL.cpp.orig
++++ nurbs/nurbsGL.cpp
+@@ -26,7 +26,7 @@
+ #include <nurbsGL.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <iostream.h> 
++#include <iostream>
+ 
+ #ifdef WITH_OPENGL
+ 

Added: head/graphics/nurbs++/files/patch-nurbs_nurbsS.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/nurbs++/files/patch-nurbs_nurbsS.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -0,0 +1,24 @@
+--- nurbs/nurbsS.h.orig
++++ nurbs/nurbsS.h
+@@ -99,8 +99,8 @@
+   virtual HPoint_nD<T,N> operator()(T u, T v) const ;
+ 
+   void basisFuns(T u, T v, int spanU, int spanV, Vector<T>& Nu, Vector<T>& Nv) const ;
+-  void basisFunsU(T u, int span, Vector<T>& N) const ;
+-  void basisFunsV(T u, int span, Vector<T>& N) const ;
++  void basisFunsU(T u, int span, Vector<T>& N_) const ;
++  void basisFunsV(T u, int span, Vector<T>& N_) const ;
+   void dersBasisFuns(T u, T v, int dU, int dV,int uspan, int vspan,Matrix<T> & Niku, Matrix<T>& Njkv ) const ; 
+ 
+   // Derivative functions
+@@ -135,8 +135,8 @@
+   int skinU(NurbsCurveArray<T,N>& ca, int degU);
+   void sweep(const NurbsCurve<T,N>& t, const NurbsCurve<T,N>& C, const NurbsCurve<T,N>& Sv, int K,int useAy=0, int invAz=0) ;
+   void sweep(const NurbsCurve<T,N>& t, const NurbsCurve<T,N>& C, int K,int useAy=0, int invAz=0) ;
+-  void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& T, double theta) ;
+-  void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& T) ;
++  void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& T_, double theta) ;
++  void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& T_) ;
+   void makeFromRevolution(const NurbsCurve<T,N>& profile) ;
+ 
+   void makeSphere(const Point_nD<T,N>& O, T r) ; 

Modified: head/graphics/nurbs++/files/patch-nurbs_sp.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-nurbs_sp.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-nurbs_sp.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -37,7 +37,7 @@
  #endif
  	}
 -      maxU[i] = basisFun(maxAt_[i],i,deg_) ;
-+      maxU[i] = basisFun(maxAt_[i],i,this->deg_) ;
++      maxU[i] = this->basisFun(maxAt_[i],i,this->deg_) ;
      }
      
    }
@@ -60,3 +60,12 @@
        break ; 
      u[n] = maxAt_[j] ;
      if( j == i){
+@@ -119,7 +119,7 @@
+   u.resize(n) ;
+   pts.resize(n) ; 
+ 
+-  movePoint(u,pts) ;
++  this->movePoint(u,pts) ;
+ }
+ 
+ } // end namespace

Modified: head/graphics/nurbs++/files/patch-nurbs_sp.h
==============================================================================
--- head/graphics/nurbs++/files/patch-nurbs_sp.h	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-nurbs_sp.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -9,3 +9,12 @@
    void modSurfCP(int i, const HPoint_nD<T,N>& a) 
      { modSurfCPby(i,a-surfP(i)) ;  }
  
+@@ -84,7 +84,7 @@
+     { return maxAt_[i] ; }
+ 
+   HPoint_nD<T,N> surfP(int i) const 
+-    { return hpointAt(maxAt_[i]) ; }
++    { return this->hpointAt(maxAt_[i]) ; }
+ 
+   void updateMaxU() ;
+ 

Modified: head/graphics/nurbs++/files/patch-vector.cpp
==============================================================================
--- head/graphics/nurbs++/files/patch-vector.cpp	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-vector.cpp	Wed Oct 21 16:34:23 2015	(r399924)
@@ -7,7 +7,8 @@
 -  if ( n() != b.n())
 +  if ( this->n() != b.n())
      {
-       resize(b.n()) ;
+-      resize(b.n()) ;
++      this->resize(b.n()) ;
      }
  
 -  sze = b.n() ;
@@ -28,7 +29,8 @@
 -  if ( size() != b.size())
 +  if ( this->size() != b.size())
      {
-       resize(b.size()) ;
+-      resize(b.size()) ;
++      this->resize(b.size()) ;
      }
    T *ptr ;
 -  ptr = x - 1 ;

Modified: head/graphics/nurbs++/files/patch-vector.h
==============================================================================
--- head/graphics/nurbs++/files/patch-vector.h	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/files/patch-vector.h	Wed Oct 21 16:34:23 2015	(r399924)
@@ -9,3 +9,12 @@
      Vector() : BasicArray<T>(1) {} //!< Basic constructor
      Vector(const int r) : BasicArray<T>(r) {}
      Vector(const Vector<T>& v) : BasicArray<T>(v) {}
+@@ -90,7 +90,7 @@
+     Vector<T> get(int i, int l);
+     
+     int minIndex() const ;
+-    T minimum() const { return operator[](minIndex()) ; }  // returns the minimal value inside the vector
++    T minimum() const { return this->operator[](minIndex()) ; }  // returns the minimal value inside the vector
+     
+     void qSortStd() ;
+     void qSort(int M=7) ; 

Modified: head/graphics/nurbs++/pkg-plist
==============================================================================
--- head/graphics/nurbs++/pkg-plist	Wed Feb  5 10:33:12 2014	(r342682)
+++ head/graphics/nurbs++/pkg-plist	Wed Oct 21 16:34:23 2015	(r399924)
@@ -39,23 +39,23 @@ include/nurbs++/surface.h
 include/nurbs++/tri_spline.h
 include/nurbs++/vector.h
 lib/libmatrix.a
-lib/libmatrix.la
 lib/libmatrix.so
 lib/libmatrix.so.1
+lib/libmatrix.so.1.0.0
 lib/libmatrixI.a
-lib/libmatrixI.la
 lib/libmatrixI.so
 lib/libmatrixI.so.1
+lib/libmatrixI.so.1.0.0
 lib/libmatrixN.a
-lib/libmatrixN.la
 lib/libmatrixN.so
 lib/libmatrixN.so.1
+lib/libmatrixN.so.1.0.0
 lib/libnurbsd.a
-lib/libnurbsd.la
 lib/libnurbsd.so
-lib/libnurbsd.so.1
+lib/libnurbsd.so.0
+lib/libnurbsd.so.0.1.0
 lib/libnurbsf.a
-lib/libnurbsf.la
 lib/libnurbsf.so
-lib/libnurbsf.so.1
-@dirrm include/nurbs++
+lib/libnurbsf.so.0
+lib/libnurbsf.so.0.1.0
+man/man1/nurbs++-config.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510211634.t9LGYN7A029224>