summaryrefslogtreecommitdiffstats
path: root/libjava/java/awt/FontMetrics.java
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-04-20 11:13:09 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-04-20 11:13:09 +0000
commit77090107412af73369ca78ff37cc42ab7072570b (patch)
tree3d1d46584dcbc5ef07de3e01050fdd01c2d9563e /libjava/java/awt/FontMetrics.java
parentaf6337071c86ef61ef9aabefc5426b34ec7e91fe (diff)
downloadppe42-gcc-77090107412af73369ca78ff37cc42ab7072570b.tar.gz
ppe42-gcc-77090107412af73369ca78ff37cc42ab7072570b.zip
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80894 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/awt/FontMetrics.java')
-rw-r--r--libjava/java/awt/FontMetrics.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/libjava/java/awt/FontMetrics.java b/libjava/java/awt/FontMetrics.java
index 6a1a1c09ce1..cb76f507909 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
+
OpenPOWER on IntegriCloud