Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EA030200BBD for ; Tue, 8 Nov 2016 17:58:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E8C40160B0A; Tue, 8 Nov 2016 16:58:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 44D10160AD0 for ; Tue, 8 Nov 2016 17:58:20 +0100 (CET) Received: (qmail 53918 invoked by uid 500); 8 Nov 2016 16:58:19 -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 53909 invoked by uid 99); 8 Nov 2016 16:58:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2016 16:58:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id D352EC0748 for ; Tue, 8 Nov 2016 16:58:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id cNw2aI_UpLOE for ; Tue, 8 Nov 2016 16:58:16 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 8435B5F247 for ; Tue, 8 Nov 2016 16:58:16 +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 74746E0057 for ; Tue, 8 Nov 2016 16:57:45 +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 74BE43A19F6 for ; Tue, 8 Nov 2016 16:57:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1768738 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Date: Tue, 08 Nov 2016 16:57:45 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161108165745.74BE43A19F6@svn01-us-west.apache.org> archived-at: Tue, 08 Nov 2016 16:58:21 -0000 Author: tilman Date: Tue Nov 8 16:57:45 2016 New Revision: 1768738 URL: http://svn.apache.org/viewvc?rev=1768738&view=rev Log: PDFBOX-2852: remove unneeded segment, as suggested by Lorenz Pahl; improve javadoc Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java?rev=1768738&r1=1768737&r2=1768738&view=diff ============================================================================== --- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java (original) +++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Tue Nov 8 16:57:45 2016 @@ -140,10 +140,11 @@ public final class PDType3CharProc imple } /** - * todo. - * - * @return - * @throws IOException + * Get the width from a type3 charproc stream. + * + * @return the glyph width. + * @throws IOException if the stream could not be read, or did not have d0 or d1 as first + * operator, or if their first argument was not a number. */ public float getWidth() throws IOException { @@ -173,19 +174,12 @@ public final class PDType3CharProc imple { if (operator.getName().equals("d0") || operator.getName().equals("d1")) { - Object obj = arguments.get(0); - if (obj instanceof Number) - { - return ((Number) obj).floatValue(); - } - else if (obj instanceof COSNumber) + COSBase obj = arguments.get(0); + if (obj instanceof COSNumber) { return ((COSNumber) obj).floatValue(); } - else - { - throw new IOException("Unexpected argument type: " + obj.getClass().getName()); - } + throw new IOException("Unexpected argument type: " + obj.getClass().getName()); } else {