diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2017-09-11 19:20:24 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2017-09-13 17:11:12 +0900 |
| commit | fbde20e94bcb2ab8c9c2e2c58a00b9d61a117280 (patch) | |
| tree | f16879787be8326541c1f6c14d5df47f8ba96ea7 | |
| parent | c122d3172c1906e1aec71afd34c2847e59625048 (diff) | |
| download | freetype2-fbde20e94bcb2ab8c9c2e2c58a00b9d61a117280.tar.gz | |
cpp-conditionalize too large property value check for LP64 systems,
because it is always false on 16bit systems.
| -rw-r--r-- | src/pcf/pcfdrivr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index 169f75e95..bad6e0617 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -179,6 +179,7 @@ THE SOFTWARE. } Exit: +#if FT_ULONG_MAX > 0xFFFFFFFFUL if ( charcode > 0xFFFFFFFFUL ) { FT_TRACE1(( "pcf_cmap_char_next: charcode 0x%x > 32bit API" )); @@ -186,6 +187,7 @@ THE SOFTWARE. /* XXX: result should be changed to indicate an overflow error */ } else +#endif *acharcode = (FT_UInt32)charcode; return result; } @@ -625,12 +627,14 @@ THE SOFTWARE. } else { +#if FT_ULONG_MAX > 0xFFFFFFFFUL if ( prop->value.l > 0x7FFFFFFFL || prop->value.l < ( -1 - 0x7FFFFFFFL ) ) { FT_TRACE1(( "pcf_get_bdf_property:" )); FT_TRACE1(( " too large integer 0x%x is truncated\n" )); } +#endif /* * The PCF driver loads all properties as signed integers. |