untabified UpscalerBase.hpp and UpscalerBase_impl.hpp