Merge pull request #6972 from vicproon:fix_6836_other_places
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 18 Aug 2016 09:33:07 +0000 (09:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 18 Aug 2016 09:33:07 +0000 (09:33 +0000)
1  2 
modules/calib3d/src/calibration.cpp

Simple merge