From aa468f5c0008015cff57c1912ffdb85330ee97d1 Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Mon, 17 Feb 2020 20:09:51 -0800
Subject: [PATCH] more warning fixes

---
 benchmarking/BenchmarkRayTracing.cxx | 2 +-
 vtkm/rendering/raytracing/Camera.cxx | 8 ++++----
 vtkm/rendering/raytracing/Camera.h   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/benchmarking/BenchmarkRayTracing.cxx b/benchmarking/BenchmarkRayTracing.cxx
index 03c6e2a36..1d4e33fce 100644
--- a/benchmarking/BenchmarkRayTracing.cxx
+++ b/benchmarking/BenchmarkRayTracing.cxx
@@ -64,7 +64,7 @@ void BenchRayTracing(::benchmark::State& state)
 
   vtkm::rendering::CanvasRayTracer canvas(1920, 1080);
   vtkm::rendering::raytracing::Camera rayCamera;
-  rayCamera.SetParameters(camera, canvas.GetWidth(), canvas.GetHeight());
+  rayCamera.SetParameters(camera, vtkm::Int32(canvas.GetWidth()), vtkm::Int32(canvas.GetHeight()));
   vtkm::rendering::raytracing::Ray<vtkm::Float32> rays;
   rayCamera.CreateRays(rays, coords.GetBounds());
 
diff --git a/vtkm/rendering/raytracing/Camera.cxx b/vtkm/rendering/raytracing/Camera.cxx
index 35c1855b0..08920aee0 100644
--- a/vtkm/rendering/raytracing/Camera.cxx
+++ b/vtkm/rendering/raytracing/Camera.cxx
@@ -494,16 +494,16 @@ Camera::~Camera()
 
 VTKM_CONT
 void Camera::SetParameters(const vtkm::rendering::Camera& camera,
-                           const vtkm::Id width,
-                           const vtkm::Id height)
+                           const vtkm::Int32 width,
+                           const vtkm::Int32 height)
 {
   this->SetUp(camera.GetViewUp());
   this->SetLookAt(camera.GetLookAt());
   this->SetPosition(camera.GetPosition());
   this->SetZoom(camera.GetZoom());
   this->SetFieldOfView(camera.GetFieldOfView());
-  this->SetHeight(vtkm::Int32(height));
-  this->SetWidth(vtkm::Int32(width));
+  this->SetHeight(height);
+  this->SetWidth(width);
   this->CameraView = camera;
 }
 
diff --git a/vtkm/rendering/raytracing/Camera.h b/vtkm/rendering/raytracing/Camera.h
index 4da827e4a..cd1515e18 100644
--- a/vtkm/rendering/raytracing/Camera.h
+++ b/vtkm/rendering/raytracing/Camera.h
@@ -60,8 +60,8 @@ public:
 
   VTKM_CONT
   void SetParameters(const vtkm::rendering::Camera& camera,
-                     const vtkm::Id width,
-                     const vtkm::Id height);
+                     const vtkm::Int32 width,
+                     const vtkm::Int32 height);
 
 
   VTKM_CONT