The invention relates to 2-D straight-scan on an imaging surface with a raster polygon. A 2-D scanning system uses a rotating raster-polygon 150 as a single scanning component to produce straight scan lines over a 2-D image surface 110. Scan optics 160 including a lens 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. An approach angle 141 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 157 of the rotational axis of the raster-polygon is selected to position said polygon-scanning distortion symmetrically on the image surface.