The scaling parameters for nonuniform sampling were miscomputed for
the first/last point in closed curves.  Also, the code for generating
a straight line segment for data with just two points was both
unnecessary and incorrect, it ignored the possibility of end-point
derivatives generating a curve from just the two points.

Change-Id: I5229b839d6d70ba5c44a0fbea45b82ea050d6327