Itseez/opencv — pull request #3311 by BarneyBear (2014-10-07 07:50:18+00:00)
Title: Fixes  #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed ...

Flags in the _prepareImgAndDrawKeypoints were incorrectly added rather than OR'd together. This has now been fixed.