diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
| commit | 189c2e9277d4abd3b750a5a60ef42549dcfe359d (patch) | |
| tree | 1430a845f4aab56b9133c3d8c6ffac09ee6dd92a /extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc | |
| parent | 771bad9c6abaad4b742935e5d55067f281287650 (diff) | |
| parent | 1519b6a23e0341e25bf5a5c714f9f3d119ab8781 (diff) | |
Merge branch 'master' into soc-2014-viewport_contextsoc-2014-viewport_context
Diffstat (limited to 'extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc')
| -rw-r--r-- | extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc b/extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc index 0a8b20cfe29..f0f7e0e1e06 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc +++ b/extern/libmv/third_party/ceres/internal/ceres/single_linkage_clustering.cc @@ -44,7 +44,7 @@ namespace internal { int ComputeSingleLinkageClustering( const SingleLinkageClusteringOptions& options, - const Graph<int>& graph, + const WeightedGraph<int>& graph, HashMap<int, int>* membership) { CHECK_NOTNULL(membership)->clear(); |