Combining novel fringe analysis and photogrammetry for industrial shape measurement