[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 3b45f56: * src/base/ftobjs.c (FT_Request_Metrics): Fi
From: |
Werner Lemberg |
Subject: |
[freetype2] master 3b45f56: * src/base/ftobjs.c (FT_Request_Metrics): Fix build warning on Android. |
Date: |
Mon, 29 Nov 2021 12:22:10 -0500 (EST) |
branch: master
commit 3b45f564e94fde897c0e6e168c660a6e1ec5c679
Author: Seigo Nonaka <nona@google.com>
Commit: Werner Lemberg <wl@gnu.org>
* src/base/ftobjs.c (FT_Request_Metrics): Fix build warning on Android.
Use casts since `FT_USHORT_MAX` is unsigned short in bionic (libc used in
Android).
---
src/base/ftobjs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 62475d4..883f1a8 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -3230,8 +3230,8 @@
scaled_w = ( scaled_w + 32 ) >> 6;
scaled_h = ( scaled_h + 32 ) >> 6;
- if ( scaled_w > FT_USHORT_MAX ||
- scaled_h > FT_USHORT_MAX )
+ if ( scaled_w > (FT_Long)FT_USHORT_MAX ||
+ scaled_h > (FT_Long)FT_USHORT_MAX )
{
FT_ERROR(( "FT_Request_Metrics: Resulting ppem size too large\n" ));
error = FT_ERR( Invalid_Pixel_Size );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 3b45f56: * src/base/ftobjs.c (FT_Request_Metrics): Fix build warning on Android.,
Werner Lemberg <=