From 79bbf8ff15bbb382cad9f57c56a85c72dd403eb7 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 14 Aug 2012 14:08:31 -0500 Subject: [PATCH] more filters.inplacereprojection --- src/filters/InPlaceReprojection.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/filters/InPlaceReprojection.cpp b/src/filters/InPlaceReprojection.cpp index 635ad7eccb..031c57d19c 100644 --- a/src/filters/InPlaceReprojection.cpp +++ b/src/filters/InPlaceReprojection.cpp @@ -180,25 +180,22 @@ void InPlaceReprojection::setDimension( std::string const& name, old_id = old_dim.getUUID(); new_id = derived.getUUID(); - log()->get(logDEBUG2) << "source dimension: " << old_dim << std::endl; + log()->get(logDEBUG2) << "source dimension: " << old_dim << std::endl; log()->get(logDEBUG2) << "derived dimension: " << derived << std::endl; - log()->get(logDEBUG2) << "source id: " << old_id << std::endl; + log()->get(logDEBUG2) << "source id: " << old_id << std::endl; log()->get(logDEBUG2) << "derived id: " << new_id << std::endl; bool markIgnored = getOptions().getValueOrDefault("ignore_old_dimensions", true); if (markIgnored) { - boost::optional dim = schema.getDimensionOptional(old_id); - if (dim) - { - log()->get(logDEBUG2) << "marking " << name << " as ignored with uuid " << old_id << std::endl; + Dimension const& dim = schema.getDimension(old_id); + log()->get(logDEBUG2) << "marking " << name << " as ignored with uuid " << old_id << std::endl; - Dimension d(*dim); - boost::uint32_t flags = d.getFlags(); - d.setFlags(flags | dimension::IsIgnored); - schema.setDimension(d); - } + Dimension d(dim); + boost::uint32_t flags = d.getFlags(); + d.setFlags(flags | dimension::IsIgnored); + schema.setDimension(d); } }