PDFBOX-1915: use the hash maps of types 6 and 7 for types 4 and 5, as done by Shaola Ren in GSoC2014

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