From d1213f23ea928ade800d5b8877b44c90f682df30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20M=C3=B6ller?= <matthias.moeller@rwth-aachen.de>
Date: Wed, 8 Aug 2012 14:04:23 +0000
Subject: [PATCH] fix decimater module template parameter for Apps

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@646 fdac6126-5c0c-442c-9429-916003d36597
---
 .../Apps/Decimating/DecimaterViewerWidget.hh   |  8 ++++----
 src/OpenMesh/Apps/Decimating/decimater.cc      | 18 +++++++++---------
 .../VDProgMesh/mkbalancedpm/mkbalancedpm.cc    | 10 +++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
index 463da138..caad4bab 100644
--- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
+++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
@@ -103,8 +103,8 @@ public:
   typedef MeshViewerWidget inherited_t;
 
   typedef Decimater::DecimaterT<mesh_t>                decimater_t;  
-  typedef Decimater::ModQuadricT< decimater_t >        mod_quadric_t;
-  typedef Decimater::ModNormalFlippingT< decimater_t > mod_nf_t;
+  typedef Decimater::ModQuadricT< mesh_t >        mod_quadric_t;
+  typedef Decimater::ModNormalFlippingT< mesh_t > mod_nf_t;
 
   // object types
   typedef std::auto_ptr< decimater_t   >   decimater_o;
@@ -149,11 +149,11 @@ public: // inherited
         decimater_ = tmp;
       }
       {
-        mod_quadric_o  tmp( new mod_quadric_t( *decimater_ ) );
+        mod_quadric_o  tmp( new mod_quadric_t( mesh() ) );
         mod_quadric_ = tmp;
       }
       {
-        mod_nf_o       tmp( new mod_nf_t     ( *decimater_ ) );
+        mod_nf_o       tmp( new mod_nf_t     ( mesh() ) );
         mod_nf_      = tmp;
       }
 
diff --git a/src/OpenMesh/Apps/Decimating/decimater.cc b/src/OpenMesh/Apps/Decimating/decimater.cc
index fe6b5e17..8d61ba8b 100644
--- a/src/OpenMesh/Apps/Decimating/decimater.cc
+++ b/src/OpenMesh/Apps/Decimating/decimater.cc
@@ -255,7 +255,7 @@ decimate(const std::string &_ifname,
 
 
 
-     typename OpenMesh::Decimater::ModAspectRatioT<DecimaterType>::Handle modAR;
+     typename OpenMesh::Decimater::ModAspectRatioT<Mesh>::Handle modAR;
 
      if (_opt.AR.is_enabled())
      {
@@ -264,7 +264,7 @@ decimate(const std::string &_ifname,
          decimater.module( modAR ).set_aspect_ratio( _opt.AR ) ;
      }
 
-     typename OpenMesh::Decimater::ModEdgeLengthT<DecimaterType>::Handle modEL;
+     typename OpenMesh::Decimater::ModEdgeLengthT<Mesh>::Handle modEL;
 
      if (_opt.EL.is_enabled())
      {
@@ -273,7 +273,7 @@ decimate(const std::string &_ifname,
          decimater.module( modEL ).set_edge_length( _opt.EL ) ;
      }
 
-     typename OpenMesh::Decimater::ModHausdorffT <DecimaterType>::Handle modHD;
+     typename OpenMesh::Decimater::ModHausdorffT <Mesh>::Handle modHD;
 
      if (_opt.HD.is_enabled())
      {
@@ -283,12 +283,12 @@ decimate(const std::string &_ifname,
 
      }
 
-     typename OpenMesh::Decimater::ModIndependentSetsT<DecimaterType>::Handle modIS;
+     typename OpenMesh::Decimater::ModIndependentSetsT<Mesh>::Handle modIS;
 
      if ( _opt.IS.is_enabled() )
        decimater.add(modIS);
 
-     typename OpenMesh::Decimater::ModNormalDeviationT<DecimaterType>::Handle modND;
+     typename OpenMesh::Decimater::ModNormalDeviationT<Mesh>::Handle modND;
 
      if (_opt.ND.is_enabled())
      {
@@ -297,7 +297,7 @@ decimate(const std::string &_ifname,
          decimater.module( modND ).set_normal_deviation( _opt.ND );
      }
 
-     typename OpenMesh::Decimater::ModNormalFlippingT<DecimaterType>::Handle modNF;
+     typename OpenMesh::Decimater::ModNormalFlippingT<Mesh>::Handle modNF;
 
      if (_opt.NF.is_enabled())
      {
@@ -307,12 +307,12 @@ decimate(const std::string &_ifname,
      }
 
 
-     typename OpenMesh::Decimater::ModProgMeshT<DecimaterType>::Handle       modPM;
+     typename OpenMesh::Decimater::ModProgMeshT<Mesh>::Handle       modPM;
 
      if ( _opt.PM.is_enabled() )
        decimater.add(modPM);
 
-     typename OpenMesh::Decimater::ModQuadricT<DecimaterType>::Handle        modQ;
+     typename OpenMesh::Decimater::ModQuadricT<Mesh>::Handle        modQ;
 
      if (_opt.Q.is_enabled())
      {
@@ -321,7 +321,7 @@ decimate(const std::string &_ifname,
          decimater.module( modQ ).set_max_err( _opt.Q );
      }
 
-     typename OpenMesh::Decimater::ModRoundnessT<DecimaterType>::Handle      modR;
+     typename OpenMesh::Decimater::ModRoundnessT<Mesh>::Handle      modR;
 
      if ( _opt.R.is_enabled() )
      {
diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
index 9ed8d40e..ee62abb9 100644
--- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
+++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
@@ -57,10 +57,10 @@
 
 typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh;
 typedef OpenMesh::Decimater::DecimaterT<Mesh> DecimaterProgMesh;
-typedef OpenMesh::Decimater::ModNormalFlippingT<DecimaterProgMesh>  ModNormalFlipping;
-typedef OpenMesh::Decimater::ModQuadricT<DecimaterProgMesh>         ModQuadric;
-typedef OpenMesh::Decimater::ModProgMeshT<DecimaterProgMesh>        ModProgMesh;
-typedef OpenMesh::Decimater::ModIndependentSetsT<DecimaterProgMesh> ModIndependentSets;
+typedef OpenMesh::Decimater::ModNormalFlippingT<Mesh>  ModNormalFlipping;
+typedef OpenMesh::Decimater::ModQuadricT<Mesh>         ModQuadric;
+typedef OpenMesh::Decimater::ModProgMeshT<Mesh>        ModProgMesh;
+typedef OpenMesh::Decimater::ModIndependentSetsT<Mesh> ModIndependentSets;
 
 // ----------------------------------------------------------------------------
 
@@ -168,7 +168,7 @@ private:
 template <typename D>
 const double ModBalancerT<D>::inv_log2_ = 1.0/std::log(2.0);
 
-typedef ModBalancerT<DecimaterProgMesh>  ModBalancer;
+typedef ModBalancerT<Mesh>  ModBalancer;
 
 
 // ----------------------------------------------------------------------------