Merge pull request #7755 from pengli:warp_image
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 30 Nov 2016 20:43:11 +0000 (20:43 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 30 Nov 2016 20:43:11 +0000 (20:43 +0000)

Trivial merge