From 45d567617757900b9760a9cfd24fdf90adae1fee Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Tue, 10 Oct 2017 11:27:29 -0400
Subject: [PATCH] Minor compile fixes

---
 modules/galaxy/rendering/renderablegalaxy.cpp   | 2 +-
 modules/galaxy/rendering/renderablegalaxy.h     | 2 +-
 modules/galaxy/tasks/milkywayconversiontask.cpp | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index f01aff865c..8802f3bf86 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -158,7 +158,7 @@ void RenderableGalaxy::initialize() {
     _aspect = static_cast<glm::vec3>(_volumeDimensions);
     _aspect = _aspect / std::max(std::max(_aspect.x, _aspect.y), _aspect.z);
 
-    RawVolumeReader<glm::tvec4<GLfloat>> reader(_volumeFilename, _volumeDimensions);
+    volume::RawVolumeReader<glm::tvec4<GLfloat>> reader(_volumeFilename, _volumeDimensions);
     _volume = reader.read();
     
     _texture = std::make_unique<ghoul::opengl::Texture>(
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index cb398be19c..638ba8690b 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -63,7 +63,7 @@ private:
     std::string _pointsFilename;
 
     std::unique_ptr<GalaxyRaycaster> _raycaster;
-    std::unique_ptr<RawVolume<glm::tvec4<GLfloat>>> _volume;
+    std::unique_ptr<volume::RawVolume<glm::tvec4<GLfloat>>> _volume;
     std::unique_ptr<ghoul::opengl::Texture> _texture;
     glm::mat4 _pointTransform;
     glm::vec3 _aspect;
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index 9a32d4cce8..f850cf42b1 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -83,6 +83,8 @@ std::string MilkywayConversionTask::description()
 }
 
 void MilkywayConversionTask::perform(const Task::ProgressCallback& progressCallback) {
+    using namespace openspace::volume;
+
     std::vector<std::string> filenames;
     for (int i = 0; i < _inNSlices; i++) {
         filenames.push_back(_inFilenamePrefix + std::to_string(i + _inFirstIndex) + _inFilenameSuffix);