some correction to make xfeature2d compilation work and adding 2d cuda features back
Merge pull request #72 from ernest-galbrun/compilation_errors_xfeatures2d

some correction to make xfeature2d compilation work and adding 2d cuda f...