Contour2D, label freq improvement

Don't leave a tiny segment at the end of a contour strip when rendering multiple labels.  Should be a little more efficient, and hopefully fixes a problem Yuan reported: some missing
contour lines segment when label freq=high.