diff options
| author | Michael Koch <mkoch@gcc.gnu.org> | 2004-04-20 11:13:09 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-04-20 11:13:09 +0000 |
| commit | 23f0ecff4a6e9c554e4ddddf59d022e632810a72 (patch) | |
| tree | 3d1d46584dcbc5ef07de3e01050fdd01c2d9563e /libjava/java/awt/FontMetrics.java | |
| parent | 2c4d54e6d07a0b3aab74c0a5bafe55f49dabb86d (diff) | |
| download | gcc-23f0ecff4a6e9c554e4ddddf59d022e632810a72.zip gcc-23f0ecff4a6e9c554e4ddddf59d022e632810a72.tar.gz gcc-23f0ecff4a6e9c554e4ddddf59d022e632810a72.tar.bz2 | |
[multiple changes]
2004-04-20 Ingo Proetel <proetel@aicas.com>
* java/awt/FontMetrics.java:
(charsWidth): fixed accumulation of total_width
(getWidth): simple default implementation
* java/awt/Polygon.java (getBoundingBox): Use correct y-coordinate
in Rectangle constructor.
* java/awt/image/Raster.java (toString): Added method.
* java/awt/image/SampleModel.java (<init>): Added error cause
information to thrown exception.
* java/awt/image/SinglePixelPackedSampleModel.java (getDataElements):
New method.
(setDataElements): New method.
(setPixels): New method.
(toString): New method.
2004-04-20 Sascha Brawer <brawer@dandelis.ch>
* java/awt/image/ComponentColorModel.java
(createCompatibleSampleModel): Return PixelInterleavedSampleModel
for TYPE_BYTE and TYPE_USHORT transferTypes, in order to pass the
Mauve tests on this method. Improved documentation.
From-SVN: r80894
Diffstat (limited to 'libjava/java/awt/FontMetrics.java')
| -rw-r--r-- | libjava/java/awt/FontMetrics.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libjava/java/awt/FontMetrics.java b/libjava/java/awt/FontMetrics.java index 6a1a1c0..cb76f50 100644 --- a/libjava/java/awt/FontMetrics.java +++ b/libjava/java/awt/FontMetrics.java @@ -292,8 +292,7 @@ charsWidth(char buf[], int offset, int len) { int total_width = 0; for (int i = offset; i < len; i++) - total_width = charWidth(buf[i]); - + total_width += charWidth(buf[i]); return(total_width); } @@ -328,7 +327,12 @@ bytesWidth(byte buf[], int offset, int len) public int[] getWidths() { - return(new int[256]); + int [] result = new int[256]; + for(char i = 0; i < 256; i++) + { + result[i]= charWidth(i); + } + return(result); } /*************************************************************************/ @@ -347,3 +351,4 @@ toString() } // class FontMetrics + |