diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/ftcrfont.c | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/ftcrfont.c')
| -rw-r--r-- | src/ftcrfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftcrfont.c b/src/ftcrfont.c index d72005771ec..9b592e6a740 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c | |||
| @@ -81,9 +81,9 @@ ftcrfont_glyph_extents (struct font *font, | |||
| 81 | ftcrfont_info->metrics = | 81 | ftcrfont_info->metrics = |
| 82 | xrealloc (ftcrfont_info->metrics, | 82 | xrealloc (ftcrfont_info->metrics, |
| 83 | sizeof (struct font_metrics *) * (row + 1)); | 83 | sizeof (struct font_metrics *) * (row + 1)); |
| 84 | bzero (ftcrfont_info->metrics + ftcrfont_info->metrics_nrows, | 84 | memset (ftcrfont_info->metrics + ftcrfont_info->metrics_nrows, 0, |
| 85 | (sizeof (struct font_metrics *) | 85 | (sizeof (struct font_metrics *) |
| 86 | * (row + 1 - ftcrfont_info->metrics_nrows))); | 86 | * (row + 1 - ftcrfont_info->metrics_nrows))); |
| 87 | ftcrfont_info->metrics_nrows = row + 1; | 87 | ftcrfont_info->metrics_nrows = row + 1; |
| 88 | } | 88 | } |
| 89 | if (ftcrfont_info->metrics[row] == NULL) | 89 | if (ftcrfont_info->metrics[row] == NULL) |