diff options
Diffstat (limited to 'src/sfntfont-android.c')
| -rw-r--r-- | src/sfntfont-android.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sfntfont-android.c b/src/sfntfont-android.c index 9ead43a9c5d..1ed394b9458 100644 --- a/src/sfntfont-android.c +++ b/src/sfntfont-android.c @@ -78,7 +78,7 @@ static size_t max_scanline_buffer_size; { \ size_t _size; \ \ - if (INT_MULTIPLY_WRAPV (height, stride, &_size)) \ + if (ckd_mul (&_size, height, stride)) \ memory_full (SIZE_MAX); \ \ if (_size < MAX_ALLOCA) \ @@ -112,7 +112,7 @@ static size_t max_scanline_buffer_size; size_t _size; \ void *_temp; \ \ - if (INT_MULTIPLY_WRAPV (height, stride, &_size)) \ + if (ckd_mul (&_size, height, stride)) \ memory_full (SIZE_MAX); \ \ if (_size > scanline_buffer.buffer_size) \ @@ -770,7 +770,7 @@ init_sfntfont_android (void) build_string ("Roboto")), Fcons (build_string ("DejaVu Serif"), build_string ("Noto Serif"))); - else if (api_level >= 15) + else if (api_level >= 14) /* Android 4.0 and later distribute Roboto in lieu of Droid Sans. */ Vsfnt_default_family_alist |