Fixes  #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
Fixed doc for Bug #3887

Fixed doc for Bug #3887
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.

Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
Merge pull request #3319 from Trundle:tiff_infinite_rowsperstrip
Merge pull request #3316 from nisargthakkar:Bug3887
Merge pull request #3311 from BarneyBear:2.4-drawMatches-flag-fix