stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6753173: No need to read all the TrueType 'post' table to get underline info

Browse Source 
Reviewed-by: igor, jgodinez
This commit is contained in:
Phil Race 2009-04-02 10:16:53 -07:00
parent b2f54efed2
commit 8b6fca5d9f
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jdk/src/share/classes/sun/font/TrueTypeFont.java
View File

@ -543,17 +543,6 @@ public class TrueTypeFont extends FileFont {
ByteBuffer os2_Table = getTableBuffer(os_2Tag); ByteBuffer os2_Table = getTableBuffer(os_2Tag);
setStyle(os2_Table); setStyle(os2_Table);
setCJKSupport(os2_Table); setCJKSupport(os2_Table);
ByteBuffer head_Table = getTableBuffer(headTag);
int upem = -1;
if (head_Table != null && head_Table.capacity() >= 18) {
ShortBuffer sb = head_Table.asShortBuffer();
upem = sb.get(9) & 0xffff;
}
setStrikethroughMetrics(os2_Table, upem);
ByteBuffer post_Table = getTableBuffer(postTag);
setUnderlineMetrics(post_Table, upem);
} }
/* The array index corresponds to a bit offset in the TrueType /* The array index corresponds to a bit offset in the TrueType
@ -1011,8 +1000,26 @@ public class TrueTypeFont extends FileFont {
} }
public void getStyleMetrics(float pointSize, float[] metrics, int offset) { public void getStyleMetrics(float pointSize, float[] metrics, int offset) {
if (ulSize == 0f && ulPos == 0f) {
ByteBuffer head_Table = getTableBuffer(headTag);
int upem = -1;
if (head_Table != null && head_Table.capacity() >= 18) {
ShortBuffer sb = head_Table.asShortBuffer();
upem = sb.get(9) & 0xffff;
}
ByteBuffer os2_Table = getTableBuffer(os_2Tag);
setStrikethroughMetrics(os2_Table, upem);
ByteBuffer post_Table = getTableBuffer(postTag);
setUnderlineMetrics(post_Table, upem);
}
metrics[offset] = stPos * pointSize; metrics[offset] = stPos * pointSize;
metrics[offset+1] = stSize * pointSize; metrics[offset+1] = stSize * pointSize;
metrics[offset+2] = ulPos * pointSize; metrics[offset+2] = ulPos * pointSize;
metrics[offset+3] = ulSize * pointSize; metrics[offset+3] = ulSize * pointSize;
} }