From 5bf729dca9f71e54f1e332446f6ee147d67db2c6 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 25 Feb 2017 18:40:34 -0500 Subject: [PATCH] Compile fix for Dataconverter --- modules/volume/textureslicevolumereader.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl index a7d2b09100..6a3513383e 100644 --- a/modules/volume/textureslicevolumereader.inl +++ b/modules/volume/textureslicevolumereader.inl @@ -29,7 +29,7 @@ namespace openspace { template VoxelType TextureSliceVolumeReader::get(const glm::ivec3& coordinates) const { ghoul::opengl::Texture& slice = getSlice(coordinates.z); - return slice.texel(coordinates.xy()); + return slice.texel(glm::ivec2(coordinates)); } template @@ -52,7 +52,7 @@ void TextureSliceVolumeReader::initialize() { std::shared_ptr firstSlice = ghoul::io::TextureReader::ref().loadTexture(_paths[0]); - _sliceDimensions = firstSlice->dimensions().xy(); + _sliceDimensions = firstSlice->dimensions(); _initialized = true; _cache.set(0, firstSlice); } @@ -72,7 +72,7 @@ ghoul::opengl::Texture& TextureSliceVolumeReader::getSlice(int sliceI std::shared_ptr texture = ghoul::io::TextureReader::ref().loadTexture(_paths[sliceIndex]); - glm::ivec2 dims = texture->dimensions().xy(); + glm::ivec2 dims = texture->dimensions(); ghoul_assert(dims == _sliceDimensions, "Slice dimensions do not agree."); _cache.set(sliceIndex, std::move(texture)); }