From f611b0b4dffdca2c489cddbb452d58f06b133640 Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Thu, 9 Feb 2017 11:02:03 -0800
Subject: [PATCH 1/5] Fixing the include in the rendering library

---
 vtkm/rendering/Color.h      | 2 +-
 vtkm/rendering/ColorTable.h | 2 +-
 vtkm/rendering/Mapper.h     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vtkm/rendering/Color.h b/vtkm/rendering/Color.h
index be1422dc3..0f43c0bd2 100644
--- a/vtkm/rendering/Color.h
+++ b/vtkm/rendering/Color.h
@@ -21,7 +21,7 @@
 #define vtk_m_rendering_Color_h
 
 #include <iostream>
-#include <vtkm/cont/DataSet.h>
+#include <vtkm/Types.h>
 namespace vtkm {
 namespace rendering {
 
diff --git a/vtkm/rendering/ColorTable.h b/vtkm/rendering/ColorTable.h
index 2c80abdb0..d1e1fa7ff 100644
--- a/vtkm/rendering/ColorTable.h
+++ b/vtkm/rendering/ColorTable.h
@@ -20,8 +20,8 @@
 #ifndef vtk_m_rendering_ColorTable_h
 #define vtk_m_rendering_ColorTable_h
 
+#include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/rendering/vtkm_rendering_export.h>
-
 #include <vtkm/rendering/Color.h>
 
 #include <memory>
diff --git a/vtkm/rendering/Mapper.h b/vtkm/rendering/Mapper.h
index bcbba0f50..cffa7057c 100644
--- a/vtkm/rendering/Mapper.h
+++ b/vtkm/rendering/Mapper.h
@@ -20,6 +20,9 @@
 #ifndef vtk_m_rendering_Mapper_h
 #define vtk_m_rendering_Mapper_h
 
+#include <vtkm/cont/CoordinateSystem.h>
+#include <vtkm/cont/DynamicCellSet.h>
+#include <vtkm/cont/Field.h>
 #include <vtkm/rendering/Camera.h>
 #include <vtkm/rendering/Canvas.h>
 #include <vtkm/rendering/ColorTable.h>

From bee68682540a8217c768dfa66b14d9fa1d3d3717 Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Thu, 9 Feb 2017 11:02:03 -0800
Subject: [PATCH 2/5] Fixing the include in the rendering library

---
 vtkm/rendering/Color.h      | 2 +-
 vtkm/rendering/ColorTable.h | 2 +-
 vtkm/rendering/Mapper.h     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vtkm/rendering/Color.h b/vtkm/rendering/Color.h
index be1422dc3..0f43c0bd2 100644
--- a/vtkm/rendering/Color.h
+++ b/vtkm/rendering/Color.h
@@ -21,7 +21,7 @@
 #define vtk_m_rendering_Color_h
 
 #include <iostream>
-#include <vtkm/cont/DataSet.h>
+#include <vtkm/Types.h>
 namespace vtkm {
 namespace rendering {
 
diff --git a/vtkm/rendering/ColorTable.h b/vtkm/rendering/ColorTable.h
index 2c80abdb0..d1e1fa7ff 100644
--- a/vtkm/rendering/ColorTable.h
+++ b/vtkm/rendering/ColorTable.h
@@ -20,8 +20,8 @@
 #ifndef vtk_m_rendering_ColorTable_h
 #define vtk_m_rendering_ColorTable_h
 
+#include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/rendering/vtkm_rendering_export.h>
-
 #include <vtkm/rendering/Color.h>
 
 #include <memory>
diff --git a/vtkm/rendering/Mapper.h b/vtkm/rendering/Mapper.h
index bcbba0f50..cffa7057c 100644
--- a/vtkm/rendering/Mapper.h
+++ b/vtkm/rendering/Mapper.h
@@ -20,6 +20,9 @@
 #ifndef vtk_m_rendering_Mapper_h
 #define vtk_m_rendering_Mapper_h
 
+#include <vtkm/cont/CoordinateSystem.h>
+#include <vtkm/cont/DynamicCellSet.h>
+#include <vtkm/cont/Field.h>
 #include <vtkm/rendering/Camera.h>
 #include <vtkm/rendering/Canvas.h>
 #include <vtkm/rendering/ColorTable.h>

From 9f074e4ad8ed7590d1c7a8acbe7865eeaeb71e3e Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Thu, 9 Feb 2017 12:47:02 -0800
Subject: [PATCH 3/5] Removing typename from typdef declaration in the volume
 renderer

---
 vtkm/rendering/raytracing/VolumeRendererStructured.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h
index 9a6bee8bb..cf35b4af7 100644
--- a/vtkm/rendering/raytracing/VolumeRendererStructured.h
+++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h
@@ -43,7 +43,7 @@ class VolumeRendererStructured
 {
 public:
   typedef vtkm::cont::ArrayHandle<vtkm::FloatDefault> DefaultHandle;
-  typedef typename vtkm::cont::ArrayHandleCartesianProduct<DefaultHandle,DefaultHandle,DefaultHandle> CartesianArrayHandle;
+  typedef vtkm::cont::ArrayHandleCartesianProduct<DefaultHandle,DefaultHandle,DefaultHandle> CartesianArrayHandle;
 
   class Sampler : public vtkm::worklet::WorkletMapField
   {

From 59020fe98f337e88cb67502e010383b2591e3c19 Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Thu, 9 Feb 2017 12:51:46 -0800
Subject: [PATCH 4/5] Adding several more includes to the volume renderer

---
 vtkm/rendering/raytracing/VolumeRendererStructured.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h
index cf35b4af7..846ded80e 100644
--- a/vtkm/rendering/raytracing/VolumeRendererStructured.h
+++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h
@@ -25,7 +25,9 @@
 #include <math.h>
 #include <iostream>
 #include <stdio.h>
+#include <vtkm/cont/ArrayHandleCartesianProduct.h>
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
+#include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/ErrorBadValue.h>
 #include <vtkm/rendering/ColorTable.h>
 #include <vtkm/rendering/raytracing/Ray.h>

From bd845f01d63c54236f99e1765285cc5374633291 Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Thu, 9 Feb 2017 13:00:08 -0800
Subject: [PATCH 5/5] Adding coordinate system include to the volume renderer

---
 vtkm/rendering/raytracing/VolumeRendererStructured.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h
index 846ded80e..9ac686d6c 100644
--- a/vtkm/rendering/raytracing/VolumeRendererStructured.h
+++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h
@@ -28,6 +28,7 @@
 #include <vtkm/cont/ArrayHandleCartesianProduct.h>
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
 #include <vtkm/cont/CellSetStructured.h>
+#include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/ErrorBadValue.h>
 #include <vtkm/rendering/ColorTable.h>
 #include <vtkm/rendering/raytracing/Ray.h>