Merge topic 'Allow-custom-range-in-histogram-filter'

5393745e Allow histogram filter to take custom types
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1261

docs/changelog/Allow-custom-range-in-histogram-filter.md

+#Allow histogram filter to take custom types
+
+By passing TypeList and StorageList type into FieldRangeGlobalCompute,
+upstream users(VTK) can pass custom types into the histogram filter.

vtkm/filter/Histogram.hxx

@@ -232,14 +232,19 @@ template <typename DerivedPolicy>
 inline VTKM_CONT void Histogram::PreExecute(const vtkm::cont::MultiBlock& input,
                                             const vtkm::filter::PolicyBase<DerivedPolicy>&)
 {
+  using TypeList = typename DerivedPolicy::FieldTypeList;
+  using StorageList = typename DerivedPolicy::FieldStorageList;
   if (this->Range.IsNonEmpty())
   {
     this->ComputedRange = this->Range;
   }
   else
   {
-    auto handle = vtkm::cont::FieldRangeGlobalCompute(
-      input, this->GetActiveFieldName(), this->GetActiveFieldAssociation());
+    auto handle = vtkm::cont::FieldRangeGlobalCompute(input,
+                                                      this->GetActiveFieldName(),
+                                                      this->GetActiveFieldAssociation(),
+                                                      TypeList(),
+                                                      StorageList());
     if (handle.GetNumberOfValues() != 1)
     {
       throw vtkm::cont::ErrorFilterExecution("expecting scalar field.");