From d381964d12508366c4909a7d3e257431771ae014 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Thu, 14 Dec 2023 10:42:21 +0000 Subject: [PATCH] PDFBOX-5660: put font name in exception text git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1914654 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java | 6 +++--- .../java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java index 3cdedef6d0e..b67bc2d8db8 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java @@ -401,8 +401,8 @@ protected byte[] encode(int unicode) throws IOException if (!encoding.contains(getGlyphList().codePointToName(unicode))) { throw new IllegalArgumentException( - String.format("U+%04X is not available in this font's encoding: %s", - unicode, encoding.getEncodingName())); + String.format("U+%04X is not available in font %s encoding: %s", + unicode, getName(), encoding.getEncodingName())); } String name = getGlyphList().codePointToName(unicode); @@ -438,7 +438,7 @@ protected byte[] encode(int unicode) throws IOException if (code == null) { throw new IllegalArgumentException( - String.format("U+%04X is not available in this font's Encoding", unicode)); + String.format("U+%04X is not available in font %s encoding", unicode, getName())); } return new byte[] { (byte)(int)code }; diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java index a93233adb83..a97de750f09 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java @@ -393,8 +393,8 @@ protected byte[] encode(int unicode) throws IOException if (!encoding.contains(name)) { throw new IllegalArgumentException( - String.format("U+%04X ('%s') is not available in this font's encoding: %s", - unicode, name, encoding.getEncodingName())); + String.format("U+%04X ('%s') is not available in font %s encoding: %s", + unicode, name, getName(), encoding.getEncodingName())); } String nameInFont = getNameInFont(name);