Merge pull request #7726 from pengli:warp_image
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 29 Nov 2016 12:19:18 +0000 (12:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 29 Nov 2016 12:19:18 +0000 (12:19 +0000)

Trivial merge