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 38353190FE for ; Tue, 19 Apr 2016 16:02:05 +0000 (UTC) Received: (qmail 39700 invoked by uid 500); 19 Apr 2016 16:02:05 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 39673 invoked by uid 500); 19 Apr 2016 16:02:05 -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 39664 invoked by uid 99); 19 Apr 2016 16:02:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Apr 2016 16:02:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A036C1A091B for ; Tue, 19 Apr 2016 16:02:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id PiciWu4L2ZI5 for ; Tue, 19 Apr 2016 16:02:03 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 59A075FB46 for ; Tue, 19 Apr 2016 16:02:03 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 974A5E0095 for ; Tue, 19 Apr 2016 16:02:02 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 97D513A06C1 for ; Tue, 19 Apr 2016 16:02:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1739952 - /pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Date: Tue, 19 Apr 2016 16:02:02 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160419160202.97D513A06C1@svn01-us-west.apache.org> Author: tilman Date: Tue Apr 19 16:02:02 2016 New Revision: 1739952 URL: http://svn.apache.org/viewvc?rev=1739952&view=rev Log: PDFBOX-3319: correct handling of partially monospaced fonts Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java?rev=1739952&r1=1739951&r2=1739952&view=diff ============================================================================== --- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java (original) +++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Tue Apr 19 16:02:02 2016 @@ -249,7 +249,14 @@ public final class TTFSubsetter writeSInt16(out, h.getReserved4()); writeSInt16(out, h.getReserved5()); writeSInt16(out, h.getMetricDataFormat()); - writeUint16(out, glyphIds.subSet(0, h.getNumberOfHMetrics()).size()); + + // is there a GID >= numberOfHMetrics ? Then keep the last entry of original hmtx table + int hmetrics = glyphIds.subSet(0, h.getNumberOfHMetrics()).size(); + if (glyphIds.last() >= h.getNumberOfHMetrics()) + { + ++hmetrics; + } + writeUint16(out, hmetrics); out.flush(); return bos.toByteArray(); @@ -864,11 +871,21 @@ public final class TTFSubsetter HorizontalMetricsTable hm = ttf.getHorizontalMetrics(); byte [] buf = new byte[4]; InputStream is = ttf.getOriginalData(); + + // is there a GID >= numberOfHMetrics ? Then keep the last entry of original hmtx table + SortedSet gidSet = glyphIds; + if (glyphIds.last() >= h.getNumberOfHMetrics()) + { + // Create a deep copy of the glyph set that has the last entry + gidSet = new TreeSet(glyphIds); + gidSet.add(ttf.getHorizontalHeader().getNumberOfHMetrics() - 1); + } + try { is.skip(hm.getOffset()); long lastOff = 0; - for (Integer glyphId : glyphIds) + for (Integer glyphId : gidSet) { // offset in original file long off;