more hdr refactoring up to mrpt-slam
fixed conflicts