Fix regression that broke catalog generation from the Graphical User Interface in 0.6.41
Fix right edge of comics like Dilbert and xkcd getting cut off on the SONY reader. More generally, take page margins into account when rescaling images to fit in the selected output profile.