PDFBOX-2576: remove use of the same code for two branches 

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