X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fglyphs.c;h=92fe5a885a4606a61099ca18715c507d5d42aab3;hb=c1b778278af87064688c8ef8477f58bcbdbfae16;hp=4494fc800620701c1f14e6f48fd685a76eceefe2;hpb=3062d425fac0473eb5aa2efc0bb002f6ce0cb028;p=chise%2Fxemacs-chise.git-

diff --git a/src/glyphs.c b/src/glyphs.c
index 4494fc8..92fe5a8 100644
--- a/src/glyphs.c
+++ b/src/glyphs.c
@@ -2265,11 +2265,13 @@ query_string_geometry (Lisp_Object string, Lisp_Object face,
 		       int* width, int* height, int* descent, Lisp_Object domain)
 {
   struct font_metric_info fm;
-  unsigned char charsets[NUM_LEADING_BYTES];
+  Charset_ID charsets[NUM_LEADING_BYTES];
   struct face_cachel frame_cachel;
   struct face_cachel *cachel;
   Lisp_Object frame = DOMAIN_FRAME (domain);
 
+  CHECK_STRING (string);
+
   /* Compute height */
   if (height)
     {
@@ -2317,7 +2319,7 @@ query_string_geometry (Lisp_Object string, Lisp_Object face,
 Lisp_Object
 query_string_font (Lisp_Object string, Lisp_Object face, Lisp_Object domain)
 {
-  unsigned char charsets[NUM_LEADING_BYTES];
+  Charset_ID charsets[NUM_LEADING_BYTES];
   struct face_cachel frame_cachel;
   struct face_cachel *cachel;
   int i;
@@ -4421,9 +4423,9 @@ check_for_ignored_expose (struct frame* f, int x, int y, int width, int height)
 	 we have to check for overlaps. Being conservative, we will
 	 check for exposures wholly contained by the subwindow - this
 	 might give us what we want.*/
-      if (ei->x <= x && ei->y <= y
-	  && ei->x + ei->width >= x + width
-	  && ei->y + ei->height >= y + height)
+      if (ei->x <= (unsigned) x && ei->y <= (unsigned) y
+	  && ei->x + ei->width >= (unsigned) (x + width)
+	  && ei->y + ei->height >= (unsigned) (y + height))
 	{
 #ifdef DEBUG_WIDGETS
 	  stderr_out ("ignored %d+%d, %dx%d for exposure %d+%d, %dx%d\n",
@@ -4491,15 +4493,15 @@ int find_matching_subwindow (struct frame* f, int x, int y, int width, int heigh
 
       if (IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii)
 	  &&
-	  IMAGE_INSTANCE_DISPLAY_X (ii) <= x
+	  IMAGE_INSTANCE_DISPLAY_X (ii) <= (unsigned) x
 	  &&
-	  IMAGE_INSTANCE_DISPLAY_Y (ii) <= y
+	  IMAGE_INSTANCE_DISPLAY_Y (ii) <= (unsigned) y
 	  &&
 	  IMAGE_INSTANCE_DISPLAY_X (ii)
-	  + IMAGE_INSTANCE_DISPLAY_WIDTH (ii) >= x + width
+	  + IMAGE_INSTANCE_DISPLAY_WIDTH (ii) >= (unsigned) (x + width)
 	  &&
 	  IMAGE_INSTANCE_DISPLAY_Y (ii)
-	  + IMAGE_INSTANCE_DISPLAY_HEIGHT (ii) >= y + height)
+	  + IMAGE_INSTANCE_DISPLAY_HEIGHT (ii) >= (unsigned) (y + height))
 	{
 	  return 1;
 	}