Update Android port

* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java (Sdk7FontEntity):
(hasChar): Clean up dead stores.

diff --git a/java/org/gnu/emacs/EmacsDrawRectangle.java b/java/org/gnu/emacs/EmacsDrawRectangle.java
index b54b031b56b78257e4d5f84f58377129808bbba4..e1261b4a2d2cda7eff879148f403ecc1bd42737d 100644 (file)
--- 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 9122b46458a281057ea216b669938057a1f3f043..97969585d1605fca5730e07ab11e7da4b60251f2 100644 (file)
--- 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)