imgproc: IPP compilation fix and minor cleanup
Merge pull request #2030 from LeszekSwirski:fix-imgproc-ipp