Merge pull request #1141 from szukw000/changes-in-pnmtoimage