Sun Feb 28 22:01:26 2016 UTC ()

pixman_int_to_fixed is sometimes used with negative values, so do not
use left shift, but the equivalent multiplication.


(joerg)

diff -r1.5 -r1.6 xsrc/external/mit/pixman/dist/pixman/pixman.h

--- xsrc/external/mit/pixman/dist/pixman/pixman.h 2014/03/17 01:24:18	1.5
+++ xsrc/external/mit/pixman/dist/pixman/pixman.h 2016/02/28 22:01:26	1.6

 @@ -117,27 +117,27 @@ typedef int pixman_bool_t;
  */
 typedef int64_t			pixman_fixed_32_32_t;
 typedef pixman_fixed_32_32_t	pixman_fixed_48_16_t;
 typedef uint32_t		pixman_fixed_1_31_t;
 typedef uint32_t		pixman_fixed_1_16_t;
 typedef int32_t			pixman_fixed_16_16_t;
 typedef pixman_fixed_16_16_t	pixman_fixed_t;
 #define pixman_fixed_e			((pixman_fixed_t) 1)
 #define pixman_fixed_1			(pixman_int_to_fixed(1))
 #define pixman_fixed_1_minus_e		(pixman_fixed_1 - pixman_fixed_e)
 #define pixman_fixed_minus_1		(pixman_int_to_fixed(-1))
 #define pixman_fixed_to_int(f)		((int) ((f) >> 16))
-#define pixman_int_to_fixed(i)		((pixman_fixed_t) ((i) << 16))
+#define pixman_int_to_fixed(i)		((pixman_fixed_t) ((i) * 65536))
 #define pixman_fixed_to_double(f)	(double) ((f) / (double) pixman_fixed_1)
 #define pixman_double_to_fixed(d)	((pixman_fixed_t) ((d) * 65536.0))
 #define pixman_fixed_frac(f)		((f) & pixman_fixed_1_minus_e)
 #define pixman_fixed_floor(f)		((f) & ~pixman_fixed_1_minus_e)
 #define pixman_fixed_ceil(f)		pixman_fixed_floor ((f) + pixman_fixed_1_minus_e)
 #define pixman_fixed_fraction(f)	((f) & pixman_fixed_1_minus_e)
 #define pixman_fixed_mod_2(f)		((f) & (pixman_fixed1 | pixman_fixed_1_minus_e))
 #define pixman_max_fixed_48_16		((pixman_fixed_48_16_t) 0x7fffffff)
 #define pixman_min_fixed_48_16		(-((pixman_fixed_48_16_t) 1 << 31))
 /*
  * Misc structs
  */