Merge "JPEG/R: fix a recovery map calculation bug"