A Parameterless Line Segment and Elliptical Arc Detector with Enhanced Ellipse Fitting