Merge pull request #6020 from mshabunin:hal_dxt
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Apr 2016 11:37:18 +0000 (11:37 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Apr 2016 11:37:18 +0000 (11:37 +0000)
1  2 
modules/imgproc/src/imgwarp.cpp

Simple merge