[Emacs-diffs] trunk r117476: * font.h (struct font_driver): Remove get_outline and free_outline;

[Dmitry Antipov]

------------------------------------------------------------
revno: 117476
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2014-07-04 06:28:54 +0400
message:
  * font.h (struct font_driver): Remove get_outline and free_outline;
  not used by any font driver.
  * ftfont.c (ftfont_driver):
  * macfont.m (macfont_driver):
  * nsfont.m (nsfont_driver):
  * w32font.c (w32font_driver):
  * w32uniscribe.c (uniscribe_font_driver):
  * xfont.c (xfont_driver): Related users changed.
  * xselect.c (x_get_window_property): Use convenient xmalloc.
  Call to xfree only if some data was really allocated.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.h                     font.h-20091113204419-o5vbwnq5f7feedwu-8541
  src/ftfont.c                   ftfont.c-20091113204419-o5vbwnq5f7feedwu-8542
  src/macfont.m                  macfont.m-20130915173740-04lgloz0557bz98l-2
  src/nsfont.m                   nsfont.m-20091113204419-o5vbwnq5f7feedwu-8748
  src/w32font.c                  w32font.c-20091113204419-o5vbwnq5f7feedwu-8545
  src/w32uniscribe.c             
w32uniscribe.c-20091113204419-o5vbwnq5f7feedwu-8619
  src/xfont.c                    xfont.c-20091113204419-o5vbwnq5f7feedwu-8547
  src/xselect.c                  xselect.c-20091113204419-o5vbwnq5f7feedwu-543

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-03 18:12:41 +0000
+++ b/src/ChangeLog     2014-07-04 02:28:54 +0000
@@ -1,3 +1,16 @@
+2014-07-04  Dmitry Antipov  <address@hidden>
+
+       * font.h (struct font_driver): Remove get_outline and free_outline;
+       not used by any font driver.
+       * ftfont.c (ftfont_driver):
+       * macfont.m (macfont_driver):
+       * nsfont.m (nsfont_driver):
+       * w32font.c (w32font_driver):
+       * w32uniscribe.c (uniscribe_font_driver):
+       * xfont.c (xfont_driver): Related users changed.
+       * xselect.c (x_get_window_property): Use convenient xmalloc.
+       Call to xfree only if some data was really allocated.
+
 2014-07-03  Dmitry Antipov  <address@hidden>
 
        On MS-Windows, display busy cursor on all GUI frames.

=== modified file 'src/font.h'
--- a/src/font.h        2014-07-03 12:20:00 +0000
+++ b/src/font.h        2014-07-04 02:28:54 +0000
@@ -614,15 +614,6 @@
 #endif /* HAVE_WINDOW_SYSTEM */
 
   /* Optional.
-     Return an outline data for glyph-code CODE of FONT.  The format
-     of the outline data depends on the font-driver.  */
-  void *(*get_outline) (struct font *font, unsigned code);
-
-  /* Optional.
-     Free OUTLINE (that is obtained by the above method).  */
-  void (*free_outline) (struct font *font, void *outline);
-
-  /* Optional.
      Get coordinates of the INDEXth anchor point of the glyph whose
      code is CODE.  Store the coordinates in *X and *Y.  Return 0 if
      the operations was successful.  Otherwise return -1.  */

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2014-06-17 16:09:19 +0000
+++ b/src/ftfont.c      2014-07-04 02:28:54 +0000
@@ -538,8 +538,6 @@
     NULL,                      /* draw */
     ftfont_get_bitmap,
     NULL,                      /* free_bitmap */
-    NULL,                      /* get_outline */
-    NULL,                      /* free_outline */
     ftfont_anchor_point,
 #ifdef HAVE_LIBOTF
     ftfont_otf_capability,

=== modified file 'src/macfont.m'
--- a/src/macfont.m     2014-06-11 17:57:51 +0000
+++ b/src/macfont.m     2014-07-04 02:28:54 +0000
@@ -1580,8 +1580,6 @@
     macfont_draw,
     NULL,                      /* get_bitmap */
     NULL,                      /* free_bitmap */
-    NULL,                      /* get_outline */
-    NULL,                      /* free_outline */
     NULL,                      /* anchor_point */
     NULL,                      /* otf_capability */
     NULL,                      /* otf_drive */

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2014-05-25 10:28:52 +0000
+++ b/src/nsfont.m      2014-07-04 02:28:54 +0000
@@ -649,7 +649,7 @@
     nsfont_encode_char,
     nsfont_text_extents,
     nsfont_draw,
