From d00a28d3b5f26ce4cb8a9a025e4c97753395aefa Mon Sep 17 00:00:00 2001
From: Guido Ranzuglia granzuglia <guido.ranzuglia@isti.cnr.it>
Date: Mon, 22 Oct 2012 10:32:47 +0000
Subject: [PATCH] - changed function names according to the new vcglib syntax
 (WARNING! edit_align still doesn't compile)

---
 src/meshlabplugins/edit_align/align/AlignPair.cpp |  4 ++--
 src/meshlabplugins/edit_align/align/AlignPair.h   | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/meshlabplugins/edit_align/align/AlignPair.cpp b/src/meshlabplugins/edit_align/align/AlignPair.cpp
index 766c868d2..976daddae 100644
--- a/src/meshlabplugins/edit_align/align/AlignPair.cpp
+++ b/src/meshlabplugins/edit_align/align/AlignPair.cpp
@@ -55,7 +55,7 @@ bool AlignPair::A2Mesh::InitVert(const Matrix44d &Tr,bool hasborderflag)
 {
   Matrix44d Idn; Idn.SetIdentity();
   if(Tr!=Idn) tri::UpdatePosition<A2Mesh>::Matrix(*this,Tr);
-  tri::UpdateNormals<A2Mesh>::NormalizeVertex(*this);
+  tri::UpdateNormal<A2Mesh>::NormalizeVertex(*this);
   tri::UpdateBounding<A2Mesh>::Box(*this);
   return true;
 }
@@ -68,7 +68,7 @@ bool AlignPair::A2Mesh::Init(const Matrix44d &Tr,bool hasborderflag)
   //int t2=clock();
 	if(Tr!=Idn) tri::UpdatePosition<A2Mesh>::Matrix(*this,Tr); 
 	//int t3=clock();  
-  tri::UpdateNormals<A2Mesh>::PerVertexNormalizedPerFaceNormalized(*this); 
+  tri::UpdateNormal<A2Mesh>::PerVertexNormalizedPerFaceNormalized(*this); 
 	//int t4=clock();
 	if(!hasborderflag) 		
     tri::UpdateFlags<A2Mesh>::FaceBorderFromNone(*this);
diff --git a/src/meshlabplugins/edit_align/align/AlignPair.h b/src/meshlabplugins/edit_align/align/AlignPair.h
index 1b8885bfa..9774f7d92 100644
--- a/src/meshlabplugins/edit_align/align/AlignPair.h
+++ b/src/meshlabplugins/edit_align/align/AlignPair.h
@@ -26,16 +26,16 @@
 
 #include <vcg/math/histogram.h>
 #include <vcg/math/matrix44.h>
-#include <vcg/simplex/vertex/base.h>
-#include <vcg/simplex/vertex/component.h>
-#include <vcg/simplex/face/base.h>
-#include <vcg/simplex/face/component.h>
-#include <vcg/simplex/face/component_rt.h>
+//#include <vcg/simplex/vertex/base.h>
+//#include <vcg/simplex/vertex/component.h>
+//#include <vcg/simplex/face/base.h>
+//#include <vcg/simplex/face/component.h>
+#include <vcg/simplex/face/component_ep.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include<vcg/complex/complex.h>
 #include<vcg/complex/algorithms/update/normal.h>
 #include<vcg/complex/algorithms/update/bounding.h>
-#include<vcg/complex/algorithms/update/edges.h>
+#include<vcg/complex/algorithms/update/component_ep.h>
 
 
 namespace vcg
@@ -302,7 +302,8 @@ void ConvertMesh(const MESH &M1, A2Mesh &M2)
 			assert((*f2i).V(0)-&M2.vert[0]>=0);
 			assert((*f2i).V(1)-&M2.vert[0] >=0);
 			assert((*f2i).V(2)-&M2.vert[0] >=0);
-			tri::UpdateEdges<A2Mesh>::Set(*f2i);
+			
+			vcg::tri::UpdateEdges<vcg::AlignPair::A2Mesh>::Set(*f2i);
 			++f2i;
 		}	
 	M2.vn=M1.vn;