A new evaluation framework and image dataset for keypoint extraction and feature descriptor matching