[opengm] 350/386: huthut

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit 4a58a3b3cbe9c23863c9fcde3f5718fb4576208a
Author: Thorsten Beier <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Thu Mar 31 15:21:55 2016 +0200

    huthut
---
 .../inference/auxiliary/fusion_move/permutable_label_fusion_mover.hxx   | 2 +-
 include/opengm/inference/intersection_based_inf.hxx                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/opengm/inference/auxiliary/fusion_move/permutable_label_fusion_mover.hxx b/include/opengm/inference/auxiliary/fusion_move/permutable_label_fusion_mover.hxx
index b422a94..244a9f9 100644
--- a/include/opengm/inference/auxiliary/fusion_move/permutable_label_fusion_mover.hxx
+++ b/include/opengm/inference/auxiliary/fusion_move/permutable_label_fusion_mover.hxx
@@ -758,7 +758,7 @@ public:
         typedef vigra::MergeGraphAdaptor< Graph > MergeGraph;
         typedef McClusterOp<GM,ACC> ClusterOp;
         typedef typename ClusterOp::Parameter ClusterOpParam;
-        typedef vigra::HierarchicalClustering< ClusterOp > HC;
+        typedef vigra::HierarchicalClusteringImpl< ClusterOp > HC;
         typedef typename HC::Parameter HcParam;
         
         std::vector<ValueType> weights(accWeights.size(),0.0);
diff --git a/include/opengm/inference/intersection_based_inf.hxx b/include/opengm/inference/intersection_based_inf.hxx
index 415cfe1..5c39ac2 100644
--- a/include/opengm/inference/intersection_based_inf.hxx
+++ b/include/opengm/inference/intersection_based_inf.hxx
@@ -452,7 +452,7 @@ namespace proposal_gen{
 
         typedef RandMcClusterOp<GM, ACC > Cop;
         typedef typename Cop::Parameter CopParam;
-        typedef vigra::HierarchicalClustering< Cop > HC;
+        typedef vigra::HierarchicalClusteringImpl< Cop > HC;
         typedef typename HC::Parameter HcParam;
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git