#! /bin/sh /usr/share/dpatch/dpatch-run ## 02-linux_types.patch.dpatch by Elias Mussi ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad directfb-extra~/interfaces/IDirectFBImageProvider/idirectfbimageprovider_bmp.c directfb-extra/interfaces/IDirectFBImageProvider/idirectfbimageprovider_bmp.c --- directfb-extra~/interfaces/IDirectFBImageProvider/idirectfbimageprovider_bmp.c 2008-05-21 13:46:04.000000000 -0300 +++ directfb-extra/interfaces/IDirectFBImageProvider/idirectfbimageprovider_bmp.c 2008-05-21 14:18:42.000000000 -0300 @@ -76,7 +76,7 @@ DFBColor *palette; - __u32 *image; + u32 *image; DIRenderCallback render_callback; void *render_callback_ctx; @@ -111,9 +111,9 @@ bmp_deocde_header( IDirectFBImageProvider_BMP_data *data ) { DFBResult ret; - __u8 buf[54]; - __u32 tmp; - __u32 bihsize; + u8 buf[54]; + u32 tmp; + u32 bihsize; memset( buf, 0, sizeof(buf) ); @@ -219,7 +219,7 @@ if (bihsize > 40) { bihsize -= 40; while (bihsize--) { - __u8 b; + u8 b; ret = fetch_data( data->buffer, &b, 1 ); if (ret) return ret; @@ -243,9 +243,9 @@ DFBColor c; c.a = 0xff; - c.r = ((__u8*)src)[i*4+2]; - c.g = ((__u8*)src)[i*4+1]; - c.b = ((__u8*)src)[i*4+0]; + c.r = ((u8*)src)[i*4+2]; + c.g = ((u8*)src)[i*4+1]; + c.b = ((u8*)src)[i*4+0]; data->palette[i] = c; } @@ -259,8 +259,8 @@ { DFBResult ret; int pitch = (((data->width*data->depth + 7) >> 3) + 3) & ~3; - __u8 buf[pitch]; - __u32 *dst; + u8 buf[pitch]; + u32 *dst; int i; ret = fetch_data( data->buffer, buf, pitch ); @@ -292,8 +292,8 @@ break; case 16: for (i = 0; i < data->width; i++) { - __u32 r, g, b; - __u16 c; + u32 r, g, b; + u16 c; c = buf[i*2+0] | (buf[i*2+1]<<8); r = (c >> 10) & 0x1f; diff -urNad directfb-extra~/interfaces/IDirectFBImageProvider/idirectfbimageprovider_imlib2.c directfb-extra/interfaces/IDirectFBImageProvider/idirectfbimageprovider_imlib2.c --- directfb-extra~/interfaces/IDirectFBImageProvider/idirectfbimageprovider_imlib2.c 2008-05-21 13:46:04.000000000 -0300 +++ directfb-extra/interfaces/IDirectFBImageProvider/idirectfbimageprovider_imlib2.c 2008-05-21 14:19:34.000000000 -0300 @@ -217,7 +217,7 @@ void *dst; int pitch; int src_width, src_height; - __u32 *image_data; + u32 *image_data; DFBRectangle rect; DFBRegion clip; IDirectFBSurface_data *dst_data; diff -urNad directfb-extra~/interfaces/IDirectFBImageProvider/idirectfbimageprovider_pnm.c directfb-extra/interfaces/IDirectFBImageProvider/idirectfbimageprovider_pnm.c --- directfb-extra~/interfaces/IDirectFBImageProvider/idirectfbimageprovider_pnm.c 2008-05-21 13:46:04.000000000 -0300 +++ directfb-extra/interfaces/IDirectFBImageProvider/idirectfbimageprovider_pnm.c 2008-05-21 14:18:00.000000000 -0300 @@ -107,7 +107,7 @@ typedef DFBResult (*PRowCallback) ( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ); + u8 *dest ); typedef struct { @@ -124,13 +124,13 @@ PImgType type; unsigned int img_offset; - __u8 *img; + u8 *img; int width; int height; int colors; PRowCallback getrow; - __u8 *rowbuf; /* buffer for ascii images */ + u8 *rowbuf; /* buffer for ascii images */ int bufp; /* current position in buffer */ int chunksize; /* maximum size of each sample */ @@ -184,13 +184,13 @@ static DFBResult __rawpbm_getrow( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ) + u8 *dest ) { DFBResult err; int len; int i, j; - __u8 *s = dest; - __u32 *d = (__u32*) dest; + u8 *s = dest; + u32 *d = (u32*) dest; P_GET( dest, data->width / 8 ); @@ -209,12 +209,12 @@ static DFBResult __rawpgm_getrow( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ) + u8 *dest ) { DFBResult err; int len; - __u8 *s = dest; - __u32 *d = (__u32*) dest; + u8 *s = dest; + u32 *d = (u32*) dest; P_GET( dest, data->width ); @@ -227,13 +227,13 @@ static DFBResult __rawppm_getrow( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ) + u8 *dest ) { DFBResult err; int len; int i; - __u8 *s = dest; - __u32 *d = (__u32*) dest; + u8 *s = dest; + u32 *d = (u32*) dest; P_GET( dest, data->width * 3 ); @@ -247,14 +247,14 @@ static DFBResult __plainpbm_getrow( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ) + u8 *dest ) { DFBResult err; int len; int i; int w = data->width; - __u8 *buf = data->rowbuf; - __u32 *d = (__u32*) dest; + u8 *buf = data->rowbuf; + u32 *d = (u32*) dest; P_LOADBUF(); @@ -286,14 +286,14 @@ static DFBResult __plainpgm_getrow( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ) + u8 *dest ) { DFBResult err; int len; int i, n; int w = data->width; - __u8 *buf = data->rowbuf; - __u32 *d = (__u32*) dest; + u8 *buf = data->rowbuf; + u32 *d = (u32*) dest; P_LOADBUF(); @@ -326,15 +326,15 @@ static DFBResult __plainppm_getrow( IDirectFBImageProvider_PNM_data *data, - __u8 *dest ) + u8 *dest ) { DFBResult err; int len; int i, n; int j = 16; int w = data->width; - __u8 *buf = data->rowbuf; - __u32 *d = (__u32*) dest; + u8 *buf = data->rowbuf; + u32 *d = (u32*) dest; P_LOADBUF(); @@ -555,9 +555,9 @@ CoreSurface *dst_surface; DFBRectangle rect; DFBRegion clip; - __u8 *img = NULL; + u8 *img = NULL; int img_p; - __u8 *dst; + u8 *dst; int dst_p; DIRECT_INTERFACE_GET_DATA( IDirectFBImageProvider_PNM ) @@ -594,7 +594,7 @@ bool cpy = (rect.w == data->width && rect.h == data->height); int y; - data->img = img = (__u8*) D_MALLOC( img_p * data->height ); + data->img = img = (u8*) D_MALLOC( img_p * data->height ); if (!img) { D_ERROR( "DirectFB/ImageProvider_PNM: " @@ -607,7 +607,7 @@ if (data->chunksize) { int size = (data->chunksize * data->width) + 1; - data->rowbuf = (__u8*) D_MALLOC( size ); + data->rowbuf = (u8*) D_MALLOC( size ); if (!data->rowbuf) { D_ERROR( "DirectFB/ImageProvider_PNM: " "couldn't allocate %i bytes for buffering.\n", @@ -630,7 +630,7 @@ if (cpy) { DFBRectangle r = { rect.x, rect.y+y, data->width, 1 }; - dfb_copy_buffer_32( (__u32*)img, dst, dst_p, + dfb_copy_buffer_32( (u32*)img, dst, dst_p, &r, dst_surface, &clip ); if (data->render_callback) { @@ -644,7 +644,7 @@ } if (!cpy) { - dfb_scale_linear_32( (__u32*)data->img, data->width, data->height, + dfb_scale_linear_32( (u32*)data->img, data->width, data->height, dst, dst_p, &rect, dst_surface, &clip ); if (data->render_callback) { @@ -669,7 +669,7 @@ } /* image already in buffer */ else { - dfb_scale_linear_32( (__u32*)img, data->width, data->height, + dfb_scale_linear_32( (u32*)img, data->width, data->height, dst, dst_p, &rect, dst_surface, &clip ); if (data->render_callback) { diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c --- directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c 2008-05-21 13:46:04.000000000 -0300 +++ directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c 2008-05-21 14:19:05.000000000 -0300 @@ -279,8 +279,8 @@ RGB888_to_RGB332( void *d, void *s, int len ) { int i; - __u8 *dst = (__u8*) d; - __u8 *src = (__u8*) s; + u8 *dst = (u8*) d; + u8 *src = (u8*) s; for (i=0; idestination->priv; @@ -458,9 +458,9 @@ dfb_surface_soft_lock( dst_data->core, surface, DSLF_WRITE, &dst, &pitch, 0 ); - src_y = (__u8*) data->yuv.lines[0]; - src_u = (__u8*) data->yuv.lines[1]; - src_v = (__u8*) data->yuv.lines[2]; + src_y = (u8*) data->yuv.lines[0]; + src_u = (u8*) data->yuv.lines[1]; + src_v = (u8*) data->yuv.lines[2]; off_x = data->dest_clip.x - data->dest_rect.x; off_y = data->dest_clip.y - data->dest_rect.y; diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c --- directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c 2008-05-21 13:46:04.000000000 -0300 +++ directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c 2008-05-21 14:18:08.000000000 -0300 @@ -275,8 +275,8 @@ RGB888_to_RGB332( void *d, void *s, int len ) { int i; - __u8 *dst = (__u8*) d; - __u8 *src = (__u8*) s; + u8 *dst = (u8*) d; + u8 *src = (u8*) s; for (i=0; idestination->priv; @@ -469,18 +469,18 @@ switch (surface->format) { case DSPF_I420: case DSPF_YV12: - dst_y = (__u8*) dst; + dst_y = (u8*) dst; dst_y += data->dest_clip.y * pitch + data->dest_clip.x; if (surface->format == DSPF_I420) { - dst_u = (__u8*) dst + pitch * data->video.height; + dst_u = (u8*) dst + pitch * data->video.height; dst_v = dst_u + pitch/2 * data->video.height / 2; dst_u += data->dest_clip.y/2 * pitch/2 + data->dest_clip.x/2; dst_v += data->dest_clip.y/2 * pitch/2 + data->dest_clip.x/2; } else { - dst_v = (__u8*) dst + pitch * data->video.height; + dst_v = (u8*) dst + pitch * data->video.height; dst_u = dst_v + pitch/2 * data->video.height / 2; dst_u += data->dest_clip.y/2 * pitch/2 + data->dest_clip.x/2;