Contour Matching in Image-based CAD using B-splines and Digital Geometry