Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 825AA11648 for ; Fri, 19 Sep 2014 22:21:08 +0000 (UTC) Received: (qmail 66856 invoked by uid 500); 19 Sep 2014 22:21:08 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 66783 invoked by uid 500); 19 Sep 2014 22:21:08 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 66768 invoked by uid 99); 19 Sep 2014 22:21:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2014 22:21:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2014 22:21:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2DBBB2388A33; Fri, 19 Sep 2014 22:20:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1626354 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Date: Fri, 19 Sep 2014 22:20:47 -0000 To: commits@pdfbox.apache.org From: jahewson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140919222047.2DBBB2388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jahewson Date: Fri Sep 19 22:20:46 2014 New Revision: 1626354 URL: http://svn.apache.org/r1626354 Log: PDFBOX-2367: Use un-mapped glyph names when accessing AFM metrics Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1626354&r1=1626353&r2=1626354&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Fri Sep 19 22:20:46 2014 @@ -303,7 +303,8 @@ public class PDType1Font extends PDSimpl String name = codeToName(code); if (afm != null) { - return afm.getCharacterHeight(name); // todo: isn't this the y-advance, not the height? + String afmName = getEncoding().getName(code); + return afm.getCharacterHeight(afmName); // todo: isn't this the y-advance, not the height? } else { @@ -317,7 +318,8 @@ public class PDType1Font extends PDSimpl String name = codeToName(code); if (afm != null) { - return afm.getCharacterWidth(name); + String afmName = getEncoding().getName(code); + return afm.getCharacterWidth(afmName); } else {