A 2-D scanning system uses a fast-rotating raster-polygon as a single scanning component to produce straight scan lines over a 2-D image surface. An approach angle of incident light beams to the raster-polygon is selected to minimize pin-cushion distortion of scan lines introduced by polygon scanning on the image surface, and a tilt angle of the rotational axis of the raster-polygon is selected to position said polygon-scanning distortion symmetrically on the image surface. In addition, scan optics are configured to generate a predetermined amount of barrel distortion of scan lines on the image surface to compensate for pin-cushion distortion introduced by polygon scanning.