Merge pull request #6829 from paroj:fixpp_fe
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 11 Jul 2016 16:34:36 +0000 (16:34 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 11 Jul 2016 16:34:37 +0000 (16:34 +0000)
1  2 
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/src/fisheye.cpp

Simple merge