-    /* excluded: get_bitmap, free_bitmap, get_outline, free_outline,
+    /* excluded: get_bitmap, free_bitmap,
                  anchor_point, otf_capability, otf_driver,
                 start_for_frame, end_for_frame, shape */
   };

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2014-01-19 15:42:48 +0000
+++ b/src/w32font.c     2014-07-04 02:28:54 +0000
@@ -757,19 +757,6 @@
 static void
 w32font_free_bitmap (struct font *font, struct font_bitmap *bitmap);
   */
-/* w32 implementation of get_outline for font backend.
-   Optional.
-   Return an outline data for glyph-code CODE of FONT.  The format
-   of the outline data depends on the font-driver.
-static void *
-w32font_get_outline (struct font *font, unsigned code);
-  */
-/* w32 implementation of free_outline for font backend.
-   Optional.
-   Free OUTLINE (that is obtained by the above method).
-static void
-w32font_free_outline (struct font *font, void *outline);
-  */
 /* w32 implementation of anchor_point for font backend.
    Optional.
    Get coordinates of the INDEXth anchor point of the glyph whose
@@ -2557,8 +2544,6 @@
     w32font_draw,
     NULL, /* get_bitmap */
     NULL, /* free_bitmap */
-    NULL, /* get_outline */
-    NULL, /* free_outline */
     NULL, /* anchor_point */
     NULL, /* otf_capability */
     NULL, /* otf_drive */

=== modified file 'src/w32uniscribe.c'
--- a/src/w32uniscribe.c        2014-01-01 07:43:34 +0000
+++ b/src/w32uniscribe.c        2014-07-04 02:28:54 +0000
@@ -604,8 +604,6 @@
    int uniscribe_get_bitmap (struct font *font, unsigned code,
                              struct font_bitmap *bitmap, int bits_per_pixel);
    void uniscribe_free_bitmap (struct font *font, struct font_bitmap *bitmap);
-   void * uniscribe_get_outline (struct font *font, unsigned code);
-   void uniscribe_free_outline (struct font *font, void *outline);
    int uniscribe_anchor_point (struct font *font, unsigned code,
                                int index, int *x, int *y);
    int uniscribe_start_for_frame (struct frame *f);
@@ -981,8 +979,6 @@
     w32font_draw,
     NULL, /* get_bitmap */
     NULL, /* free_bitmap */
-    NULL, /* get_outline */
-    NULL, /* free_outline */
     NULL, /* anchor_point */
     uniscribe_otf_capability, /* Defined so (font-get FONTOBJ :otf) works.  */
     NULL, /* otf_drive - use shape instead.  */

=== modified file 'src/xfont.c'
--- a/src/xfont.c       2014-06-10 03:32:36 +0000
+++ b/src/xfont.c       2014-07-04 02:28:54 +0000
@@ -146,7 +146,7 @@
     xfont_encode_char,
     xfont_text_extents,
     xfont_draw,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     xfont_check,
     NULL, /* get_variation_glyphs */
     NULL, /* filter_properties */

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2014-06-22 05:00:14 +0000
+++ b/src/xselect.c     2014-07-04 02:28:54 +0000
@@ -1299,9 +1299,7 @@
   if (total_size_max < bytes_remaining)
     goto size_overflow;
   total_size = bytes_remaining;
-  data = malloc (total_size + 1);
-  if (! data)
-    goto memory_exhausted;
+  data = xmalloc (total_size + 1);
 
   /* Now read, until we've gotten it all.  */
   while (bytes_remaining)
@@ -1352,9 +1350,7 @@
          if (remaining_lim < 0 || remaining_lim < bytes_remaining)
            goto size_overflow;
          total_size = offset + bytes_gotten + bytes_remaining;
-         data1 = realloc (data, total_size + 1);
-         if (! data1)
-           goto memory_exhausted;
+         data1 = xrealloc (data, total_size + 1);
          data = data1;
        }
 
@@ -1386,14 +1382,10 @@
   return;
 
  size_overflow:
-  free (data);
+  if (data)
+    xfree (data);
   unblock_input ();
   memory_full (SIZE_MAX);
-
- memory_exhausted:
-  free (data);
-  unblock_input ();
-  memory_full (total_size + 1);
 }
 
 /* Use xfree, not XFree, to free the data obtained with this function.  */