Commit 7819aeb622a94be0d89caf8382f290d0266c4aed
2017-06-28T22:57:41
Avoid Microsoft compiler warnings (#51331). While clang's sanitizer recommends a cast to unsigned for safe negation (to handle -INT_MIN), both MSVC and Visualc emit warning C4146 if an unsigned value gets negated. * include/freetype/internal/ftcalc.h (NEG_LONG, NEG_INT32), src/base/ftcalc.c (FT_MOVE_SIGN): Replace negation with a subtraction.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/ChangeLog b/ChangeLog
index e9a047b..a233f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-06-28 Ben Wagner <bungeman@google.com>
+
+ Avoid Microsoft compiler warnings (#51331).
+
+ While clang's sanitizer recommends a cast to unsigned for safe
+ negation (to handle -INT_MIN), both MSVC and Visualc emit warning
+ C4146 if an unsigned value gets negated.
+
+ * include/freetype/internal/ftcalc.h (NEG_LONG, NEG_INT32),
+ src/base/ftcalc.c (FT_MOVE_SIGN): Replace negation with a
+ subtraction.
+
2017-06-27 Werner Lemberg <wl@gnu.org>
* src/cff/cffparse.c (do_fixed): Fix typo.
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index d93a054..8b35f03 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -424,7 +424,7 @@ FT_BEGIN_HEADER
#define MUL_LONG( a, b ) \
(FT_Long)( (FT_ULong)(a) * (FT_ULong)(b) )
#define NEG_LONG( a ) \
- (FT_Long)( -(FT_ULong)(a) )
+ (FT_Long)( (FT_ULong)0 - (FT_ULong)(a) )
#define ADD_INT32( a, b ) \
(FT_Int32)( (FT_UInt32)(a) + (FT_UInt32)(b) )
@@ -433,7 +433,7 @@ FT_BEGIN_HEADER
#define MUL_INT32( a, b ) \
(FT_Int32)( (FT_UInt32)(a) * (FT_UInt32)(b) )
#define NEG_INT32( a ) \
- (FT_Int32)( -(FT_UInt32)(a) )
+ (FT_Int32)( (FT_UInt32)0 - (FT_UInt32)(a) )
FT_END_HEADER
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index f27fcfd..fa28e79 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -74,7 +74,7 @@
FT_BEGIN_STMNT \
if ( x < 0 ) \
{ \
- x_unsigned = -x_unsigned; \
+ x_unsigned = 0u - (x_unsigned); \
s = -s; \
} \
FT_END_STMNT