In a machine-fed scanner, orientation angles of edges of an image bearing substrate are obtained and used to calculate image shear and/or skew. A running weighted average of the image skew may be kept in a memory. When a skew value is obtained for a given image, it may be determined whether the skew value is within a predetermined range. If the skew value is within the predetermined range, the skew value is used to determine an image revision to compensate for the skew, and the skew value is incorporated into the running weighted average skew. If the skew value is not within the predetermined range, it is discarded and the running weighted average skew is used to determine an appropriate image skew revision. The running weighted average of the shear may also be kept in a memory. A shear value is obtained for each image, and incorporated into the running weighted average shear. Shear revision is performed based on the running weighted average shear. A determination may be made whether the shear value for a current image is within a predetermined range, and the running weighted average shear may be updated based on the shear value for the current image if the shear value for the current image is within the predetermined range.