Change descriptor to use mask.DiamondOffset
Move mask back into cv.