Revered some merge changes and added getStraightLine() to MagickSource
Merge branch 'line'