diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-06-23 11:54:56 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-06-23 11:54:56 +0800 |
| commit | a5ee9a69ae73843bf3e620dbe474d5cdaaff5f3a (patch) | |
| tree | 3c53abf30cf620a3c2f045e2962e76829a01b8bb /java | |
| parent | 866a937540c090ff7b740d7732e46c2e8b30a36d (diff) | |
Update Android port
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java (Sdk7FontEntity):
(hasChar): Clean up dead stores.
Diffstat (limited to 'java')
| -rw-r--r-- | java/org/gnu/emacs/EmacsDrawRectangle.java | 1 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsSdk7FontDriver.java | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/java/org/gnu/emacs/EmacsDrawRectangle.java b/java/org/gnu/emacs/EmacsDrawRectangle.java index b54b031b56b..e1261b4a2d2 100644 --- a/java/org/gnu/emacs/EmacsDrawRectangle.java +++ b/java/org/gnu/emacs/EmacsDrawRectangle.java @@ -72,7 +72,6 @@ public final class EmacsDrawRectangle + clipBitmap.getWidth ()), (gc.clip_y_origin + clipBitmap.getHeight ())); - clipBitmap = gc.clip_mask.bitmap; if (!maskRect.setIntersect (dstRect, maskRect)) /* There is no intersection between the clip mask and the diff --git a/java/org/gnu/emacs/EmacsSdk7FontDriver.java b/java/org/gnu/emacs/EmacsSdk7FontDriver.java index 9122b46458a..97969585d16 100644 --- a/java/org/gnu/emacs/EmacsSdk7FontDriver.java +++ b/java/org/gnu/emacs/EmacsSdk7FontDriver.java @@ -169,8 +169,6 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver public Sdk7FontEntity (Sdk7Typeface typeface) { - float width; - foundry = "Google"; family = typeface.familyName; adstyle = null; @@ -363,7 +361,7 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver public int hasChar (FontSpec font, char charCode) { - float missingGlyphWidth, emGlyphWidth, width; + float missingGlyphWidth, width; Rect rect1, rect2; Paint paint; Sdk7FontObject fontObject; @@ -382,7 +380,6 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver return 1; missingGlyphWidth = paint.measureText (TOFU_STRING); - emGlyphWidth = paint.measureText (EM_STRING); width = paint.measureText ("" + charCode); if (width == 0f) |