diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-29 13:35:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-29 13:35:50 +0100 |
| commit | 409cbaf20b5c695444bd08c87f4a186b9ac6b805 (patch) | |
| tree | 1b9a267a2e2a1c1acda54e9de517f8821da7b9f8 | |
| parent | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (diff) | |
| download | vcxsrv-409cbaf20b5c695444bd08c87f4a186b9ac6b805.tar.gz vcxsrv-409cbaf20b5c695444bd08c87f4a186b9ac6b805.tar.bz2 vcxsrv-409cbaf20b5c695444bd08c87f4a186b9ac6b805.zip | |
Solved crashes in 64-bit due to latest merge
| -rwxr-xr-x[-rw-r--r--] | fontconfig/src/makefile | 1 | ||||
| -rw-r--r-- | libXfont/src/FreeType/xttcap.c | 1 | ||||
| -rw-r--r-- | libXfont/src/fontfile/fontdir.c | 2 | ||||
| -rw-r--r-- | pixman/pixman/pixman-sse2.c | 28 |
4 files changed, 18 insertions, 14 deletions
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile index 189478427..25130f82f 100644..100755 --- a/fontconfig/src/makefile +++ b/fontconfig/src/makefile @@ -36,6 +36,7 @@ CSRCS = \ fcname.c \ fcobjs.c \ fcpat.c \ + fcrange.c \ fcserialize.c \ fcstat.c \ fcstr.c \ diff --git a/libXfont/src/FreeType/xttcap.c b/libXfont/src/FreeType/xttcap.c index 104dc89e4..707845ed3 100644 --- a/libXfont/src/FreeType/xttcap.c +++ b/libXfont/src/FreeType/xttcap.c @@ -45,6 +45,7 @@ static char const * const releaseID = #include <string.h> #include <ctype.h> #include <math.h> +#include <unistd.h> #ifndef True #define True (-1) diff --git a/libXfont/src/fontfile/fontdir.c b/libXfont/src/fontfile/fontdir.c index ef7ffa561..13cda0a37 100644 --- a/libXfont/src/fontfile/fontdir.c +++ b/libXfont/src/fontfile/fontdir.c @@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group. #include <X11/fonts/fntfilst.h> #include <X11/keysym.h> +#include <unistd.h> + #if HAVE_STDINT_H #include <stdint.h> #elif !defined(INT32_MAX) diff --git a/pixman/pixman/pixman-sse2.c b/pixman/pixman/pixman-sse2.c index 4e64ff94e..61e3d3159 100644 --- a/pixman/pixman/pixman-sse2.c +++ b/pixman/pixman/pixman-sse2.c @@ -5562,8 +5562,8 @@ FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_normal_OVER, /***********************************************************************************/ # define BILINEAR_DECLARE_VARIABLES \ - const __m128i xmm_wt = _mm_set_epi16 (wt, wt, wt, wt, wt, wt, wt, wt); \ - const __m128i xmm_wb = _mm_set_epi16 (wb, wb, wb, wb, wb, wb, wb, wb); \ + const __m128i xmm_wt = _mm_set_epi16(wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff); \ + const __m128i xmm_wb = _mm_set_epi16(wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff); \ const __m128i xmm_addc = _mm_set_epi16 (0, 1, 0, 1, 0, 1, 0, 1); \ const __m128i xmm_ux1 = _mm_set_epi16 ((unit_x)&0xffff, (-unit_x)&0xffff, (unit_x)&0xffff, (-unit_x)&0xffff, \ (unit_x)&0xffff, (-unit_x)&0xffff, (unit_x)&0xffff, (-unit_x)&0xffff); \ @@ -5572,10 +5572,10 @@ FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_normal_OVER, (unit_x * 4)&0xffff, (-unit_x * 4)&0xffff, \ (unit_x * 4)&0xffff, (-unit_x * 4)&0xffff); \ const __m128i xmm_zero = _mm_setzero_si128 (); \ - __m128i xmm_x = _mm_set_epi16 (vx + unit_x * 3, -(vx + 1) - unit_x * 3, \ - vx + unit_x * 2, -(vx + 1) - unit_x * 2, \ - vx + unit_x * 1, -(vx + 1) - unit_x * 1, \ - vx + unit_x * 0, -(vx + 1) - unit_x * 0); \ + __m128i xmm_x = _mm_set_epi16((vx + unit_x * 3) & 0xffff, (-(vx + 1) - unit_x * 3) & 0xffff, \ + (vx + unit_x * 2) & 0xffff, (-(vx + 1) - unit_x * 2) & 0xffff, \ + (vx + unit_x * 1) & 0xffff, (-(vx + 1) - unit_x * 1) & 0xffff, \ + (vx + unit_x * 0) & 0xffff, (-(vx + 1) - unit_x * 0) & 0xffff); \ __m128i xmm_wh_state; #define BILINEAR_INTERPOLATE_ONE_PIXEL_HELPER(pix, phase_) \ @@ -5610,15 +5610,15 @@ do { \ #else /************************************************************************/ # define BILINEAR_DECLARE_VARIABLES \ - const __m128i xmm_wt = _mm_set_epi16 (wt, wt, wt, wt, wt, wt, wt, wt); \ - const __m128i xmm_wb = _mm_set_epi16 (wb, wb, wb, wb, wb, wb, wb, wb); \ + const __m128i xmm_wt = _mm_set_epi16(wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff, wt & 0xffff); \ + const __m128i xmm_wb = _mm_set_epi16(wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff, wb & 0xffff); \ const __m128i xmm_addc = _mm_set_epi16 (0, 1, 0, 1, 0, 1, 0, 1); \ - const __m128i xmm_ux1 = _mm_set_epi16 (unit_x, -unit_x, unit_x, -unit_x, \ - unit_x, -unit_x, unit_x, -unit_x); \ - const __m128i xmm_ux4 = _mm_set_epi16 (unit_x * 4, -unit_x * 4, \ - unit_x * 4, -unit_x * 4, \ - unit_x * 4, -unit_x * 4, \ - unit_x * 4, -unit_x * 4); \ + const __m128i xmm_ux1 = _mm_set_epi16((unit_x) & 0xffff, (-unit_x) & 0xffff, (unit_x) & 0xffff, (-unit_x) & 0xffff, \ + (unit_x) & 0xffff, (-unit_x) & 0xffff, (unit_x) & 0xffff, (-unit_x) & 0xffff); \ + const __m128i xmm_ux4 = _mm_set_epi16((unit_x * 4) & 0xffff, (-unit_x * 4) & 0xffff, \ + (unit_x * 4) & 0xffff, (-unit_x * 4) & 0xffff, \ + (unit_x * 4) & 0xffff, (-unit_x * 4) & 0xffff, \ + (unit_x * 4) & 0xffff, (-unit_x * 4) & 0xffff); \ const __m128i xmm_zero = _mm_setzero_si128 (); \ __m128i xmm_x = _mm_set_epi16 (vx&0xffff, (-(vx + 1))&0xffff, vx&0xffff, (-(vx + 1))&0xffff, \ vx&0xffff, (-(vx + 1))&0xffff, vx&0xffff, (-(vx + 1))&0xffff) |