diff options
| author | Robert Schuster <theBohemian@gmx.net> | 2007-05-25 09:48:47 +0000 |
|---|---|---|
| committer | Robert Schuster <theBohemian@gmx.net> | 2007-05-25 09:48:47 +0000 |
| commit | 62bcaaa22ba2e718349491b7f2f62f1b864fb932 (patch) | |
| tree | c0ec9d7071b8aa26c63b368f7d87ffb263d3c11f | |
| parent | 108e3d9bf97764ffd12e9f9b701d50d69b75b90a (diff) | |
| download | classpath-62bcaaa22ba2e718349491b7f2f62f1b864fb932.tar.gz | |
Fixes a NPE when displaying a JTextField with the X peers.
2007-05-25 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/awt/font/opentype/OpenTypeFont.java:
(getGlyphIndex): Call getGlyphCharMap() instead of
accessing cmap field directly.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gnu/java/awt/font/opentype/OpenTypeFont.java | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2007-05-25 Robert Schuster <robertschuster@fsfe.org> + + * gnu/java/awt/font/opentype/OpenTypeFont.java: + (getGlyphIndex): Call getGlyphCharMap() instead of + accessing cmap field directly. + 2007-05-24 Ito Kazumitsu <kaz@maczuka.gcd.org> * native/jni/java-nio/gnu_java_nio_VMChannel.c diff --git a/gnu/java/awt/font/opentype/OpenTypeFont.java b/gnu/java/awt/font/opentype/OpenTypeFont.java index 084e32166..6c2193b94 100644 --- a/gnu/java/awt/font/opentype/OpenTypeFont.java +++ b/gnu/java/awt/font/opentype/OpenTypeFont.java @@ -626,7 +626,7 @@ public final class OpenTypeFont */ public int getGlyphIndex(int c) { - return cmap.getGlyph(c); + return getCharGlyphMap().getGlyph(c); } /** |