diff options
| author | Rocky Bernstein <rockyb@users.sourceforge.net> | 2004-02-19 02:50:24 +0000 |
|---|---|---|
| committer | Rocky Bernstein <rockyb@users.sourceforge.net> | 2004-02-19 02:50:24 +0000 |
| commit | 5cb036aff44c2ff274ec38b28382245c5f695689 (patch) | |
| tree | b55f5f42c0cf359faddca2c2724bd41e626f8cdf /src/post | |
| parent | 8aec8d2b5344d4f748755cfb328fd811a8bfc526 (diff) | |
| download | xine-lib-5cb036aff44c2ff274ec38b28382245c5f695689.tar.gz xine-lib-5cb036aff44c2ff274ec38b28382245c5f695689.tar.bz2 | |
Mandrake patches from
http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/
via Goetz Waschk who reports:
The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative
CFLAGS for amd64,
the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded
/lib to support the lib64 library dir on amd64,
the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a
configure option to disable directfb,
the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same
for linux framebuffer and
the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't
apply at the moment against the CVS -- demux_ogg.c was not applied.
it includes some 64 bit pointer and other fixes for 64bit architectures.
from Gwenole Beauchesne
I haven't tested other than apply and compile.
CVS patchset: 6174
CVS date: 2004/02/19 02:50:24
Diffstat (limited to 'src/post')
| -rw-r--r-- | src/post/goom/filters.c | 7 | ||||
| -rw-r--r-- | src/post/goom/goom_core.c | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/post/goom/filters.c b/src/post/goom/filters.c index 47c42751e..5cc5e1af0 100644 --- a/src/post/goom/filters.c +++ b/src/post/goom/filters.c @@ -18,6 +18,7 @@ #include <stdlib.h> #include <math.h> #include <stdio.h> +#include <stdint.h> #ifdef HAVE_MMX #define USE_ASM @@ -559,15 +560,15 @@ zoomFilterFastRGB (Uint * pix1, freebrutS = (unsigned int *) calloc (resx * resy * 2 + 128, sizeof(unsigned int)); - brutS = (guint32 *) ((1 + ((unsigned int) (freebrutS)) / 128) * 128); + brutS = (guint32 *) ((1 + ((uintptr_t) (freebrutS)) / 128) * 128); freebrutD = (unsigned int *) calloc (resx * resy * 2 + 128, sizeof(unsigned int)); - brutD = (guint32 *) ((1 + ((unsigned int) (freebrutD)) / 128) * 128); + brutD = (guint32 *) ((1 + ((uintptr_t) (freebrutD)) / 128) * 128); freebrutT = (unsigned int *) calloc (resx * resy * 2 + 128, sizeof(unsigned int)); - brutT = (guint32 *) ((1 + ((unsigned int) (freebrutT)) / 128) * 128); + brutT = (guint32 *) ((1 + ((uintptr_t) (freebrutT)) / 128) * 128); /** modif here by jeko : plus de multiplications **/ { diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c index e14513156..c2a901780 100644 --- a/src/post/goom/goom_core.c +++ b/src/post/goom/goom_core.c @@ -1,6 +1,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdint.h> #include "goom_core.h" #include "goom_tools.h" #include "filters.h" @@ -107,8 +108,8 @@ goom_init (guint32 resx, guint32 resy, int cinemascope) cycle = 0; - p1 = (guint32 *) ((1 + ((unsigned int) (pixel)) / 128) * 128); - p2 = (guint32 *) ((1 + ((unsigned int) (back)) / 128) * 128); + p1 = (guint32 *) ((1 + ((uintptr_t) (pixel)) / 128) * 128); + p2 = (guint32 *) ((1 + ((uintptr_t) (back)) / 128) * 128); init_ifs (resx, c_resoly); gmline1 = goom_lines_init (resx, c_resoly, @@ -149,8 +150,8 @@ goom_set_resolution (guint32 resx, guint32 resy, int cinemascope) bzero (pixel, buffsize * sizeof (guint32) + 128); back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128); bzero (back, buffsize * sizeof (guint32) + 128); - p1 = (guint32 *) ((1 + ((unsigned int) (pixel)) / 128) * 128); - p2 = (guint32 *) ((1 + ((unsigned int) (back)) / 128) * 128); + p1 = (guint32 *) ((1 + ((uintptr_t) (pixel)) / 128) * 128); + p2 = (guint32 *) ((1 + ((uintptr_t) (back)) / 128) * 128); init_ifs (resx, c_resoly); goom_lines_set_res (gmline1, resx, c_resoly); |