PDFBOX-1718: use a given CIDToGID mapping, rearranged some code

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1525637 13f79535-47bb-0310-9956-ffa450edef68